packages (DEVEL): opera/opera-wrapper.patch, opera/opera.spec - update to 1...

Sat Mar 20 14:48:16 CET 2010

Author: glen                         Date: Sat Mar 20 13:48:16 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- update to 10.51, build 6252

---- Files affected:
packages/opera:
   opera-wrapper.patch (1.5 -> 1.5.2.1) , opera.spec (1.246.2.74.2.32 -> 1.246.2.74.2.33) 

---- Diffs:

================================================================
Index: packages/opera/opera-wrapper.patch
diff -u packages/opera/opera-wrapper.patch:1.5 packages/opera/opera-wrapper.patch:1.5.2.1

--- packages/opera/opera-wrapper.patch:1.5	Sat Jan  2 16:22:30 2010
+++ packages/opera/opera-wrapper.patch	Sat Mar 20 14:48:10 2010
@@ -1,57 +1,15 @@
---- opera	2010-01-01 21:34:51.531475131 +0100
-+++ opera	2010-01-02 17:18:27.938275169 +0200
-@@ -3,7 +3,7 @@
- # but execute it from the extracted package or current location.
- export LC_ALL=C
- # Location of the Opera binaries
--OPERA_BINARYDIR=usr/lib/opera
-+OPERA_BINARYDIR=/usr/lib/opera
- 
- die () {
-     for arg
-@@ -37,15 +37,14 @@
- [ -z "$toset" ] || die "Missing parameter for $arg"
- 
- 
--[ "$PWD" ] || PWD=`/bin/pwd`
- if [ "$_PERSONALDIR_FROM_CMDLINE_" = NO ]
- then
--  OPERA_PERSONALDIR="$PWD/profile"
-+  OPERA_PERSONALDIR="$HOME/.opera"
-   export OPERA_PERSONALDIR
- fi
- 
- # Required for Session Management
--case $0 in /*) OPERA_SCRIPT_PATH=$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/$0;; esac
-+case $0 in /*) OPERA_SCRIPT_PATH=$0;; *) OPERA_SCRIPT_PATH=/usr/bin/$0;; esac
- export OPERA_SCRIPT_PATH
- 
- OPERA_SYSTEM_UNAME=`uname -s`
-@@ -56,10 +55,17 @@
- [ -f "$OPERA_BINARYDIR/opera" ] || die "The Opera binary is not located at \"$OPERA_BINARYDIR/opera\"." "Please modify the wrapper script at \"$0\"."
- [ -x "$OPERA_BINARYDIR/opera" ] || die "You do not have execute rights on \"$OPERA_BINARYDIR/opera\", please ask the sysadmin to chmod +x it."
- 
+--- 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}
+-export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${0%/*}"/profile}
+-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
++	. /usr/share/java-utils/java-functions
++	set_jvm
 +fi
-+
-+
- # Opera enviroment
- if [ -z "$OPERA_DIR" ]
- then
--    OPERA_DIR="$PWD/usr/share/opera"
-+    OPERA_DIR="/usr/share/opera"
- fi
- export OPERA_DIR
- 
-@@ -357,7 +363,7 @@
- 
- # Setting environment relative to current working directory
- # Bundled Qt will be found here unless preloaded by the stance above
--LD_LIBRARY_PATH="$PWD/usr/lib/opera${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
-+LD_LIBRARY_PATH="$OPERA_BINARYDIR/${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
- export LD_LIBRARY_PATH
- 
- # Run Opera:
++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.32 packages/opera/opera.spec:1.246.2.74.2.33
--- packages/opera/opera.spec:1.246.2.74.2.32	Mon Mar 15 12:50:20 2010
+++ packages/opera/opera.spec	Sat Mar 20 14:48:10 2010
@@ -5,33 +5,28 @@
 # - WEEKLY - weekly development version (sometimes it's on DEVEL)
 %bcond_without	distributable	# distributable or not
 
-%define		ver			10.50
-%define		reltype		snapshot
-%define		magicstr	6219
-
-%define		_rel	1
+%define		subver	6252
+%define		rel		1
 Summary:	World fastest web browser
 Summary(pl.UTF-8):	Najszybsza przeglądarka WWW na świecie
 Name:		opera
-Version:	%{ver}
-Release:	0.%{?magicstr:%{magicstr}.}%{_rel}.%{reltype}
+Version:	10.51
+Release:	0.%{subver}.%{rel}
 Epoch:		2
 License:	Distributable
 Group:		X11/Applications/Networking
-
-Source0:	http://snapshot.opera.com/unix/snapshot-%{magicstr}/%{name}-%{ver}-%{magicstr}.i386.linux.tar.bz2
-# Source0-md5:	351a4eb5da64ac601f9f420f266b9ca4
+Source0:	http://snapshot.opera.com/unix/snapshot-%{subver}/%{name}-%{version}-%{subver}.i386.linux.tar.bz2
+# Source0-md5:	c462b6dcb10e27ad869496b0f24fb3fb
 %{!?with_distributable:NoSource:	0}
-
-Source1:	http://snapshot.opera.com/unix/snapshot-%{magicstr}/%{name}-%{ver}-%{magicstr}.x86_64.linux.tar.bz2
-# Source1-md5:	adfe0766c762eb01a4cd18a3c87edcbf
+Source1:	http://snapshot.opera.com/unix/snapshot-%{subver}/%{name}-%{version}-%{subver}.x86_64.linux.tar.bz2
+# Source1-md5:	a5a5d6cfa0204436eb632940e3673647
 %{!?with_distributable:NoSource:	1}
-
-Source4:	%{name}.desktop
 Patch0:		%{name}-wrapper.patch
+Patch1:		%{name}-desktop.patch
 URL:		http://www.opera.com/
 BuildRequires:	rpmbuild(macros) >= 1.356
 BuildRequires:	sed >= 4.0
+Requires(post,postun):	shared-mime-info
 Requires:	browser-plugins >= 2.0
 Requires:	freetype >= 2
 Suggests:	gstreamer-theora
@@ -44,7 +39,7 @@
 %define		_enable_debug_packages	0
 
 %define		_plugindir		%{_libdir}/opera/plugins
-%define		_operadocdir	%{_docdir}/%{name}-%{ver}
+%define		_operadocdir	%{_docdir}/%{name}-%{version}
 
 %description
 Opera is world fastest web browser. It supports most of nowaday
@@ -68,14 +63,28 @@
 
 %prep
 %ifarch %{ix86}
-%setup -q -T -b0 -n %{name}-%{ver}-%{magicstr}.i386.linux
+%setup -q -T -b0 -n %{name}-%{version}-%{subver}.i386.linux
 %endif
-
 %ifarch %{x8664}
-%setup -q -T -b1 -n %{name}-%{ver}-%{magicstr}.x86_64.linux
+%setup -q -T -b1 -n %{name}-%{version}-%{subver}.x86_64.linux
 %endif
+sed -i -e '
+	s,@@{PREFIX},%{_prefix},g
+	s,@@{SUFFIX},,
+	s,@@{_SUFFIX},,
+' share/applications/*.desktop
+
+%patch0 -p1
+%patch1 -p1
+
+mv lib/opera/plugins/README README.plugins
+mv share/doc/opera/* .
 
-%patch0 -p0
+# 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
@@ -89,27 +98,22 @@
 mplayerplug-in*
 EOF
 
-install opera $RPM_BUILD_ROOT%{_bindir}
-cp -a usr/lib/opera $RPM_BUILD_ROOT%{_libdir}
-cp -a usr/share/* $RPM_BUILD_ROOT%{_datadir}
-cp -a etc/*.ini $RPM_BUILD_ROOT%{_sysconfdir}
-
-rm $RPM_BUILD_ROOT/usr/share/doc/opera/{LGPL-2,LGPL-3,LICENSE}
-# opera packaging tools we don't need runtime
-rm -rf $RPM_BUILD_ROOT%{_datadir}/opera/package
-
-# add desktop file
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}
+install -p opera* $RPM_BUILD_ROOT%{_bindir}
+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#^OPERA_BINARYDIR=.*#OPERA_BINARYDIR=%{_libdir}/opera#g' $RPM_BUILD_ROOT%{_bindir}/opera
+sed -i -e 's#/usr/lib/opera#%{_libdir}/opera#g' $RPM_BUILD_ROOT%{_bindir}/opera
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%update_mime_database
 %update_browser_plugins
 
 %postun
+%update_mime_database
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
 fi
@@ -117,20 +121,21 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opera*ini
+#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opera*ini
 
 # browser plugins v2
 %{_browserpluginsconfdir}/browsers.d/%{name}.*
 %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
 
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/opera
+%attr(755,root,root) %{_bindir}/opera-widget-manager
 %dir %{_libdir}/opera
 #%ifarch %{x8664}
 #%exclude %{_libdir}/opera/*-ia32-*
 #%endif
 %attr(755,root,root) %{_libdir}/opera/*.so
 %attr(755,root,root) %{_libdir}/opera/opera*
-%attr(755,root,root) %{_libdir}/opera/works
+#%attr(755,root,root) %{_libdir}/opera/works
 %dir %{_plugindir}
 %dir %{_datadir}/opera
 %{_datadir}/opera/*.*
@@ -182,13 +187,16 @@
 %lang(te) %{_datadir}/opera/locale/te
 %lang(tr) %{_datadir}/opera/locale/tr
 %lang(uk) %{_datadir}/opera/locale/uk
+%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
+%{_datadir}/mime/packages/opera-widget.xml
 %{_desktopdir}/*.desktop
 %{_mandir}/man1/opera.1*
-%{_pixmapsdir}/opera.xpm
-%{_iconsdir}/hicolor/*/*/*.*
+%{_mandir}/man1/opera-widget-manager.1*
+#%{_pixmapsdir}/opera.xpm
+%{_iconsdir}/hicolor/*/*/*.png
 
 #%ifarch %{x8664}
 #files plugin32
@@ -202,6 +210,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.246.2.74.2.33  2010/03/20 13:48:10  glen
+- update to 10.51, build 6252
+
 Revision 1.246.2.74.2.32  2010/03/15 11:50:20  glen
 - cleanup bconds, disable debug package, check-files cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera-wrapper.patch?r1=1.5&r2=1.5.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera.spec?r1=1.246.2.74.2.32&r2=1.246.2.74.2.33&f=u

