packages (DEVEL): opera/opera-desktop.patch, opera/opera-pluginpath.patch, ...

arekm arekm at pld-linux.org
Fri Jun 24 11:57:48 CEST 2011 

Author: arekm                        Date: Fri Jun 24 09:57:48 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 11.50 1067 (swordfish rc); opera next now on NEXT branch/tag

---- Files affected:
packages/opera:
   opera-desktop.patch (1.1.2.2 -> 1.1.2.3) , opera-pluginpath.patch (1.4.2.1 -> 1.4.2.2) , opera-wrapper.patch (1.5.2.2 -> 1.5.2.3) , opera.spec (1.246.2.74.2.116 -> 1.246.2.74.2.117) 

---- 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.3
--- packages/opera/opera-desktop.patch:1.1.2.2	Tue May 24 12:35:23 2011
+++ packages/opera/opera-desktop.patch	Fri Jun 24 11:57:42 2011
@@ -1,5 +1,5 @@
---- opera-10.51-6252.i386.linux/share/applications/opera-next-browser.desktop~	2010-03-20 15:38:12.000000000 +0200
-+++ opera-10.51-6252.i386.linux/share/applications/opera-next-browser.desktop	2010-03-20 15:40:34.551656601 +0200
+--- opera-10.51-6252.i386.linux/share/applications/opera-browser.desktop~	2010-03-20 15:38:12.000000000 +0200
++++ opera-10.51-6252.i386.linux/share/applications/opera-browser.desktop	2010-03-20 15:40:34.551656601 +0200
 @@ -2,6 +2,10 @@
  Type=Application
  Version=1.0
@@ -23,7 +23,7 @@
  GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
  GenericName[zu]=Umkhangeli zincwadi we Web
  Comment=Fast and secure web browser and Internet suite
-+Comment[pl]=Szybka i bezpieczna przeglądarka WWW
++Comment[pl]=Najszybsza przeglądarka WWW na świecie
  Icon=opera-browser
  TryExec=/usr/bin/opera
  Exec=/usr/bin/opera %U

================================================================
Index: packages/opera/opera-pluginpath.patch
diff -u packages/opera/opera-pluginpath.patch:1.4.2.1 packages/opera/opera-pluginpath.patch:1.4.2.2
--- packages/opera/opera-pluginpath.patch:1.4.2.1	Tue May 24 12:35:23 2011
+++ packages/opera/opera-pluginpath.patch	Fri Jun 24 11:57:42 2011
@@ -1,24 +1,20 @@
---- opera-10.60-6386.x86_64.linux/share/opera-next/defaults/pluginpath.ini~	2010-07-05 12:35:24.464906567 +0200
-+++ opera-10.60-6386.x86_64.linux/share/opera-next/defaults/pluginpath.ini	2010-07-05 12:36:24.790733975 +0200
-@@ -6,75 +6,9 @@
+--- opera-10.60-6386.x86_64.linux/share/opera/defaults/pluginpath.ini~	2010-07-05 12:35:24.464906567 +0200
++++ opera-10.60-6386.x86_64.linux/share/opera/defaults/pluginpath.ini	2010-07-05 12:36:24.790733975 +0200
+@@ -6,72 +6,8 @@
  plugins=$HOME/.kde/share/config/kcmnspluginrc
  
  [Paths]
 -$PWD/plugins=1
 -$HOME/.local/lib/opera/plugins=1
--/usr/lib/opera-next/plugins=1
--/usr/local/lib/opera-next/plugins=1
--$HOME/.local/lib/opera/plugins=1
-++; Netscape Plug-in Paths
++; Netscape Plug-in Paths
 +$HOME/.mozilla/plugins/=1
  $OPERA_PERSONALDIR/plugins=1
--/usr/lib/opera/plugins=1
++/usr/lib64/opera/plugins=1
+ /usr/lib/opera/plugins=1
 -/usr/local/lib/opera/plugins=1
 -/opt/lib/opera/plugins=1
 -/opt/opera/lib/opera/plugins=1
-+/usr/lib64/opera-next/plugins=1
-+/usr/lib64/opera/plugins=1
- 
+-
 -; Adobe Acrobat
 -/usr/local/Adobe/Reader8/Browser/intellinux=1
 -/usr/local/Acrobat7.0/Browsers/intellinux=1

