packages: batik/batik.spec - find-jar need to be in %build as BR not yet fi...

[glen]

Author: glen                         Date: Sun Jan 17 23:24:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- find-jar need to be in %build as BR not yet filled in %prep

---- Files affected:
packages/batik:
   batik.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: packages/batik/batik.spec
diff -u packages/batik/batik.spec:1.28 packages/batik/batik.spec:1.29
--- packages/batik/batik.spec:1.28	Fri Jan 15 21:29:11 2010
+++ packages/batik/batik.spec	Mon Jan 18 00:23:56 2010
@@ -58,21 +58,22 @@
 %patch0 -p0
 %endif
 
-br_jars='js xalan xercesImpl xml-apis xml-apis-ext'
 rm lib/js.jar lib/xalan*.jar lib/xerces*.jar lib/xml-apis*.jar
-for jar in $br_jars; do
-  ln -s $(find-jar $jar) lib
+
+%build
+unset CLASSPATH || :
+export JAVA_HOME=%{java_home}
+
+jars='js xalan xercesImpl xml-apis xml-apis-ext'
+for jar in jars; do
+	ln -s $(find-jar $jar) lib
 done
 
 %if %{without bootstrap}
-  rm lib/pdf-transcoder.jar
-  ln -s $(find-jar fop-transcoder) lib
+	rm lib/pdf-transcoder.jar
+	ln -s $(find-jar fop-transcoder) lib
 %endif
 
-%build
-unset CLASSPATH || :
-export JAVA_HOME="%{java_home}"
-
 #sh build.sh dist-tgz # does not work :-(
 sh build.sh dist-zip
 
@@ -82,9 +83,9 @@
 
 cd %{name}-%{version}
 for jar in batik*.jar; do
-  base=$(basename $jar .jar)
-  install $jar $RPM_BUILD_ROOT%{_javadir}/$base-%{version}.jar
-  ln -s $base-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$base.jar
+	base=$(basename $jar .jar)
+	install $jar $RPM_BUILD_ROOT%{_javadir}/$base-%{version}.jar
+	ln -s $base-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$base.jar
 done
 
 cd lib
@@ -93,7 +94,7 @@
 done
 
 %if %{with bootstrap}
-  install pdf-transcoder.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/pdf-transcoder.jar
+	install -p pdf-transcoder.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/pdf-transcoder.jar
 %endif
 
 %clean
@@ -117,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2010/01/17 23:23:56  glen
+- find-jar need to be in %build as BR not yet filled in %prep
+
 Revision 1.28  2010/01/15 20:29:11  sparky
 - don't use %{?without_...} - it may not work after inverting bcond
 
@@ -131,7 +135,7 @@
 - up to 1.7
 - use system jars (see TODO)
 - added TODO line
-- better %%files section
+- better %files section
 
 Revision 1.24  2008/12/29 01:17:48  pawelz
 - TODO line about docs and forrest
@@ -170,7 +174,7 @@
 - add BR unzip
 
 Revision 1.13  2004/08/16 10:08:42  luzik
- - updated to 1.5.1
+- updated to 1.5.1
 
 Revision 1.12  2003/11/08 22:20:06  qboosh
 - updated Source0 URL, missing dirs
@@ -185,14 +189,14 @@
 - release 2 - license fix, new doc
 
 Revision 1.7  2002/04/25 15:51:35  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.6  2002/03/19 14:01:39  ankry
 - URL fixed
 
 Revision 1.5  2002/03/12 18:55:40  aflinta
- - corrected JAVA_HOME initialization directory
- - release 2
+- corrected JAVA_HOME initialization directory
+- release 2
 
 Revision 1.4  2002/02/22 23:28:43  kloczek
 - removed all Group fields translations (our rpm now can handle translating
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/batik/batik.spec?r1=1.28&r2=1.29&f=u