diff --git a/fb303-0.10.0-buildxml.patch b/fb303-0.10.0-buildxml.patch index bbff5ec..eb3825a 100644 --- a/fb303-0.10.0-buildxml.patch +++ b/fb303-0.10.0-buildxml.patch @@ -51,7 +51,7 @@ index 8f2fa51..d89f05e 100755 + + + -+ ++ + + diff --git a/thrift-0.10.0-buildxml.patch b/thrift-0.10.0-buildxml.patch index db4b497..8931c03 100644 --- a/thrift-0.10.0-buildxml.patch +++ b/thrift-0.10.0-buildxml.patch @@ -26,7 +26,7 @@ index 40e5284..db1ce54 100644 + + + -+ ++ @@ -187,7 +187,7 @@ index 7638d5b..c5ca703 100644 + + + -+ ++ @@ -205,7 +205,7 @@ index 7638d5b..c5ca703 100644 + + + -+ ++ + @@ -229,7 +229,7 @@ index a9a9ad4..2fddf0c 100644 + + + -+ ++ diff --git a/thrift.spec b/thrift.spec index 8a61075..79bcf18 100644 --- a/thrift.spec +++ b/thrift.spec @@ -50,7 +50,7 @@ Name: thrift Version: 0.10.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Software framework for cross-language services development # Parts of the source are used under the BSD and zlib licenses, but @@ -224,7 +224,8 @@ BuildRequires: javapackages-local BuildRequires: junit BuildRequires: log4j BuildRequires: slf4j -BuildRequires: tomcat-servlet-3.1-api +# javax.servlet-api 3.1.0 is provided by glassfish-servlet-api +BuildRequires: mvn(javax.servlet:javax.servlet-api) = 3.1.0 Requires: java-headless >= 1:1.6.0 Requires: javapackages-tools @@ -525,6 +526,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r %doc LICENSE NOTICE %changelog +* Wed May 30 2018 Christopher Tubbs - 0.10.0-11 +- Fix FTBFS; update servlet-api dependency (rhbz#1581175) + * Thu Mar 08 2018 Christopher Tubbs - 0.10.0-10 - Add gcc-c++ BuildRequires