SPECS: jakarta-commons-beanutils.spec - java deps - new URL - add ...

[glen]

Author: glen                         Date: Fri Dec  7 23:12:55 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- java deps
- new URL
- add -target.patch to build with 1.3 source

---- Files affected:
SPECS:
   jakarta-commons-beanutils.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-beanutils.spec
diff -u SPECS/jakarta-commons-beanutils.spec:1.14 SPECS/jakarta-commons-beanutils.spec:1.15
--- SPECS/jakarta-commons-beanutils.spec:1.14	Sun Sep  2 12:48:53 2007
+++ SPECS/jakarta-commons-beanutils.spec	Sat Dec  8 00:12:50 2007
@@ -1,20 +1,24 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	Jakarta Commons BeanUtils - Bean Introspection Utilities
 Summary(pl.UTF-8):	Jakarta Commons BeanUtils - narzędzia do badania JavaBeans
 Name:		jakarta-commons-beanutils
 Version:	1.7.0
-Release:	1
+Release:	2
 License:	Apache
 Group:		Development/Languages/Java
-Source0:	http://archive.apache.org/dist/jakarta/commons/beanutils/source/commons-beanutils-%{version}-src.zip
-# Source0-md5:	9d320be7faefd9b260983dbc57f03875
-URL:		http://jakarta.apache.org/commons/beanutils/
+Source0:	http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz
+# Source0-md5:	3fd5cbdf70363b151de5cd538f726e67
+Patch0:		%{name}-target.patch
+URL:		http://commons.apache.org/beanutils/
 BuildRequires:	jakarta-commons-collections
 BuildRequires:	jakarta-commons-logging
 BuildRequires:	jpackage-utils
 BuildRequires:	junit
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jre
+Suggests:	jakarta-commons-collectsion
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,39 +51,36 @@
 
 %prep
 %setup -q -n commons-beanutils-%{version}-src
+%patch0 -p1
 
 %build
-# sources are not in ASCII
-export LC_ALL=en_US
 required_jars="commons-logging commons-collections"
-export CLASSPATH="`/usr/bin/build-classpath $required_jars`"
+export CLASSPATH=$(build-classpath $required_jars)
+export LC_ALL=en_US # sources are not in ASCII
 %ant dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
-for a in dist/*.jar; do
-	jar=${a##*/}
-	cp -a dist/$jar $RPM_BUILD_ROOT%{_javadir}/${jar%%.jar}-%{version}.jar
-	ln -s ${jar%%.jar}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$jar
-done
+# jars
+cp -a dist/commons-beanutils.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-%{version}.jar
+ln -s commons-beanutils-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils.jar
+cp -a dist/commons-beanutils-core.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-core-%{version}.jar
+ln -s commons-beanutils-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-core.jar
+cp -a dist/commons-beanutils-bean-collections.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-bean-collections-%{version}.jar
+ln -s commons-beanutils-bean-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-bean-collections.jar
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-	rm -f %{_javadocdir}/%{name}
-fi
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
@@ -89,6 +90,7 @@
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -96,6 +98,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2007-12-07 23:12:50  glen
+- java deps
+- new URL
+- add -target.patch to build with 1.3 source
+
 Revision 1.14  2007-09-02 10:48:53  qboosh
 - cleanup
 
================================================================

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