SPECS: java-sun.spec - simplify - overwrite duplicate files with s...

glen glen at pld-linux.org
Tue Jan 30 00:29:13 CET 2007 

Author: glen                         Date: Mon Jan 29 23:29:13 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- simplify
- overwrite duplicate files with symlinks from -jre
- package all bin progs to system bindir

---- Files affected:
SPECS:
   java-sun.spec (1.169 -> 1.170) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.169 SPECS/java-sun.spec:1.170
--- SPECS/java-sun.spec:1.169	Mon Jan 29 23:08:35 2007
+++ SPECS/java-sun.spec	Tue Jan 30 00:29:08 2007
@@ -10,7 +10,7 @@
 Summary(pl):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	1.6.0
-Release:	3.3
+Release:	3.5
 License:	restricted, distributable
 Group:		Development/Languages/Java
 Source0:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin
@@ -264,16 +264,16 @@
 %endif
 yes
 EOF
-cd jdk%{_dir_ver}
-%ifnarch %{x8664}
+cd -
+%ifarch %{ix86}
 # patch only copy of the desktop file, leave original unchanged
 cp jre/plugin/desktop/sun_java.desktop .
 %patch0 -p1
 %endif
 
 # unpack packed jar files -- in %%prep as it is done "in place"
-for pack in `find . -name '*.pack'`; do
-	bin/unpack200 -r $pack `echo $pack|sed -e's/\.pack$/.jar/'`
+for pack in $(find . -name '*.pack'); do
+	bin/unpack200 -r $pack ${pack%.pack}.jar
 done
 
 %install
@@ -299,7 +299,7 @@
 cp -rf jre/{bin,lib} $RPM_BUILD_ROOT%{jredir}
 
 for i in ControlPanel java javaws java_vm keytool orbd policytool \
