SPECS: jakarta-commons-httpclient.spec - builds now - unify java p...

[glen]

Author: glen                         Date: Wed Apr 11 22:10:56 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds now
- unify java package

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

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-httpclient.spec
diff -u SPECS/jakarta-commons-httpclient.spec:1.6 SPECS/jakarta-commons-httpclient.spec:1.7
--- SPECS/jakarta-commons-httpclient.spec:1.6	Mon Feb 12 23:09:10 2007
+++ SPECS/jakarta-commons-httpclient.spec	Thu Apr 12 00:10:51 2007
@@ -1,10 +1,10 @@
 # $Revision$, $Date$
-%define	short_name	httpclient
+%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-httpclient
 Version:	2.0.2
-Release:	0.1
+Release:	0.2
 License:	Apache Software License
 Source0:	http://archive.apache.org/dist/jakarta/commons/httpclient/source/commons-httpclient-%{version}-src.tar.gz
 Group:		Development/Languages/Java
@@ -12,11 +12,14 @@
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-logging >= 1.0.3
 BuildRequires:	jce >= 1.2.2
+BuildRequires:	jpackage-utils
 BuildRequires:	jsse >= 1.0.3.01
 BuildRequires:	junit
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jakarta-commons-logging >= 1.0.3
-Provides:	commons-%{short_name}
-Obsoletes:	commons-%{short_name}
+Provides:	commons-httpclient
+Obsoletes:	commons-httpclient
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -61,6 +64,7 @@
 Summary:	Javadoc for %{name}
 Summary(pl.UTF-8):	Dokumentacja javadoc dla pakietu %{name}
 Group:		Documentation
+Requires:	jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -94,66 +98,59 @@
 %prep
 %setup -q -n commons-httpclient-%{version}
 mkdir lib # duh
-rm -rf docs/apidocs docs/*.patch docs/*.orig docs/*.rej
+rm -rf docs/apidocs
+rm -v docs/*.patch docs/*.orig docs/*.rej
 
 %build
-export CLASSPATH=%(build-classpath jsse jce junit jakarta-commons-logging)
-ant \
+export CLASSPATH=%(build-classpath jre/jsse jre/jce junit commons-logging)
+export LC_ALL=en_US # sources are not US-ASCII
+%ant \
 	-Dbuild.sysclasspath=first \
 	-Djavadoc.j2sdk.link=%{_javadocdir}/java \
 	-Djavadoc.logging.link=%{_javadocdir}/jakarta-commons-logging \
 	dist test-nohost
 
+mv dist/docs/api apidoc
+
+# manual and docs
+mv dist/docs/USING_HTTPS.txt .
+rm -f dist/docs/{BUILDING,TESTING}.txt
+
 %install
 rm -rf $RPM_BUILD_ROOT
-
 # jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/commons-%{short_name}.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
-mv dist/docs/USING_HTTPS.txt .
-rm -f dist/docs/{BUILDING,TESTING}.txt
-ln -s %{_javadocdir}/%{name} dist/docs/apidocs
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -pr dist/src/examples/* dist/src/contrib $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
+ln -sf %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
 %doc LICENSE.txt README.txt RELEASE_NOTES.txt USING_HTTPS.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)
@@ -165,6 +162,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2007/04/11 22:10:51  glen
+- builds now
+- unify java package
+
 Revision 1.6  2007/02/12 22:09:10  glen
 - tabs in preamble
 
================================================================

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