SPECS: jakarta-commons-collections.spec - unify - created -source

[glen]

Author: glen                         Date: Wed Apr 11 22:59:28 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify
- created -source

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

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-collections.spec
diff -u SPECS/jakarta-commons-collections.spec:1.14 SPECS/jakarta-commons-collections.spec:1.15
--- SPECS/jakarta-commons-collections.spec:1.14	Mon Apr  9 22:46:40 2007
+++ SPECS/jakarta-commons-collections.spec	Thu Apr 12 00:59:23 2007
@@ -1,9 +1,10 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	Jakarta Commons Collections - Java Collections enhancements
 Summary(pl.UTF-8):	Jakarta Commons Collections - rozszerzenia Java Collections
 Name:		jakarta-commons-collections
 Version:	3.1
-Release:	1
+Release:	1.1
 License:	Apache
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/jakarta/commons/collections/source/commons-collections-%{version}-src.tar.gz
@@ -11,6 +12,7 @@
 URL:		http://jakarta.apache.org/commons/collections/
 BuildRequires:	ant
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jre
 BuildArch:	noarch
@@ -24,41 +26,71 @@
 Pakiet Collections zawiera zestaw klas Javy rozszerzających lub
 powiększających szkielet Java Collections.
 
-%package doc
+%package javadoc
 Summary:	Jakarta Commons Collections documentation
 Summary(pl.UTF-8):	Dokumentacja do Jakarta Commons Collections
-Group:		Development/Languages/Java
+Group:		Documentation
+Requires:	jpackage-utils
+Obsoletes:	jakarta-commons-collections-doc
 
-%description doc
+%description javadoc
 Jakarta Commons Collections documentation.
 
-%description doc -l pl.UTF-8
+%description javadoc -l pl.UTF-8
 Dokumentacja do Jakarta Commons Collections.
 
+%package source
+Summary:	Jakarta Commons Collections source code
+Group:		Development/Languages/Java
+AutoReq:	no
+AutoProv:	no
+
+%description source
+Jakarta Commons Collections source code.
+
 %prep
 %setup -q -n commons-collections-%{version}
 
 %build
-echo 'junit.jar=%{_datadir}/java/junit.jar' > build.properties
+cat <<EOF > build.properties
+junit.jar=$(build-classpath junit)
+EOF
 %ant jar javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
+# jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-
-install build/*.jar $RPM_BUILD_ROOT%{_javadir}
+install build/commons-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-collections-%{version}.jar
 ln -sf commons-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-collections.jar
 
+# javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+
+# source code
+install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
+cp -a src/* $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+ln -sf %{name}-%{version} %{_javadocdir}/%{name}
+
 %files
 %defattr(644,root,root,755)
 %{_javadir}/*.jar
 
-%files doc
+%files javadoc
 %defattr(644,root,root,755)
-%doc build/docs
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
+
+%files source
+%defattr(644,root,root,755)
+%{_prefix}/src/%{name}-%{version}
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -66,6 +98,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2007/04/11 22:59:23  glen
+- unify
+- created -source
+
 Revision 1.14  2007/04/09 20:46:40  glen
 - fix build
 
================================================================

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