-	rmid rmiregistry servertool tnameserv ; do
+	rmid rmiregistry servertool tnameserv pack200 unpack200 jconsole apt; do
 	ln -sf %{jredir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i
 done
 
@@ -317,14 +317,10 @@
 
 # make sure all tools are available under $(JDK_HOME)/bin
 for i in ControlPanel keytool kinit klist orbd policytool rmid \
-		rmiregistry servertool tnameserv ; do
+		rmiregistry servertool tnameserv pack200 unpack200 java javaws; do
 	ln -sf ../jre/bin/$i $RPM_BUILD_ROOT%{javadir}/bin/$i
 done
 
-rm -f $RPM_BUILD_ROOT%{javadir}/bin/{java,javaws}
-ln -sf %{jredir}/bin/java $RPM_BUILD_ROOT%{javadir}/bin/java
-ln -sf %{jredir}/bin/javaws $RPM_BUILD_ROOT%{javadir}/bin/javaws
-
 %ifarch %{ix86}
 # copy _all_ plugin files (even those incompatible with PLD) --
 # license restriction
@@ -403,6 +399,7 @@
 %attr(755,root,root) %{_bindir}/java-rmi.cgi
 %attr(755,root,root) %{_bindir}/jcontrol
 %endif
+%attr(755,root,root) %{_bindir}/apt
 %attr(755,root,root) %{_bindir}/extcheck
 %attr(755,root,root) %{_bindir}/idlj
 %attr(755,root,root) %{_bindir}/jarsigner
@@ -410,6 +407,7 @@
 %attr(755,root,root) %{_bindir}/javadoc
 %attr(755,root,root) %{_bindir}/javah
 %attr(755,root,root) %{_bindir}/javap
+%attr(755,root,root) %{_bindir}/jconsole
 %attr(755,root,root) %{_bindir}/jdb
 %attr(755,root,root) %{_bindir}/jhat
 %attr(755,root,root) %{_bindir}/jinfo
@@ -543,6 +541,8 @@
 %attr(755,root,root) %{_bindir}/rmid
 %attr(755,root,root) %{_bindir}/servertool
 %attr(755,root,root) %{_bindir}/tnameserv
+%attr(755,root,root) %{_bindir}/pack200
+%attr(755,root,root) %{_bindir}/unpack200
 %attr(755,root,root) %{jredir}/bin/pack200
 %attr(755,root,root) %{jredir}/bin/unpack200
 %attr(755,root,root) %{javadir}/bin/pack200
@@ -771,6 +771,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.170  2007/01/29 23:29:08  glen
+- simplify
+- overwrite duplicate files with symlinks from -jre
+- package all bin progs to system bindir
+
 Revision 1.169  2007/01/29 22:08:35  glen
 - libsplashscreen.so available on amd64 too
 - don't create dead symlinks
@@ -1064,7 +1069,7 @@
 - rel 1
 
 Revision 1.78  2004/10/21 20:46:21  pluto
-- %%files fixed.
+- %files fixed.
 
 Revision 1.77  2004/10/20 20:33:56  qboosh
 - remove two libs with broken deps from demos; .so perms in demos
@@ -1107,13 +1112,13 @@
 - fixed dep in mozilla-plugin-, locale names fixes (need check)
 
 Revision 1.65  2004/07/13 11:19:00  pluto
-- %%{_javalibdir} == (rpm) %%{_javadir}.
+- %{_javalibdir} == (rpm) %{_javadir}.
 
 Revision 1.64  2004/07/13 10:19:31  pluto
 - symlink(javaws.jar) fixed.
 
 Revision 1.63  2004/07/13 10:11:36  pluto
-- oops, %%find_lang removed.
+- oops, %find_lang removed.
 
 Revision 1.62  2004/07/13 10:08:47  pluto
 - locales tagged.
@@ -1155,7 +1160,7 @@
 Revision 1.51  2003/10/22 17:29:48  qboosh
 - resolved autodeps error with new rpm (now new rpm is BRed for .* support)
 - separated alsa module
-- added missing %%{_bindir}/rmiregistry symlink
+- added missing %{_bindir}/rmiregistry symlink
 
 Revision 1.49  2003/10/13 08:47:07  qboosh
 - keep NoSource-md5
@@ -1186,7 +1191,7 @@
 - ko and ko_KR are the same
 
 Revision 1.40  2003/08/29 17:54:41  ankry
-- kill encoding in %%lang
+- kill encoding in %lang
 
 Revision 1.39  2003/08/11 22:46:31  ankry
 - cosmetics
@@ -1195,7 +1200,7 @@
 - moved lib*.so Provides to -jre (where these libs exist)
 - moved .jar symlinks and Provides to -jre (runtime stuff, not development)
 - libstdc++-compat seems no longer needed
-- mozilla gcc 2.9x plugin renamed to mozilla-plugin-gcc2-%%{name}
+- mozilla gcc 2.9x plugin renamed to mozilla-plugin-gcc2-%{name}
 - fixed -tools separation
 - added missing k{init,list,tab} manuals
 - added patch for broken ControlPanel script
@@ -1217,7 +1222,7 @@
 - rel. 2
 
 Revision 1.32  2003/05/08 09:08:50  qboosh
-- no sense to call ldconfig in %%post jre
+- no sense to call ldconfig in %post jre
 
 Revision 1.31  2003/04/11 10:12:57  misiek
 - working solution
@@ -1256,10 +1261,10 @@
 
 Revision 1.20  2002/09/04 18:24:32  qboosh
 - merged standarization from DEVEL - seems successful, tomcat and jedit work
-- added %%pre - remove old symlinks before making directories
+- added %pre - remove old symlinks before making directories
 
 Revision 1.19  2002/08/25 13:18:51  bonkey
-- remove %%{jdkdir} before doing a link avoids making it at the directory
+- remove %{jdkdir} before doing a link avoids making it at the directory
   if earlier version is not uninstalled cleanly (e.g. when there are some
   changes in jre .properties)
 - changed default font.properties to font.properties.RedHat.6.1 to avoid
@@ -1281,7 +1286,7 @@
 - Release 0.5
 
 Revision 1.15  2002/06/15 14:15:23  ankry
-- zh, ko %%lang renamed
+- zh, ko %lang renamed
 - release 0.4
 
 Revision 1.14  2002/05/14 09:33:16  saq
@@ -1291,7 +1296,7 @@
 - - Prereq mozilla-embedded
 
 Revision 1.13  2002/04/25 16:38:57  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.12  2002/04/21 18:04:14  qboosh
 - _noautoreqdep to prevent wrong requires when building with another JRE
@@ -1345,12 +1350,12 @@
 - removed unnecessary #!/bin/sh
 
 Revision 1.12  2002/02/08 22:17:00  filon
-- %%post jre -> %%post -n jre
-- also moved %%post command to script (not -p, because rpm trats following -n as for package name)
+- %post jre -> %post -n jre
+- also moved %post command to script (not -p, because rpm trats following -n as for package name)
 - release 2
 
 Revision 1.11  2002/01/18 02:13:23  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.10  2002/01/04 15:19:43  blues
 - added ldconfig call in post
@@ -1366,7 +1371,7 @@
 
 Revision 1.6  2001/12/16 02:42:25  michuz
 - release 2
-- symlink /usr/include/jdk -> /usr/lib/jdk%%version/include
+- symlink /usr/include/jdk -> /usr/lib/jdk%version/include
 
 Revision 1.5  2001/12/14 13:59:21  qrczak
 - Update to 1.3.1_01 (1.3.1 is no longer on http://java.sun.com/linux/).
================================================================

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

More information about the pld-cvs-commit mailing list