rpms/jakarta-commons-httpclient/devel jakarta-commons-httpclient.spec, 1.25, 1.26
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Jul 16 10:06:19 UTC 2010
- Previous message: rpms/cpufrequtils/devel cpufrequtils-multilib.patch,NONE,1.1
- Next message: rpms/cpufrequtils/F-13 cpufrequtils-multilib.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 cpufrequtils.spec, 1.11, 1.12 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: akurtakov
Update of /cvs/pkgs/rpms/jakarta-commons-httpclient/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24403/devel
Modified Files:
jakarta-commons-httpclient.spec
Log Message:
- Drop gcj_support.
- Fix FTBFS.
Index: jakarta-commons-httpclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- jakarta-commons-httpclient.spec 25 Jul 2009 03:50:13 -0000 1.25
+++ jakarta-commons-httpclient.spec 16 Jul 2010 10:06:18 -0000 1.26
@@ -28,15 +28,11 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-%define short_name httpclient
+%global short_name httpclient
Name: jakarta-commons-httpclient
Version: 3.1
-Release: 0.5%{?dist}
+Release: 1%{?dist}
Epoch: 1
Summary: Jakarta Commons HTTPClient implements the client side of HTTP standards
License: ASL 2.0
@@ -46,35 +42,27 @@ Patch0: %{name}-disablecryptotes
Patch1: %{name}-addosgimanifest.patch
URL: http://jakarta.apache.org/commons/httpclient/
Group: Development/Libraries/Java
-%if ! %{gcj_support}
-Buildarch: noarch
-%endif
+BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: ant
-BuildRequires: jakarta-commons-codec
-BuildRequires: jakarta-commons-logging >= 0:1.0.3
+BuildRequires: apache-commons-codec
+BuildRequires: apache-commons-logging >= 0:1.0.3
BuildRequires: jce >= 0:1.2.2
BuildRequires: jsse >= 0:1.0.3.01
#BuildRequires: java-javadoc
-BuildRequires: jakarta-commons-logging-javadoc
+BuildRequires: apache-commons-logging-javadoc
BuildRequires: junit
#BuildRequires: jaxp = 1.3
-Requires: jakarta-commons-logging >= 0:1.0.3
+Requires: apache-commons-logging >= 0:1.0.3
Provides: commons-httpclient = %{epoch}:%{version}-%{release}
Obsoletes: commons-httpclient < %{epoch}:%{version}-%{release}
Provides: jakarta-commons-httpclient3 = %{epoch}:%{version}-%{release}
Obsoletes: jakarta-commons-httpclient3 < %{epoch}:%{version}-%{release}
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description
The Hyper-Text Transfer Protocol (HTTP) is perhaps the most significant
protocol used on the Internet today. Web services, network-enabled
@@ -142,16 +130,12 @@ pushd src
rm tempf
popd
-# FIXME: These tests fail due to absence of jks in libgcj. Disable them for now.
-rm -f src/test/org/apache/commons/httpclient/TestProxy.java
-rm -f src/test/org/apache/commons/httpclient/params/TestSSLTunnelParams.java
-
%{__sed} -i 's/\r//' RELEASE_NOTES.txt
%{__sed} -i 's/\r//' README.txt
%{__sed} -i 's/\r//' LICENSE.txt
%build
-export CLASSPATH=%(build-classpath jsse jce jakarta-commons-codec jakarta-commons-logging junit)
+export CLASSPATH=%(build-classpath jsse jce commons-codec commons-logging junit)
ant \
-Dbuild.sysclasspath=first \
-Djavadoc.j2sdk.link=%{_javadocdir}/java \
@@ -186,39 +170,14 @@ cp -pr src/examples src/contrib $RPM_BUI
rm -f dist/docs/{BUILDING,TESTING}.txt
ln -s %{_javadocdir}/%{name}-%{version} dist/docs/apidocs
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt README.txt RELEASE_NOTES.txt
%{_javadir}/*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version}
@@ -233,6 +192,10 @@ fi
%changelog
+* Fri Jul 16 2010 Alexander Kurtakov <akurtako at redhat.com> 1:3.1-1
+- Drop gcj_support.
+- Fix FTBFS.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.1-0.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- Previous message: rpms/cpufrequtils/devel cpufrequtils-multilib.patch,NONE,1.1
- Next message: rpms/cpufrequtils/F-13 cpufrequtils-multilib.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 cpufrequtils.spec, 1.11, 1.12 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list