SPECS (java-sun-1_4): java-sun.spec - fix packaging

[glen]

Author: glen                         Date: Wed Apr 11 18:59:13 2007 GMT
Module: SPECS                         Tag: java-sun-1_4
---- Log message:
- fix packaging

---- Files affected:
SPECS:
   java-sun.spec (1.54.2.13 -> 1.54.2.14) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.54.2.13 SPECS/java-sun.spec:1.54.2.14
--- SPECS/java-sun.spec:1.54.2.13	Tue Apr 10 20:33:10 2007
+++ SPECS/java-sun.spec	Wed Apr 11 20:59:08 2007
@@ -6,7 +6,7 @@
 Summary(pl):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	1.4.2_14
-Release:	0.3
+Release:	0.5
 License:	restricted, non-distributable
 Group:		Development/Languages/Java
 # download through forms from http://java.sun.com/j2se/1.4.2/download.html
@@ -41,9 +41,11 @@
 %define		_noautoprov	'\\.\\./.*' '/export/.*'
 # these with SUNWprivate.* are found as required, but not provided
 # the rest is because -jdbc wants unixODBC-devel(?)
-%define		_noautoreq	'libjava.so(SUNWprivate_1.1)' 'libnet.so(SUNWprivate_1.1)' 'libverify.so(SUNWprivate_1.1)' 'libodbcinst.so' 'libodbc.so'
+%define		_noautoreq	'libjava.so(SUNWprivate_1.1)' 'libnet.so(SUNWprivate_1.1)' 'libverify.so(SUNWprivate_1.1)' 'libodbcinst.so' 'libodbc.so'  %{_noautoreqdep_java}
 # don't depend on other JRE/JDK installed on build host
 %define		_noautoreqdep	libjava.so libjvm.so
+# Those generate ClassDataVersion deps 48.0
+%define		_noautoreqfiles htmlconverter.jar tools.jar charsets.jar dnsns.jar ldapsec.jar localedata.jar indicim.jar thaiim.jar plugin.jar rt.jar sunrsasign.jar
 
 %description
 Java Development Kit for Linux.
@@ -217,6 +219,12 @@
 %patch0 -p1
 cp %{SOURCE2} Test.java
 
+mv -f jre/lib/i386/client/Xusage.txt jre/Xusage.client
+mv -f jre/lib/i386/server/Xusage.txt jre/Xusage.server
+mv -f jre/lib/*.txt jre
+mv jre/lib/font.properties{,.orig}
+mv jre/lib/font.properties{.Redhat6.1,}
+
 %build
 ./bin/javac Test.java
 classver=$(file Test.class | grep -o 'compiled Java class data, version [0-9.]*' | awk '{print $NF}')
@@ -231,21 +239,13 @@
 	$RPM_BUILD_ROOT%{_mandir}/{,ja/}man1
 
 cp -rf bin demo include lib $RPM_BUILD_ROOT%{javadir}
-install man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
-install man/ja/man1/* $RPM_BUILD_ROOT%{_mandir}/ja/man1
-
-mv -f jre/lib/i386/client/Xusage.txt jre/Xusage.client
-mv -f jre/lib/i386/server/Xusage.txt jre/Xusage.server
-mv -f jre/lib/*.txt jre
-mv jre/lib/font.properties{,.orig}
-mv jre/lib/font.properties{.Redhat6.1,}
-
 cp -rf jre/{bin,lib} $RPM_BUILD_ROOT%{jredir}
-
 install jce/*.jar $RPM_BUILD_ROOT%{jredir}/lib/security
+install man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+install man/ja/man1/* $RPM_BUILD_ROOT%{_mandir}/ja/man1
 
 # conflict with heimdal
-for i in kinit klist ; do
+for i in kinit klist; do
 	ln -sf %{jredir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/j$i
 	mv -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}.1 $RPM_BUILD_ROOT%{_mandir}/man1/j${i}.1
 	mv -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/${i}.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/j${i}.1
@@ -266,7 +266,7 @@
 
 install -d $RPM_BUILD_ROOT%{netscape4dir}/{plugins,java/classes}
 install jre/plugin/i386/ns4/libjavaplugin.so $RPM_BUILD_ROOT%{netscape4dir}/plugins
-for i in javaplugin rt sunrsasign ; do
+for i in javaplugin rt sunrsasign; do
 	ln -sf %{jredir}/lib/$i.jar $RPM_BUILD_ROOT%{netscape4dir}/java/classes
 done
 
@@ -303,7 +303,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre jre
+%pretrans jre
 if [ -L %{jredir} ]; then
 	rm -f %{jredir}
 fi
@@ -531,6 +531,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54.2.14  2007/04/11 18:59:08  glen
+- fix packaging
+
 Revision 1.54.2.13  2007/04/10 18:33:10  glen
 - there's no javaws.cfg
 - process with macros.java
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/java-sun.spec?r1=1.54.2.13&r2=1.54.2.14&f=u