SPECS: qdox.spec - unify java package

[glen]

Author: glen                         Date: Sun Dec  2 15:40:40 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package

---- Files affected:
SPECS:
   qdox.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/qdox.spec
diff -u SPECS/qdox.spec:1.7 SPECS/qdox.spec:1.8
--- SPECS/qdox.spec:1.7	Mon Feb 12 23:09:12 2007
+++ SPECS/qdox.spec	Sun Dec  2 16:40:35 2007
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
-%define section free
-
+%include	/usr/lib/rpm/macros.java
 Summary:	Extract class/interface/method definitions from sources
 Summary(pl.UTF-8):	Wyciąganie definicji klas/interfejsów/metod ze źródeł
 Name:		qdox
@@ -23,9 +22,12 @@
 BuildRequires:	byaccj
 BuildRequires:	jflex
 BuildRequires:	jmock >= 1.0
+BuildRequires:	jpackage-utils
 BuildRequires:	junit >= 3.8.1
 BuildRequires:	maven
 BuildRequires:	mockobjects >= 0.09
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	saxon
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -46,6 +48,7 @@
 Summary:	Javadoc for %{name}
 Summary(pl.UTF-8):	Dokumentacja javadoc dla pakietu %{name}
 Group:		Documentation
+Requires:	jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -88,7 +91,7 @@
 
 mkdir -p .maven/repository/JPP/jars
 build-jar-repository -s -p .maven/repository/JPP/jars \
-ant \
+%ant \
 jmock \
 junit \
 
@@ -102,9 +105,8 @@
 
 # jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{version}.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|-%{version}||g"`; done)
+cp -a target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -115,23 +117,17 @@
 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)
 %doc LICENSE.txt
-%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/*.jar
 
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/*
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -139,6 +135,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007-12-02 15:40:35  glen
+- unify java package
+
 Revision 1.7  2007-02-12 22:09:12  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qdox.spec?r1=1.7&r2=1.8&f=u