SPECS: jakarta-commons-httpclient.spec - updated to 3.1

[glen]

Author: glen                         Date: Tue Dec 11 15:06:04 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 3.1

---- Files affected:
SPECS:
   jakarta-commons-httpclient.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-httpclient.spec
diff -u SPECS/jakarta-commons-httpclient.spec:1.9 SPECS/jakarta-commons-httpclient.spec:1.10
--- SPECS/jakarta-commons-httpclient.spec:1.9	Tue Dec 11 15:58:52 2007
+++ SPECS/jakarta-commons-httpclient.spec	Tue Dec 11 16:05:59 2007
@@ -1,17 +1,15 @@
 # $Revision$, $Date$
-%define		_rc	rc4
-%define		_rel	2.1
 %include	/usr/lib/rpm/macros.java
 Summary:	Jakarta Commons HTTPClient Package
 Summary(pl.UTF-8):	Pakiet Jakarta Commons HTTPClient
-Name:		jakarta-commons-httpclient3
-Version:	3.0
-Release:	0.%{_rc}.%{_rel}
+Name:		jakarta-commons-httpclient
+Version:	3.1
+Release:	1
 License:	Apache Software License
-Source0:	http://archive.apache.org/dist/jakarta/commons/httpclient/source/commons-httpclient-%{version}-%{_rc}-src.tar.gz
-# Source0-md5:	961edab7cdf9950f2a6d2243301407e3
+Source0:	http://apache.zone-h.org/jakarta/httpcomponents/commons-httpclient-3.x/source/commons-httpclient-%{version}-src.tar.gz
+# Source0-md5:	2c9b0f83ed5890af02c0df1c1776f39b
 Group:		Development/Languages/Java
-URL:		http://jakarta.apache.org/commons/httpclient/
+URL:		http://jakarta.apache.org/httpcomponents/httpclient-3.x/
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-codec
 BuildRequires:	jakarta-commons-logging >= 1.0.3
@@ -20,7 +18,12 @@
 BuildRequires:	jsse >= 1.0.3.01
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+%if %(locale -a | grep -q '^en_US$'; echo $?)
+BuildRequires:	glibc-localedb-all
+%endif
 Requires:	jakarta-commons-logging >= 1.0.3
+Requires:	jpackage-utils
+Obsoletes:	jakarta-commons-httpclient3
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -97,21 +100,20 @@
 Podręcznik dla pakietu %{name}.
 
 %prep
-%setup -q -n commons-httpclient-%{version}-%{_rc}
-mkdir lib # duh
-rm -rf docs/apidocs docs/*.patch docs/*.orig docs/*.rej
+%setup -q -n commons-httpclient-%{version}
 
 %build
-export LC_ALL=en_US # source not in ASCII
-export CLASSPATH=$(build-classpath jsse jce junit commons-codec commons-logging)
+export LC_ALL=en_US # source code not US-ASCII
+required_jars="jsse jce junit commons-codec commons-logging"
+export CLASSPATH=$(build-classpath $required_jars)
 %ant \
 	-Dbuild.sysclasspath=first \
 	-Djavadoc.j2sdk.link=%{_javadocdir}/java \
 	-Djavadoc.logging.link=%{_javadocdir}/jakarta-commons-logging \
 	dist test
 
-rm -rf apidoc
 rm -f dist/docs/{BUILDING,TESTING}.txt
+rm -rf apidoc
 mv dist/docs/api apidoc
 
 %install
@@ -135,8 +137,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
@@ -162,6 +163,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007-12-11 15:05:59  glen
+- updated to 3.1
+
 Revision 1.9  2007-12-11 14:58:52  glen
 - copied from jakarta-commons-httpclient3.spec
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jakarta-commons-httpclient.spec?r1=1.9&r2=1.10&f=u