packages (NEXT): opera/opera-desktop.patch, opera/opera.spec - fix -next usage

[arekm]

Author: arekm                        Date: Mon Aug  1 11:13:30 2011 GMT
Module: packages                      Tag: NEXT
---- Log message:
- fix -next usage

---- Files affected:
packages/opera:
   opera-desktop.patch (1.1.2.2 -> 1.1.2.2.2.1) , opera.spec (1.246.2.74.2.116.2.2 -> 1.246.2.74.2.116.2.3) 

---- Diffs:

================================================================
Index: packages/opera/opera-desktop.patch
diff -u packages/opera/opera-desktop.patch:1.1.2.2 packages/opera/opera-desktop.patch:1.1.2.2.2.1
--- packages/opera/opera-desktop.patch:1.1.2.2	Tue May 24 12:35:23 2011
+++ packages/opera/opera-desktop.patch	Mon Aug  1 13:13:25 2011
@@ -3,7 +3,7 @@
 @@ -2,6 +2,10 @@
  Type=Application
  Version=1.0
- Name=Opera
+ Name=Opera@@{_SUFFIX}
 +Name[af]=opera
 +Name[eo]=Opero
 +Name[pl]=Opera
@@ -24,7 +24,7 @@
  GenericName[zu]=Umkhangeli zincwadi we Web
  Comment=Fast and secure web browser and Internet suite
 +Comment[pl]=Szybka i bezpieczna przeglądarka WWW
- Icon=opera-browser
- TryExec=/usr/bin/opera
- Exec=/usr/bin/opera %U
+ Icon=opera@@{SUFFIX}-browser
+ TryExec=@@{PREFIX}/bin/opera@@{SUFFIX}
+ Exec=@@{PREFIX}/bin/opera@@{SUFFIX} %U
 

================================================================
Index: packages/opera/opera.spec
diff -u packages/opera/opera.spec:1.246.2.74.2.116.2.2 packages/opera/opera.spec:1.246.2.74.2.116.2.3
--- packages/opera/opera.spec:1.246.2.74.2.116.2.2	Mon Aug  1 12:48:00 2011
+++ packages/opera/opera.spec	Mon Aug  1 13:13:25 2011
@@ -72,19 +72,19 @@
 %endif
 %ifarch %{x8664}
 %setup -q -T -b1 -n %{name}-%{version}-%{subver}.x86_64.linux
-
 %endif
+
+%patch0 -p1
+%patch1 -p1
+
 sed -i -e '
 	s,@@{PREFIX},%{_prefix},g
-	s,@@{SUFFIX},,
-	s,@@{_SUFFIX},,
+	s,@@{SUFFIX},-next,
+	s,@@{_SUFFIX}, Next,
 ' share/{applications/*.desktop,mime/packages/*.xml}
 
 sed -i -e 's,kfmclient exec,xdg-open,' share/opera-next/defaults/filehandler.ini
 
-%patch0 -p1
-%patch1 -p1
-
 # remove lib32/lib64 paths so patch2 can apply (i386 build contained lib64 as well, oh well)
 %{__sed} -i -e '/lib32\|lib64/d;$d' share/opera-next/defaults/pluginpath.ini
 %patch2 -p1
@@ -237,6 +237,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.246.2.74.2.116.2.3  2011/08/01 11:13:25  arekm
+- fix -next usage
+
 Revision 1.246.2.74.2.116.2.2  2011/08/01 10:48:00  arekm
 Rename to opera-next (can be installed alongside with stable).
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera-desktop.patch?r1=1.1.2.2&r2=1.1.2.2.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera.spec?r1=1.246.2.74.2.116.2.2&r2=1.246.2.74.2.116.2.3&f=u