================================================================
Index: packages/opera/opera-wrapper.patch
diff -u packages/opera/opera-wrapper.patch:1.5.2.2 packages/opera/opera-wrapper.patch:1.5.2.3
--- packages/opera/opera-wrapper.patch:1.5.2.2	Tue May 24 12:35:23 2011
+++ packages/opera/opera-wrapper.patch	Fri Jun 24 11:57:42 2011
@@ -1,15 +1,15 @@
---- opera-10.51-6252.i386.linux/opera-next~	2010-03-20 02:45:01.000000000 +0200
-+++ opera-10.51-6252.i386.linux/opera-next	2010-03-20 13:32:03.132427427 +0200
+--- opera-10.51-6252.i386.linux/opera~	2010-03-20 02:45:01.000000000 +0200
++++ opera-10.51-6252.i386.linux/opera	2010-03-20 13:32:03.132427427 +0200
 @@ -1,4 +1,9 @@
  #!/bin/sh
--export OPERA_DIR=${OPERA_DIR:-"${0%/*}"/share/opera-next}
+-export OPERA_DIR=${OPERA_DIR:-"${0%/*}"/share/opera}
 -export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${0%/*}"/profile}
--exec "${0%/*}"/lib/opera-next/opera-next "$@"
+-exec "${0%/*}"/lib/opera/opera "$@"
 +# set JAVA_HOME from jpackage-utils if available
 +if [ -f /usr/share/java-utils/java-functions ]; then
 +	. /usr/share/java-utils/java-functions
 +	set_jvm
 +fi
-+export OPERA_DIR=/usr/share/opera-next
-+export OPERA_PERSONALDIR=$HOME/.opera-next
-+exec /usr/lib/opera-next/opera-next "$@"
++export OPERA_DIR=/usr/share/opera
++export OPERA_PERSONALDIR=$HOME/.opera
++exec /usr/lib/opera/opera "$@"

================================================================
Index: packages/opera/opera.spec
diff -u packages/opera/opera.spec:1.246.2.74.2.116 packages/opera/opera.spec:1.246.2.74.2.117
--- packages/opera/opera.spec:1.246.2.74.2.116	Tue Jun 14 15:46:39 2011
+++ packages/opera/opera.spec	Fri Jun 24 11:57:42 2011
@@ -2,11 +2,12 @@
 # BRANCHES:
 # - HEAD - stable version
 # - DEVEL - development version
+# - NEXT - opera-next development version
 # - WEEKLY - weekly development version (sometimes it's on DEVEL)
 %bcond_without	distributable	# distributable or not
 
-%define		subver		1040
-%define		subverdir	coar_11.50-1040
+%define		subver		1067
+%define		subverdir	rc1_11.50-1067
 %define		rel		1
 Summary:	World fastest web browser
 Summary(pl.UTF-8):	Najszybsza przeglądarka WWW na świecie
@@ -16,11 +17,11 @@
 Epoch:		2
 License:	Distributable
 Group:		X11/Applications/Networking
-Source0:	http://snapshot.opera.com/unix/%{subverdir}/%{name}-next-%{version}-%{subver}.i386.linux.tar.xz
-# Source0-md5:	7a5345dfbd44be723b6ebd6c559a3042
+Source0:	http://snapshot.opera.com/unix/%{subverdir}/Opera/%{name}-%{version}-%{subver}.i386.linux.tar.xz
+# Source0-md5:	19c1fd144230179fe6d4dc0d09f3fec3
 %{!?with_distributable:NoSource:	0}
-Source1:	http://snapshot.opera.com/unix/%{subverdir}/%{name}-next-%{version}-%{subver}.x86_64.linux.tar.xz
-# Source1-md5:	c1aa323c0ed87109857bbf900373c3d5
+Source1:	http://snapshot.opera.com/unix/%{subverdir}/Opera/%{name}-%{version}-%{subver}.x86_64.linux.tar.xz
+# Source1-md5:	ac7881281ac18f5b03387842a5b75ff9
 %{!?with_distributable:NoSource:	1}
 Patch0:		%{name}-wrapper.patch
 Patch1:		%{name}-desktop.patch
@@ -43,7 +44,7 @@
 
 %define		_enable_debug_packages	0
 
-%define		_plugindir		%{_libdir}/opera-next/plugins
+%define		_plugindir		%{_libdir}/opera/plugins
 %define		_operadocdir	%{_docdir}/%{name}-%{version}
 
 %description
@@ -68,10 +69,10 @@
 
 %prep
 %ifarch %{ix86}
-%setup -q -T -b0 -n %{name}-next-%{version}-%{subver}.i386.linux
+%setup -q -T -b0 -n %{name}-%{version}-%{subver}.i386.linux
 %endif
 %ifarch %{x8664}
-%setup -q -T -b1 -n %{name}-next-%{version}-%{subver}.x86_64.linux
+%setup -q -T -b1 -n %{name}-%{version}-%{subver}.x86_64.linux
 
 %endif
 sed -i -e '
@@ -80,22 +81,25 @@
 	s,@@{_SUFFIX},,
 ' share/{applications/*.desktop,mime/packages/*.xml}
 
-sed -i -e 's,kfmclient exec,xdg-open,' share/opera-next/defaults/filehandler.ini
+sed -i -e 's,kfmclient exec,xdg-open,' share/opera/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
+%{__sed} -i -e '/lib32\|lib64/d;$d' share/opera/defaults/pluginpath.ini
 %patch2 -p1
 
-mv lib/opera-next/plugins/README README.plugins
-mv share/opera-next/defaults/license.txt .
-mv share/doc/opera-next/* .
+mv lib/opera/plugins/README README.plugins
+mv share/opera/defaults/license.txt .
+mv share/doc/opera/* .
 
 # nobody wants scalable huge icons
 rm -rf share/icons/hicolor/scalable
 
+# opera packaging tools we don't need runtime
+mv share/opera/package .
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_datadir},%{_pixmapsdir},%{_desktopdir},%{_sysconfdir}}
@@ -109,11 +113,11 @@
 EOF
 
 install -p opera* $RPM_BUILD_ROOT%{_bindir}
-cp -a lib/opera-next $RPM_BUILD_ROOT%{_libdir}
+cp -a lib/opera $RPM_BUILD_ROOT%{_libdir}
 cp -a share/* $RPM_BUILD_ROOT%{_datadir}
 #cp -a etc/*.ini $RPM_BUILD_ROOT%{_sysconfdir}
 
-sed -i -e 's#/usr/lib/opera-next#%{_libdir}/opera-next#g' $RPM_BUILD_ROOT%{_bindir}/opera-next
+sed -i -e 's#/usr/lib/opera#%{_libdir}/opera#g' $RPM_BUILD_ROOT%{_bindir}/opera
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -141,94 +145,98 @@
 %{_browserpluginsconfdir}/browsers.d/%{name}.*
 %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
 
-%attr(755,root,root) %{_bindir}/opera-next
-%attr(755,root,root) %{_bindir}/opera-next-widget-manager
-%dir %{_libdir}/opera-next
+%attr(755,root,root) %{_bindir}/opera
+%attr(755,root,root) %{_bindir}/opera-widget-manager
+%dir %{_libdir}/opera
 %ifarch %{x8664}
-%exclude %{_libdir}/opera-next/*-ia32-*
+%exclude %{_libdir}/opera/*-ia32-*
 %endif
-%attr(755,root,root) %{_libdir}/opera-next/*.so
-%attr(755,root,root) %{_libdir}/opera-next/opera*
+%attr(755,root,root) %{_libdir}/opera/*.so
+%attr(755,root,root) %{_libdir}/opera/opera*
 %dir %{_plugindir}
-%dir %{_libdir}/opera-next/gstreamer
-%dir %{_libdir}/opera-next/gstreamer/plugins
-%attr(755,root,root) %{_libdir}/opera-next/gstreamer/plugins/libgstoperamatroska.so
-%attr(755,root,root) %{_libdir}/opera-next/gstreamer/plugins/libgstoperavp8.so
-%dir %{_datadir}/opera-next
-%{_datadir}/mime/packages/opera-next-extension.xml
-%{_datadir}/opera-next/*.*
-%{_datadir}/opera-next/defaults
-%{_datadir}/opera-next/extra
-%{_datadir}/opera-next/skin
-#%{_datadir}/opera-next/scripts
-%{_datadir}/opera-next/styles
-%{_datadir}/opera-next/ui
-%{_datadir}/opera-next/unite
-%dir %{_datadir}/opera-next/locale
-%{_datadir}/opera-next/locale/en
-%lang(af) %{_datadir}/opera-next/locale/af
-%lang(az) %{_datadir}/opera-next/locale/az
-%lang(be) %{_datadir}/opera-next/locale/be
-%lang(bg) %{_datadir}/opera-next/locale/bg
-%lang(cs) %{_datadir}/opera-next/locale/cs
-%lang(da) %{_datadir}/opera-next/locale/da
-%lang(de) %{_datadir}/opera-next/locale/de
-%lang(el) %{_datadir}/opera-next/locale/el
-%lang(en_GB) %{_datadir}/opera-next/locale/en-GB
-%lang(es_ES) %{_datadir}/opera-next/locale/es-ES
-%lang(es_LA) %{_datadir}/opera-next/locale/es-LA
-%lang(et) %{_datadir}/opera-next/locale/et
-%lang(fi) %{_datadir}/opera-next/locale/fi
-%lang(fr) %{_datadir}/opera-next/locale/fr
-%lang(fr_CA) %{_datadir}/opera-next/locale/fr-CA
-%lang(fy) %{_datadir}/opera-next/locale/fy
-%lang(gd) %{_datadir}/opera-next/locale/gd
-%lang(hi) %{_datadir}/opera-next/locale/hi
-%lang(hr) %{_datadir}/opera-next/locale/hr
-%lang(hu) %{_datadir}/opera-next/locale/hu
-%lang(id) %{_datadir}/opera-next/locale/id
-%lang(it) %{_datadir}/opera-next/locale/it
-%lang(ja) %{_datadir}/opera-next/locale/ja
-%lang(ka) %{_datadir}/opera-next/locale/ka
-%lang(ko) %{_datadir}/opera-next/locale/ko
-%lang(lt) %{_datadir}/opera-next/locale/lt
-%lang(me) %{_datadir}/opera-next/locale/me
-%lang(mk) %{_datadir}/opera-next/locale/mk
-%lang(ms) %{_datadir}/opera-next/locale/ms
-%lang(nb) %{_datadir}/opera-next/locale/nb
-%lang(nl) %{_datadir}/opera-next/locale/nl
-%lang(nn) %{_datadir}/opera-next/locale/nn
-%lang(pl) %{_datadir}/opera-next/locale/pl
-%lang(pt) %{_datadir}/opera-next/locale/pt
-%lang(pt_BR) %{_datadir}/opera-next/locale/pt-BR
-%lang(ro) %{_datadir}/opera-next/locale/ro
-%lang(ru) %{_datadir}/opera-next/locale/ru
-%lang(sk) %{_datadir}/opera-next/locale/sk
-%lang(sr) %{_datadir}/opera-next/locale/sr
-%lang(sv) %{_datadir}/opera-next/locale/sv
-%lang(ta) %{_datadir}/opera-next/locale/ta
-%lang(te) %{_datadir}/opera-next/locale/te
-%lang(th) %{_datadir}/opera-next/locale/th
-%lang(tl) %{_datadir}/opera-next/locale/tl
-%lang(tr) %{_datadir}/opera-next/locale/tr
-%lang(uk) %{_datadir}/opera-next/locale/uk
-%lang(uz) %{_datadir}/opera-next/locale/uz
-%lang(vi) %{_datadir}/opera-next/locale/vi
-%lang(zh_CN) %{_datadir}/opera-next/locale/zh-cn
-#%lang(zh_HK) %{_datadir}/opera-next/locale/zh-hk
-%lang(zh_TW) %{_datadir}/opera-next/locale/zh-tw
-%{_datadir}/mime/packages/opera-next-widget.xml
-%{_datadir}/mime/packages/opera-next-unite-application.xml
+%dir %{_libdir}/opera/gstreamer
+%dir %{_libdir}/opera/gstreamer/plugins
+%attr(755,root,root) %{_libdir}/opera/gstreamer/plugins/libgstoperamatroska.so
+%attr(755,root,root) %{_libdir}/opera/gstreamer/plugins/libgstoperavp8.so
+%dir %{_datadir}/opera
+%{_datadir}/mime/packages/opera-extension.xml
+%{_datadir}/opera/*.*
+%{_datadir}/opera/defaults
+%{_datadir}/opera/extra
+%{_datadir}/opera/skin
+#%{_datadir}/opera/scripts
+%{_datadir}/opera/styles
+%{_datadir}/opera/ui
+%{_datadir}/opera/unite
+%dir %{_datadir}/opera/locale
+%{_datadir}/opera/locale/en
+%lang(af) %{_datadir}/opera/locale/af
+%lang(az) %{_datadir}/opera/locale/az
+%lang(be) %{_datadir}/opera/locale/be
+%lang(bg) %{_datadir}/opera/locale/bg
+%lang(bn) %{_datadir}/opera/locale/bn
+%lang(cs) %{_datadir}/opera/locale/cs
+%lang(da) %{_datadir}/opera/locale/da
+%lang(de) %{_datadir}/opera/locale/de
+%lang(el) %{_datadir}/opera/locale/el
+%lang(en_GB) %{_datadir}/opera/locale/en-GB
+%lang(es_ES) %{_datadir}/opera/locale/es-ES
+%lang(es_LA) %{_datadir}/opera/locale/es-LA
+%lang(et) %{_datadir}/opera/locale/et
+%lang(fi) %{_datadir}/opera/locale/fi
+%lang(fr) %{_datadir}/opera/locale/fr
+%lang(fr_CA) %{_datadir}/opera/locale/fr-CA
+%lang(fy) %{_datadir}/opera/locale/fy
+%lang(gd) %{_datadir}/opera/locale/gd
+%lang(hi) %{_datadir}/opera/locale/hi
+%lang(hr) %{_datadir}/opera/locale/hr
+%lang(hu) %{_datadir}/opera/locale/hu
+%lang(id) %{_datadir}/opera/locale/id
+%lang(it) %{_datadir}/opera/locale/it
+%lang(ja) %{_datadir}/opera/locale/ja
+%lang(ka) %{_datadir}/opera/locale/ka
+%lang(ko) %{_datadir}/opera/locale/ko
+%lang(lt) %{_datadir}/opera/locale/lt
+%lang(me) %{_datadir}/opera/locale/me
+%lang(mk) %{_datadir}/opera/locale/mk
+%lang(ms) %{_datadir}/opera/locale/ms
+%lang(nb) %{_datadir}/opera/locale/nb
+%lang(nl) %{_datadir}/opera/locale/nl
+%lang(nn) %{_datadir}/opera/locale/nn
+%lang(pa) %{_datadir}/opera/locale/pa
+%lang(pl) %{_datadir}/opera/locale/pl
+%lang(pt) %{_datadir}/opera/locale/pt
+%lang(pt_BR) %{_datadir}/opera/locale/pt-BR
+%lang(ro) %{_datadir}/opera/locale/ro
+%lang(ru) %{_datadir}/opera/locale/ru
+%lang(sk) %{_datadir}/opera/locale/sk
+%lang(sr) %{_datadir}/opera/locale/sr
+%lang(sv) %{_datadir}/opera/locale/sv
+%lang(sw) %{_datadir}/opera/locale/sw
+%lang(ta) %{_datadir}/opera/locale/ta
+%lang(te) %{_datadir}/opera/locale/te
+%lang(th) %{_datadir}/opera/locale/th
+%lang(tl) %{_datadir}/opera/locale/tl
+%lang(tr) %{_datadir}/opera/locale/tr
+%lang(uk) %{_datadir}/opera/locale/uk
+%lang(uz) %{_datadir}/opera/locale/uz
+%lang(vi) %{_datadir}/opera/locale/vi
+%lang(zh_CN) %{_datadir}/opera/locale/zh-cn
+#%lang(zh_HK) %{_datadir}/opera/locale/zh-hk
+%lang(zh_TW) %{_datadir}/opera/locale/zh-tw
+%lang(zu) %{_datadir}/opera/locale/zu
+%{_datadir}/mime/packages/opera-widget.xml
+%{_datadir}/mime/packages/opera-unite-application.xml
 %{_desktopdir}/*.desktop
-%{_mandir}/man1/opera-next.1*
-%{_mandir}/man1/opera-next-widget-manager.1*
+%{_mandir}/man1/opera.1*
+%{_mandir}/man1/opera-widget-manager.1*
 #%{_pixmapsdir}/opera.xpm
 %{_iconsdir}/hicolor/*/*/*.png
 
 %ifarch %{x8664}
 %files plugin32
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/opera-next/*-ia32-*
+%attr(755,root,root) %{_libdir}/opera/*-ia32-*
 %endif
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -237,11 +245,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.246.2.74.2.116  2011/06/14 13:46:39  arekm
-- up to 1040
-
-Revision 1.246.2.74.2.115  2011/05/24 10:35:23  arekm
-- up to 11.50 food_11.50-1015 (opera-next)
+Revision 1.246.2.74.2.117  2011/06/24 09:57:42  arekm
+- up to 11.50 1067 (swordfish rc); opera next now on NEXT branch/tag
 
 Revision 1.246.2.74.2.114  2011/04/11 12:38:38  arekm
 - up to 2092
================================================================

---- 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.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera-pluginpath.patch?r1=1.4.2.1&r2=1.4.2.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera-wrapper.patch?r1=1.5.2.2&r2=1.5.2.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera.spec?r1=1.246.2.74.2.116&r2=1.246.2.74.2.117&f=u

More information about the pld-cvs-commit mailing list