SPECS: java-sun.spec - removed commented ControlPanel-fix.patch, e...

[hawk]

Author: hawk                         Date: Sat Dec 30 22:05:17 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed commented ControlPanel-fix.patch, everything works without it
- small cleanup, works for me, release 1

---- Files affected:
SPECS:
   java-sun.spec (1.155 -> 1.156) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.155 SPECS/java-sun.spec:1.156
--- SPECS/java-sun.spec:1.155	Sun Dec 17 17:14:49 2006
+++ SPECS/java-sun.spec	Sat Dec 30 23:05:12 2006
@@ -10,15 +10,14 @@
 Summary(pl):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	%{_ver}
-Release:	0.3
+Release:	1
 License:	restricted, distributable
 Group:		Development/Languages/Java
 Source0:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin
 # Source0-md5:	f4481c4e064cec06a65d7751d9105c6d
 Source1:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-amd64.bin
 # Source1-md5:	2e0c075c27b09aed67f99475c3a19f83
-Patch0:		%{name}-ControlPanel-fix.patch
-Patch1:		%{name}-desktop.patch
+Patch0:		%{name}-desktop.patch
 URL:		http://java.sun.com/linux/
 BuildRequires:	rpm-build >= 4.3-0.20040107.21
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -266,10 +265,9 @@
 EOF
 cd jdk%{_dir_ver}
 %ifnarch %{x8664}
-#%patch0 -p1
 # patch only copy of the desktop file, leave original unchanged
 cp jre/plugin/desktop/sun_java.desktop .
-%patch1 -p1
+%patch0 -p1
 %endif
 
 # unpack packed jar files -- in %%prep as it is done "in place"
@@ -296,8 +294,6 @@
 if test -f jre/lib/*.txt ; then
 mv -f jre/lib/*.txt jre
 fi
-#mv jre/lib/font.properties{,.orig}
-#mv jre/lib/font.properties{.Redhat6.1,}
 
 cp -rf jre/{bin,lib} $RPM_BUILD_ROOT%{jredir}
 
@@ -841,6 +837,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156  2006/12/30 22:05:12  hawk
+- removed commented ControlPanel-fix.patch, everything works without it
+- small cleanup, works for me, release 1
+
 Revision 1.155  2006/12/17 16:14:49  arekm
 - fix amd64 build
 
================================================================

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