SPECS: DbConnectionBroker.spec, JADE.spec, JPrologEditor.spec, ant...

glen glen at pld-linux.org
Sun Dec 9 02:23:00 CET 2007 

Author: glen                         Date: Sun Dec  9 01:23:00 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- R: jpackage-utils for %{_javadir}; cosmetics/cleanups

---- Files affected:
SPECS:
   DbConnectionBroker.spec (1.9 -> 1.10) , JADE.spec (1.26 -> 1.27) , JPrologEditor.spec (1.5 -> 1.6) , antlr.spec (1.50 -> 1.51) , asm.spec (1.7 -> 1.8) , asm2.spec (1.8 -> 1.9) , aspectwerkz.spec (1.10 -> 1.11) , avalon-framework.spec (1.16 -> 1.17) , axis.spec (1.9 -> 1.10) , beanshell.spec (1.9 -> 1.10) , bootchart.spec (1.11 -> 1.12) , bsf.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/DbConnectionBroker.spec
diff -u SPECS/DbConnectionBroker.spec:1.9 SPECS/DbConnectionBroker.spec:1.10
--- SPECS/DbConnectionBroker.spec:1.9	Fri Apr 20 12:41:53 2007
+++ SPECS/DbConnectionBroker.spec	Sun Dec  9 02:22:51 2007
@@ -13,14 +13,14 @@
 # Source1-md5:	215ef43a308e40a38fb12d749a601a71
 URL:		http://www.javaexchange.com/
 BuildRequires:	jdk
-BuildRequires:	rpm-javaprov
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	jpackage-utils
 Requires:	jre
 Provides:	java-DbConnectionBroker
 Obsoletes:	java-DbConnectionBroker
 BuildArch:	noarch
-ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -58,7 +58,7 @@
 
 %build
 %javac com/javaexchange/dbConnectionBroker/DbConnectionBroker.java
-jar cvf DbConnectionBroker.jar com/javaexchange/dbConnectionBroker/DbConnectionBroker.class
+%jar cvf DbConnectionBroker.jar com/javaexchange/dbConnectionBroker/DbConnectionBroker.class
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +96,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007-12-09 01:22:51  glen
+- R: jpackage-utils for %{_javadir}; cosmetics/cleanups
+
 Revision 1.9  2007-04-20 10:41:53  glen
 - rel 5
 

================================================================
Index: SPECS/JADE.spec
diff -u SPECS/JADE.spec:1.26 SPECS/JADE.spec:1.27
--- SPECS/JADE.spec:1.26	Mon Feb 12 22:21:30 2007
+++ SPECS/JADE.spec	Sun Dec  9 02:22:51 2007
@@ -11,9 +11,11 @@
 # Source0-md5:	3dd2984dd4e61a4eea5f720d854b2f06
 URL:		http://jade.tilab.com/
 BuildRequires:	ant
+BuildRequires:  jpackage-utils
+BuildRequires:  rpmbuild(macros) >= 1.300
 BuildRequires:	jdk
 BuildRequires:	unzip
-Requires:	jre
+Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -25,25 +27,16 @@
 JADE (Java Agent DEvelopment Framework) to szkielet oprogramowania w
 pełni zaimplementowany w języku Java.
 
-# TODO:
-#%package doc
-#Summary:	Online manual for JADE
-#Summary(pl):	Dokumentacja online do JADE
-#Group:		Documentation
-
-#%description doc
-
 %prep
 %setup -q -n jade
 
 %build
-ant jade
-ant lib
+%ant jade
+%ant lib
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_javadir}/%{name}}
-
 install lib/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
 
 %clean
@@ -54,16 +47,15 @@
 %doc README ChangeLog
 %{_javadir}/%{name}
 
-#%files doc
-#%defattr(644,root,root,755)
-#%doc docs
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2007-12-09 01:22:51  glen
+- R: jpackage-utils for %{_javadir}; cosmetics/cleanups
+
 Revision 1.26  2007-02-12 21:21:30  glen
 - tabs in preamle
 

