rpms
/
thrift
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix FTBFS; update servlet-api dependency (rhbz#1581175)

This commit is contained in:
Christopher Tubbs 2018-05-30 19:41:09 -04:00
parent f02e4292b5
commit 0e241cd08a
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fb303-0.10.0-buildxml.patch
View File

@ -51,7 +51,7 @@ index 8f2fa51..d89f05e 100755
+ <include name="httpcomponents/httpclient.jar"/> + <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/> + <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/> + <include name="slf4j/api.jar"/>
+ <include name="tomcat-servlet-3.0-api.jar"/> + <include name="glassfish-servlet-api.jar"/>
+ </fileset> + </fileset>
</classpath> </classpath>
+ +

8
thrift-0.10.0-buildxml.patch
View File

@ -26,7 +26,7 @@ index 40e5284..db1ce54 100644
+ <include name="httpcomponents/httpclient.jar"/> + <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/> + <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/> + <include name="slf4j/api.jar"/>
+ <include name="tomcat-servlet-3.1-api.jar"/> + <include name="glassfish-servlet-api.jar"/>
</fileset> </fileset>
</path> </path>
@ -187,7 +187,7 @@ index 7638d5b..c5ca703 100644
+ <include name="httpcomponents/httpclient.jar"/> + <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/> + <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/> + <include name="slf4j/api.jar"/>
+ <include name="tomcat-servlet-3.1-api.jar"/> + <include name="glassfish-servlet-api.jar"/>
</fileset> </fileset>
</path> </path>
<path id="build.classpath"> <path id="build.classpath">
@ -205,7 +205,7 @@ index 7638d5b..c5ca703 100644
+ <include name="httpcomponents/httpclient.jar"/> + <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/> + <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/> + <include name="slf4j/api.jar"/>
+ <include name="tomcat-servlet-3.1-api.jar"/> + <include name="glassfish-servlet-api.jar"/>
+ </fileset> + </fileset>
</path> </path>
<path id="tutorial.classpath"> <path id="tutorial.classpath">
@ -229,7 +229,7 @@ index a9a9ad4..2fddf0c 100644
+ <include name="httpcomponents/httpclient.jar"/> + <include name="httpcomponents/httpclient.jar"/>
+ <include name="log4j.jar"/> + <include name="log4j.jar"/>
+ <include name="slf4j/api.jar"/> + <include name="slf4j/api.jar"/>
+ <include name="tomcat-servlet-3.1-api.jar"/> + <include name="glassfish-servlet-api.jar"/>
</fileset> </fileset>
</path> </path>
<path id="build.classpath"> <path id="build.classpath">

8
thrift.spec
View File

@ -50,7 +50,7 @@
Name: thrift Name: thrift
Version: 0.10.0 Version: 0.10.0
Release: 10%{?dist} Release: 11%{?dist}
Summary: Software framework for cross-language services development Summary: Software framework for cross-language services development
# Parts of the source are used under the BSD and zlib licenses, but # Parts of the source are used under the BSD and zlib licenses, but
@ -224,7 +224,8 @@ BuildRequires: javapackages-local
BuildRequires: junit BuildRequires: junit
BuildRequires: log4j BuildRequires: log4j
BuildRequires: slf4j 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: java-headless >= 1:1.6.0
Requires: javapackages-tools Requires: javapackages-tools
@ -525,6 +526,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r
%doc LICENSE NOTICE %doc LICENSE NOTICE
%changelog %changelog
* Wed May 30 2018 Christopher Tubbs <ctubbsii@fedoraproject.org> - 0.10.0-11
- Fix FTBFS; update servlet-api dependency (rhbz#1581175)
* Thu Mar 08 2018 Christopher Tubbs <ctubbsii@fedoraproject.org> - 0.10.0-10 * Thu Mar 08 2018 Christopher Tubbs <ctubbsii@fedoraproject.org> - 0.10.0-10
- Add gcc-c++ BuildRequires - Add gcc-c++ BuildRequires