SPECS: jakarta-commons-httpclient3.spec - unify java package; buil...

[glen]

Author: glen                         Date: Tue Apr 17 22:14:11 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package; builds now

---- Files affected:
SPECS:
   jakarta-commons-httpclient3.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-httpclient3.spec
diff -u SPECS/jakarta-commons-httpclient3.spec:1.6 SPECS/jakarta-commons-httpclient3.spec:1.7
--- SPECS/jakarta-commons-httpclient3.spec:1.6	Tue Feb 13 09:06:35 2007
+++ SPECS/jakarta-commons-httpclient3.spec	Wed Apr 18 00:14:06 2007
@@ -1,12 +1,14 @@
 # $Revision$, $Date$
-%define	short_name	httpclient3
+%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-%{short_name}
+Name:		jakarta-commons-httpclient3
 Version:	3.0
-Release:	0.rc4.2
+Release:	0.%{_rc}.%{_rel}
 License:	Apache Software License
-Source0:	http://archive.apache.org/dist/jakarta/commons/httpclient/source/commons-httpclient-%{version}-rc4-src.tar.gz
+Source0:	http://archive.apache.org/dist/jakarta/commons/httpclient/source/commons-httpclient-%{version}-%{_rc}-src.tar.gz
 # Source0-md5:	961edab7cdf9950f2a6d2243301407e3
 Group:		Development/Languages/Java
 URL:		http://jakarta.apache.org/commons/httpclient/
@@ -14,7 +16,10 @@
 BuildRequires:	jakarta-commons-codec
 BuildRequires:	jakarta-commons-logging >= 1.0.3
 BuildRequires:	jce >= 1.2.2
+BuildRequires:	jpackage-utils
 BuildRequires:	jsse >= 1.0.3.01
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jakarta-commons-logging >= 1.0.3
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -60,6 +65,7 @@
 Summary:	Javadoc for %{name}
 Summary(pl.UTF-8):	Dokumentacja javadoc dla pakietu %{name}
 Group:		Documentation
+Requires:	jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -91,46 +97,39 @@
 Podręcznik dla pakietu %{name}.
 
 %prep
-%setup -q -n commons-httpclient-%{version}-rc4
+%setup -q -n commons-httpclient-%{version}-%{_rc}
 mkdir lib # duh
 rm -rf docs/apidocs docs/*.patch docs/*.orig docs/*.rej
 
 %build
-export CLASSPATH=%(build-classpath jsse jce junit jakarta-commons-codec jakarta-commons-logging)
-ant \
+export LC_ALL=en_US # source not in ASCII
+export CLASSPATH=$(build-classpath jsse jce junit commons-codec commons-logging)
+%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
+mv dist/docs/api apidoc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/commons-httpclient.jar \
-	$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-cd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}.jar; do
-	ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`
-done
-for jar in *-%{version}.jar; do
-	ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"
-done
-cd -
+cp -a dist/commons-httpclient.jar $RPM_BUILD_ROOT%{_javadir}/commons-httpclient-%{version}.jar
+ln -s commons-httpclient-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-httpclient.jar
 
 # javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}
-mv dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a apidoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 # demo
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr src/examples src/contrib $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-# manual and docs
-rm -f dist/docs/{BUILDING,TESTING}.txt
-ln -s %{_javadocdir}/%{name} dist/docs/apidocs
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -pr src/examples/* src/contrib $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -142,16 +141,16 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE.txt README.txt RELEASE_NOTES.txt
-%{_javadir}/*
+%{_javadir}/*.jar
 
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %files demo
 %defattr(644,root,root,755)
-%{_datadir}/%{name}
+%{_examplesdir}/%{name}-%{version}
 
 %files manual
 %defattr(644,root,root,755)
@@ -163,6 +162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2007/04/17 22:14:06  glen
+- unify java package; builds now
+
 Revision 1.6  2007/02/13 08:06:35  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-commons-httpclient3.spec?r1=1.6&r2=1.7&f=u