================================================================
Index: SPECS/JPrologEditor.spec
diff -u SPECS/JPrologEditor.spec:1.5 SPECS/JPrologEditor.spec:1.6
--- SPECS/JPrologEditor.spec:1.5	Mon Feb 12 22:21:30 2007
+++ SPECS/JPrologEditor.spec	Sun Dec  9 02:22:52 2007
@@ -9,6 +9,7 @@
 Source0:	http://520094857424.bei.t-online.de/JPrologEditor/%{name}.jar
 # Source0-md5:	b69363f07ffc3ea6f2ad702a709dc6b8
 URL:		http://520094857424.bei.t-online.de/JPrologEditor
+Requires:	jpackage-utils
 Requires:	jre >= 1.3.1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,6 +68,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2007-12-09 01:22:52  glen
+- R: jpackage-utils for %{_javadir}; cosmetics/cleanups
+
 Revision 1.5  2007-02-12 21:21:30  glen
 - tabs in preamle
 

================================================================
Index: SPECS/antlr.spec
diff -u SPECS/antlr.spec:1.50 SPECS/antlr.spec:1.51
--- SPECS/antlr.spec:1.50	Fri Mar 16 11:53:57 2007
+++ SPECS/antlr.spec	Sun Dec  9 02:22:52 2007
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 # TODO:
-#  *  add python bcond
-#  *  package the Emacs and Jedit modes
+#  - add python bcond
+#  - package the Emacs and Jedit modes
 #
 # Conditional build:
 %bcond_without	gcj	# use javac instead of GCJ
@@ -35,7 +35,7 @@
 %else
 BuildRequires:	jar
 BuildRequires:	jdk
-Requires:	jre
+Requires:	jpackage-utils
 %endif
 %endif
 Conflicts:	pccts < 1.33MR33-6
@@ -175,6 +175,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2007-12-09 01:22:52  glen
+- R: jpackage-utils for %{_javadir}; cosmetics/cleanups
+
 Revision 1.50  2007-03-16 10:53:57  arekm
 - rel 3; use generic jar
 

================================================================
Index: SPECS/asm.spec
diff -u SPECS/asm.spec:1.7 SPECS/asm.spec:1.8
--- SPECS/asm.spec:1.7	Wed Apr 18 01:32:09 2007
+++ SPECS/asm.spec	Sun Dec  9 02:22:52 2007
@@ -19,6 +19,7 @@
 BuildRequires:	objectweb-anttask
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -89,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007-12-09 01:22:52  glen
+- R: jpackage-utils for %{_javadir}; cosmetics/cleanups
+
 Revision 1.7  2007-04-17 23:32:09  glen
 - fix duplicate extension
 

================================================================
Index: SPECS/asm2.spec
diff -u SPECS/asm2.spec:1.8 SPECS/asm2.spec:1.9
--- SPECS/asm2.spec:1.8	Tue Nov 20 18:53:59 2007
+++ SPECS/asm2.spec	Sun Dec  9 02:22:52 2007
@@ -19,6 +19,7 @@
 BuildRequires:	objectweb-anttask
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -92,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2007-12-09 01:22:52  glen
+- R: jpackage-utils for %{_javadir}; cosmetics/cleanups
+
 Revision 1.8  2007-11-20 17:53:59  glen
 - java deps
 

