- make agent mess nicer

Changed files:
    opera-agent-ac.patch -> 1.2
    opera-agent-th.patch -> 1.3
    opera-agent-ti.patch -> 1.2
    opera-agent.patch -> 1.1
    opera.spec -> 1.292

diff --git a/opera-agent-ac.patch b/opera-agent-ac.patch
deleted file mode 100644 (file)
index 0a1424c..0000000
--- a/opera-agent-ac.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- etc/opera6rc.orig  2008-10-23 00:47:51.000000000 +0200
-+++ etc/opera6rc       2008-10-23 00:48:08.000000000 +0200
-@@ -3,3 +3,6 @@
- [User Prefs]
- Language Files Directory=/usr/share/opera/locale
- Force DPI=96
-+
-+[ISP]
-+Id="PLD/2.0 (Ac)"

diff --git a/opera-agent-ti.patch b/opera-agent-ti.patch
deleted file mode 100644 (file)
index 1a42089..0000000
--- a/opera-agent-ti.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- etc/opera6rc.orig  2008-10-23 00:47:51.000000000 +0200
-+++ etc/opera6rc       2008-10-23 00:48:08.000000000 +0200
-@@ -3,3 +3,6 @@
- [User Prefs]
- Language Files Directory=/usr/share/opera/locale
- Force DPI=96
-+
-+[ISP]
-+Id="PLD/Titanium"

diff --git a/opera-agent-th.patch b/opera-agent.patch
similarity index 92%
rename from opera-agent-th.patch
rename to opera-agent.patch
index 979523ee546da1efaeb825122c4abadb4c2beedb..4a213fd0b75375adbd35c3e1f4f74dc1460ba112 100644 (file)
--- a/opera-agent-th.patch
+++ b/opera-agent.patch
@@ -6,6 +6,6 @@
  Package Qt Linkage=qt3-shared
 +
 +[ISP]
-+Id="PLD/3.0 (Th)"
++Id="DISTRO"
 +
 

diff --git a/opera.spec b/opera.spec
index 294ff8637b78ab02ec6e2d3f717361d92c66780c..fa9f0bcb7d5f086793c3ded8f9c5d7b890d6bbab 100644 (file)
--- a/opera.spec
+++ b/opera.spec
@@ -32,9 +32,7 @@ Source13:     ftp://ftp.opera.com/pub/opera/linux/%{shver}/final/en/i386/%{name}-%{v
 # 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
@@ -90,15 +88,6 @@ Obsługa 32-bitowych wtyczek Opery.
 %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
@@ -142,6 +131,17 @@ install %{SOURCE0} $RPM_BUILD_ROOT%{_desktopdir}
 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