SPECS: opera.spec - patch wrapper script for JAVA_HOME setting fro...

glen glen at pld-linux.org
Thu Nov 30 16:31:22 CET 2006


Author: glen                         Date: Thu Nov 30 15:31:22 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- patch wrapper script for JAVA_HOME setting from jpackage-utils; rel 3

---- Files affected:
SPECS:
   opera.spec (1.208 -> 1.209) 

---- Diffs:

================================================================
Index: SPECS/opera.spec
diff -u SPECS/opera.spec:1.208 SPECS/opera.spec:1.209
--- SPECS/opera.spec:1.208	Fri Nov 24 21:04:17 2006
+++ SPECS/opera.spec	Thu Nov 30 16:31:17 2006
@@ -199,11 +199,12 @@
 %endif
 #	with incall;	[endif]
 
+%define		_rel	3
 Summary:	World fastest web browser
 Summary(pl):	Najszybsza przeglądarka WWW na świecie
 Name:		opera
 Version:	%{ver}%{fix}
-Release:	%{?with_snap:1.%{rel}.}2
+Release:	%{?with_snap:1.%{rel}.}%{_rel}
 Epoch:		2
 License:	Distributable for PLD until 31 Dec 2006 - http://distribute.opera.com/ (otherwise restricted, see file LICENSE)
 Group:		X11/Applications/Networking
@@ -297,7 +298,7 @@
 %endif
 
 Source4:	%{name}.desktop
-
+Patch0:		%{name}-wrapper.patch
 URL:		http://www.opera.com/
 BuildRequires:	sed >= 4.0
 Requires:	freetype >= 2
@@ -328,6 +329,7 @@
 %ifarch ppc
 %setup -q -T -b %{?with_weekly:30}%{?with_snap:10}%{?with_shared:2}2 -n %{name}-%{sver}-%{rel}-%{type}-qt.ppc-en%{?magicstr:-%{magicstr}}
 %endif
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -343,7 +345,6 @@
 install images/opera.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}
 
-%{__sed} -i -e 's#\(.*\)OPERA_SCRIPT_PATH=.*\(\$0.*\)#\1OPERA_SCRIPT_PATH=%{_bindir}/\2#g' $RPM_BUILD_ROOT%{_bindir}/opera
 mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config/* $RPM_BUILD_ROOT%{_sysconfdir}
 
 %clean
@@ -379,6 +380,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.209  2006/11/30 15:31:17  glen
+- patch wrapper script for JAVA_HOME setting from jpackage-utils; rel 3
+
 Revision 1.208  2006/11/24 20:04:17  arekm
 - up to weekly 499
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/opera.spec?r1=1.208&r2=1.209&f=u



More information about the pld-cvs-commit mailing list