SPECS: jakarta-commons-discovery.spec - unify java package - build...

[glen]

Author: glen                         Date: Tue Apr 17 21:50:32 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package
- builds now too

---- Files affected:
SPECS:
   jakarta-commons-discovery.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-discovery.spec
diff -u SPECS/jakarta-commons-discovery.spec:1.8 SPECS/jakarta-commons-discovery.spec:1.9
--- SPECS/jakarta-commons-discovery.spec:1.8	Tue Feb 13 09:06:35 2007
+++ SPECS/jakarta-commons-discovery.spec	Tue Apr 17 23:50:26 2007
@@ -1,5 +1,6 @@
 # $Revision$, $Date$
-%define	short_name	commons-discovery
+%bcond_with	javadoc	# broken
+%include	/usr/lib/rpm/macros.java
 Summary:	Jakarta Commons Discovery - discovering implementations for pluggable interfaces
 Summary(pl.UTF-8):	Pakiet Jakarta Commons Discovery - wykrywanie implementacji dołączalnych interfejsów
 Name:		jakarta-commons-discovery
@@ -9,10 +10,14 @@
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/jakarta/commons/discovery/source/commons-discovery-%{version}-src.tar.gz
 # Source0-md5:	57968a150ea9b7158ac0e995c8f24080
+Patch0:		%{name}-source.patch
 URL:		http://jakarta.apache.org/commons/discovery/
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-logging >= 1.0.1
+BuildRequires:	jpackage-utils
 BuildRequires:	junit >= 3.7
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jakarta-commons-logging >= 1.0.1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,6 +42,7 @@
 Summary:	Javadoc for %{name}
 Summary(pl.UTF-8):	Dokumentacja javadoc dla pakietu %{name}
 Group:		Documentation
+Requires:	jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -45,46 +51,53 @@
 Dokumentacja javadoc dla pakietu %{name}.
 
 %prep
-%setup -q -n commons-discovery-%{version}
-chmod u+w .
+%setup -q -n commons-discovery-%{version}-src
+chmod -R u+w .
+%patch0 -p1
 
-# No NOTICE.txt file in the sources
-touch NOTICE.txt
+cp discovery/LICENSE.txt LICENSE
 
 %build
-ant \
-	-Djunit.jar=/usr/share/java/junit.jar \
-	-Dlogger.jar=/usr/share/java/commons-logging.jar \
-	test.discovery dist
+cd discovery
+%ant \
+	-Dcompile.source=1.4 \
+	-Djunit.jar=%{_datadir}/java/junit.jar \
+	-Dlogger.jar=%{_datadir}/java/commons-logging.jar \
+	dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd discovery
 
 # jar
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-cd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar %{short_name}-%{version}.jar
-for jar in *-%{version}.jar; do
-	ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`
-done
-cd -
+cp -a dist/commons-discovery.jar $RPM_BUILD_ROOT%{_javadir}/commons-discovery-%{version}.jar
+ln -s commons-discovery-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-discovery.jar
 
 # javadoc
+%if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+ln -sf %{name}-%{version} %{_javadocdir}/%{name}
+
 %files
 %defattr(644,root,root,755)
-%doc LICENSE.txt
-%{_javadir}/*
+%doc discovery/LICENSE.txt
+%{_javadir}/*.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
+%endif
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -92,6 +105,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2007/04/17 21:50:26  glen
+- unify java package
+- builds now too
+
 Revision 1.8  2007/02/13 08:06:35  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-commons-discovery.spec?r1=1.8&r2=1.9&f=u