================================================================
Index: SPECS/aspectwerkz.spec
diff -u SPECS/aspectwerkz.spec:1.10 SPECS/aspectwerkz.spec:1.11
--- SPECS/aspectwerkz.spec:1.10	Sun Dec  2 19:58:28 2007
+++ SPECS/aspectwerkz.spec	Sun Dec  9 02:22:52 2007
@@ -35,6 +35,7 @@
 %if %(locale -a | grep -q '^en_US$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
+Requires:	jpackage-utils
 Requires:	concurrent
 Requires:	dom4j
 Requires:	gnu.trove
@@ -211,6 +212,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2007-12-09 01:22:52  glen
+- R: jpackage-utils for %{_javadir}; cosmetics/cleanups
+
 Revision 1.10  2007-12-02 18:58:28  glen
 - satisfy deps, only dom4j left
 

================================================================
Index: SPECS/avalon-framework.spec
diff -u SPECS/avalon-framework.spec:1.16 SPECS/avalon-framework.spec:1.17
--- SPECS/avalon-framework.spec:1.16	Sun Dec  2 20:32:12 2007
+++ SPECS/avalon-framework.spec	Sun Dec  9 02:22:52 2007
@@ -30,8 +30,8 @@
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	sed >= 4.0
+Requires:	jpackage-utils
 BuildArch:	noarch
-ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -91,6 +91,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2007-12-09 01:22:52  glen
+- R: jpackage-utils for %{_javadir}; cosmetics/cleanups
+
 Revision 1.16  2007-12-02 19:32:12  glen
 - builds in this state
 

================================================================
Index: SPECS/axis.spec
diff -u SPECS/axis.spec:1.9 SPECS/axis.spec:1.10
--- SPECS/axis.spec:1.9	Mon Feb 12 23:09:09 2007
+++ SPECS/axis.spec	Sun Dec  9 02:22:52 2007
@@ -13,17 +13,19 @@
 Source0:	http://ws.apache.org/axis//dist/%{archivever}/%{name}-src-%{archivever}.tar.gz
 # Source0-md5:	157ad070accf373565bce80de1204a4d
 URL:		http://ws.apache.org/axis/
-#BuildRequires:	ant-nodeps
 BuildRequires:	ant >= 1.6
+#BuildRequires:	ant-nodeps
 BuildRequires:	jdk
 # Mandatory requires
 BuildRequires:	jaf
 BuildRequires:	jakarta-commons-discovery
 BuildRequires:	jakarta-commons-httpclient3
 BuildRequires:	jakarta-commons-logging
-BuildRequires:	jakarta-log4j
 BuildRequires:	javamail
 BuildRequires:	jaxp_parser_impl
+BuildRequires:	jpackage-utils
+BuildRequires:	logging-log4j
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	servletapi5
 BuildRequires:	wsdl4j
 # optional requires
@@ -42,7 +44,7 @@
 Requires:	java
 Requires:	javamail
 Requires:	jaxp_parser_impl
-#Requires:	jpackage-utils >= 0:1.5
+Requires:	jpackage-utils
 Requires:	log4j
 Requires:	wsdl4j
 BuildArch:	noarch
@@ -82,7 +84,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Summary(pl.UTF-8):	Dokumentacja javadoc dla pakietu %{name}
-Group:		Development/Languages/Java
+Group:		Documentation
+Requires:	jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -105,43 +108,41 @@
 %setup -q -n %{name}-%{archivever}
 
 # Remove provided binaries
-find . -name "*.jar" -exec rm -f {} \;
-find . -name "*.zip" -exec rm -f {} \;
-find . -name "*.class" -exec rm -f {} \;
+find -name '*.jar' | xargs rm -v
+find -name '*.zip' | xargs rm -v
+find -name '*.class' | xargs rm -v
 
 %build
-
-[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
+export JAVA_HOME=%{java_home}
 
 CLASSPATH=$(build-classpath wsdl4j jakarta-commons-discovery jakarta-commons-httpclient3 jakarta-commons-logging log4j jaf javamail/mailapi servletapi5)
 export CLASSPATH=$CLASSPATH:$(build-classpath oro junit jimi xml-security jsse httpunit jms castor 2>/dev/null)
 
 export OPT_JAR_LIST="ant/ant-nodeps"
-ant \
+%ant \
 	-Dcompile.ime=true \
-	-Dwsdl4j.jar=$(build-classpath wsdl4j) \
-	-Dcommons-discovery.jar=$(build-classpath jakarta-commons-discovery) \
-	-Dcommons-logging.jar=$(build-classpath jakarta-commons-logging) \
-	-Dcommons-httpclient.jar=$(build-classpath jakarta-commons-httpclient3) \
-	-Dlog4j-core.jar=$(build-classpath log4j) \
-	-Dactivation.jar=$(build-classpath jaf) \
-	-Dmailapi.jar=$(build-classpath javamail/mailapi) \
-	-Dxerces.jar=$(build-classpath jaxp_parser_impl) \
-	-Dservlet.jar=$(build-classpath servletapi5) \
-	-Dregexp.jar=$(build-classpath oro 2>/dev/null) \
-	-Djunit.jar=$(build-classpath junit 2>/dev/null) \
-	-Djimi.jar=$(build-classpath jimi 2>/dev/null) \
-	-Djsse.jar=$(build-classpath jsse/jsse 2>/dev/null) \
+	-Dwsdl4j.jar=$(find-jar wsdl4j) \
+	-Dcommons-discovery.jar=$(find-jar jakarta-commons-discovery) \
+	-Dcommons-logging.jar=$(find-jar jakarta-commons-logging) \
+	-Dcommons-httpclient.jar=$(find-jar jakarta-commons-httpclient3) \
+	-Dlog4j-core.jar=$(find-jar log4j) \
+	-Dactivation.jar=$(find-jar jaf) \
+	-Dmailapi.jar=$(find-jar javamail/mailapi) \
+	-Dxerces.jar=$(find-jar jaxp_parser_impl) \
+	-Dservlet.jar=$(find-jar servletapi5) \
+	-Dregexp.jar=$(find-jar oro) \
+	-Djunit.jar=$(find-jar junit) \
+	-Djimi.jar=$(find-jar jimi) \
+	-Djsse.jar=$(find-jar jsse/jsse) \
 	clean compile javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 ### Jar files
-
 install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
 
 cd build/lib
-install -m 644 axis.jar axis-ant.jar saaj.jar jaxrpc.jar \
+install axis.jar axis-ant.jar saaj.jar jaxrpc.jar \
 	$RPM_BUILD_ROOT%{_javadir}/%{name}
 cd -
 
@@ -154,26 +155,15 @@
 cd -
 
 ### Javadoc
-
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-cd docs
-rm -fr apiDocs
-ln -fs %{_javadocdir}/%{name} apiDocs
-cd -
+cp -a build/javadocs/* $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)
@@ -183,8 +173,8 @@
 
 %files javadoc
 %defattr(644,root,root,755)
-%dir %{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}-%{version}/*
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %files manual
 %defattr(644,root,root,755)
@@ -196,6 +186,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007-12-09 01:22:52  glen
+- R: jpackage-utils for %{_javadir}; cosmetics/cleanups
+
 Revision 1.9  2007-02-12 22:09:09  glen
 - tabs in preamble
 

================================================================
Index: SPECS/beanshell.spec
diff -u SPECS/beanshell.spec:1.9 SPECS/beanshell.spec:1.10
--- SPECS/beanshell.spec:1.9	Mon Feb 12 22:23:49 2007
+++ SPECS/beanshell.spec	Sun Dec  9 02:22:52 2007
@@ -5,6 +5,7 @@
 #
 %define		_beta	b4
 %define		_rel	2
+%include	/usr/lib/rpm/macros.java
 Summary:	BeanShell - Lightweight Scripting for Java
 Summary(pl.UTF-8):	BeanShell - lekkie skrypty dla Javy
 Name:		beanshell
@@ -19,12 +20,13 @@
 %{?with_bsf:BuildRequires:	bsf}
 BuildRequires:	jdk >= 1.3
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	servlet
 BuildRequires:	unzip
+Requires:	jpackage-utils
 Requires:	jre >= 1.1
 BuildArch:	noarch
-ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -57,8 +59,8 @@
 %setup -q -n BeanShell-%{version}%{_beta}
 
 %build
-export CLASSPATH="`build-classpath %{?with_bsf:bsf} servlet`"
-export JAVA_HOME="%{java_home}"
+required_jars="%{?with_bsf:bsf} servlet"
+export CLASSPATH=$(build-classpath $required_jars)
 
 %ant jarall javadoc \
 	%{!?with_bsf:-Dexclude-bsf='bsh/util/BeanShellBSFEngine.java,TestBshBSF.java'}
@@ -69,14 +71,19 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
 
+# jars
 install dist/bsh-%{version}%{_beta}.jar $RPM_BUILD_ROOT%{_javadir}
 ln -sf bsh-%{version}%{_beta}.jar $RPM_BUILD_ROOT%{_javadir}/bsh.jar
 
-cp -R javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a javadoc/* $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
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+
 %files
 %defattr(644,root,root,755)
 %doc asm/README-asm.txt bsf/README src/{*.html,*.txt}
@@ -85,15 +92,18 @@
 
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
-
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007-12-09 01:22:52  glen
+- R: jpackage-utils for %{_javadir}; cosmetics/cleanups
+
 Revision 1.9  2007-02-12 21:23:49  glen
 - tabs in preamble
 

================================================================
Index: SPECS/bootchart.spec
diff -u SPECS/bootchart.spec:1.11 SPECS/bootchart.spec:1.12
--- SPECS/bootchart.spec:1.11	Tue Feb 13 07:46:49 2007
+++ SPECS/bootchart.spec	Sun Dec  9 02:22:52 2007
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	Boot Process Performance Visualization
 Summary(pl.UTF-8):	Wizualizacja wydajności procesu startu systemu
 Name:		bootchart
@@ -16,6 +17,7 @@
 BuildRequires:	jakarta-commons-cli >= 0:1.0
 BuildRequires:	jaxp_parser_impl
 BuildRequires:	jpackage-utils >= 0:1.5
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.294
 Requires:	jakarta-commons-cli >= 0:1.0
 Requires:	jpackage-utils >= 0:1.5
@@ -71,20 +73,20 @@
 %patch0 -p1
 %patch1 -p1
 
-%build
 # Remove the bundled commons-cli
 rm -rf lib/org/apache/commons/cli lib/org/apache/commons/lang
 
+%build
 required_jars="commons-cli"
-export CLASSPATH="`/usr/bin/build-classpath $required_jars`"
-
+export CLASSPATH=$(build-classpath $required_jars)
 %ant
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_javadir}
 
 # jar
-install -D %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # script
@@ -103,12 +105,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-ln -sf %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-	rm -f %{_javadocdir}/%{name}
-fi
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 
 %post logger
 # Add a new grub/lilo entry
@@ -139,13 +136,13 @@
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog COPYING INSTALL README TODO lib/LICENSE.cli.txt lib/LICENSE.compress.txt lib/LICENSE.epsgraphics.txt lib/NOTICE.txt
-%{_javadir}/*
 %dir %{_bindir}/bootchart
+%{_javadir}/*.jar
 
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %files logger
 %defattr(644,root,root,755)
@@ -159,6 +156,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007-12-09 01:22:52  glen
+- R: jpackage-utils for %{_javadir}; cosmetics/cleanups
+
 Revision 1.11  2007-02-13 06:46:49  glen
 - tabs in preamble
 

================================================================
Index: SPECS/bsf.spec
diff -u SPECS/bsf.spec:1.23 SPECS/bsf.spec:1.24
--- SPECS/bsf.spec:1.23	Thu Mar  1 09:43:41 2007
+++ SPECS/bsf.spec	Sun Dec  9 02:22:52 2007
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	Bean Scripting Framework
 Summary(pl.UTF-8):	Bean Scripting Framework - środowisko skryptowe
 Name:		bsf
@@ -14,11 +15,12 @@
 BuildRequires:	jpackage-utils
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/DbConnectionBroker.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/JADE.spec?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/JPrologEditor.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/antlr.spec?r1=1.50&r2=1.51&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/asm.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/asm2.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/aspectwerkz.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/avalon-framework.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/axis.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/beanshell.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bootchart.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bsf.spec?r1=1.23&r2=1.24&f=u

More information about the pld-cvs-commit mailing list