Author: arekm Date: Tue Sep 1 12:59:15 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- make agent mess nicer
---- Files affected:
packages/opera:
opera.spec (1.291 -> 1.292) , opera-agent.patch (NONE -> 1.1) (NEW),
opera-agent-ac.patch (1.1 -> NONE) (REMOVED), opera-agent-th.patch (1.2 ->
NONE) (REMOVED), opera-agent-ti.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/opera/opera.spec
diff -u packages/opera/opera.spec:1.291 packages/opera/opera.spec:1.292
--- packages/opera/opera.spec:1.291 Tue Sep 1 12:39:22 2009
+++ packages/opera/opera.spec Tue Sep 1 14:59:10 2009
@@ -33,9 +33,7 @@
# Source13-md5: 0b484b74ee07e5ac93f153dd33e25437
Source0: %{name}.desktop
Patch0: %{name}-wrapper.patch
-Patch1: %{name}-agent-ac.patch
-Patch2: %{name}-agent-th.patch
-Patch3: %{name}-agent-ti.patch
+Patch1: %{name}-agent.patch
URL: http://www.opera.com/
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.356
@@ -91,15 +89,6 @@
%setup -q -T -b 12 -n %{name}-%{version}-%{buildid}.gcc4-shared-qt3.ppc
%endif
%patch0 -p1
-%if "%{pld_release}" == "ac"
-%patch1 -p0
-%endif
-%if "%{pld_release}" == "th"
-%patch2 -p0
-%endif
-%if "%{pld_release}" == "ti"
-%patch3 -p0
-%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -143,6 +132,17 @@
install etc/* $RPM_BUILD_ROOT%{_sysconfdir}
install usr/share/pixmaps/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
+%if "%{pld_release}" == "ti"
+sed -i -e 's#DISTRO#PLD/Titanium#g' $RPM_BUILD_ROOT/etc/operaprefs_default.ini
+%else
+%if "%{pld_release}" == "ac"
+sed -i -e 's#DISTRO#PLD/2.0 (Ac)#g' $RPM_BUILD_ROOT/etc/operaprefs_default.ini
+%else
+sed -i -e 's#DISTRO#PLD/3.0 (Th)#g' $RPM_BUILD_ROOT/etc/operaprefs_default.ini
+%endif
+%endif
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -253,6 +253,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.292 2009/09/01 12:59:10 arekm
+- make agent mess nicer
+
Revision 1.291 2009/09/01 10:39:22 arekm
- up to 10.00 final
================================================================
Index: packages/opera/opera-agent.patch
diff -u /dev/null packages/opera/opera-agent.patch:1.1
--- /dev/null Tue Sep 1 14:59:15 2009
+++ packages/opera/opera-agent.patch Tue Sep 1 14:59:10 2009
@@ -0,0 +1,11 @@
+--- etc/operaprefs_default.ini.org 2008-10-23 00:47:51.000000000 +0200
++++ etc/operaprefs_default.ini 2008-10-23 00:48:08.000000000 +0200
+@@ -6,3 +6,7 @@
+ [Auto Update]
+ Package Type=tar
+ Package Qt Linkage=qt3-shared
++
++[ISP]
++Id="DISTRO"
++
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera.spec?r1=1.291&r2=1.292&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
