- ini is back; debuginfo package disabled as it makes no sense here

Changed files:
    opera-agent.patch -> 1.3
    opera.spec -> 1.306

diff --git a/opera-agent.patch b/opera-agent.patch
deleted file mode 100644 (file)
index bf55564..0000000
--- a/opera-agent.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="DISTRO"

diff --git a/opera.spec b/opera.spec
index cf8d6f703d044da214d61b38d933541f04063268..214f7c69b71566e95f9c2f3a1b4412ac553e339a 100644 (file)
--- a/opera.spec
+++ b/opera.spec
@@ -29,7 +29,6 @@ Source12:     ftp://ftp.opera.com/pub/opera/linux/%{shver}/%{name}-%{version}-%{buil
 # Source12-md5:        4cd09b64a0d1c3826b3e7038326c14dc
 Source0:       %{name}.desktop
 Patch0:                %{name}-wrapper.patch
-Patch1:                %{name}-agent.patch
 URL:           http://www.opera.com/
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.356
@@ -41,6 +40,8 @@ Obsoletes:    opera-i18n
 ExclusiveArch: %{ix86} %{x8664} ppc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _enable_debug_packages  0
+
 %define                _plugindir      %{_libdir}/opera/plugins
 %define                _operadocdir    %{_docdir}/%{name}-%{ver}
 # alternative arch for plugin32
@@ -92,7 +93,6 @@ Obsługa 32-bitowych wtyczek Opery.
 %endif
 
 %patch0 -p1
-#%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -120,11 +120,14 @@ EOF
 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#/usr/lib/opera#%{_libdir}/opera#g' $RPM_BUILD_ROOT%{_bindir}/opera
 
-%if 0
+cat << 'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/operaprefs_default.ini
+[ISP]
+Id="DISTRO"
+EOF
+
 %if "%{pld_release}" == "ti"
 sed -i -e 's#DISTRO#PLD/Titanium#g' $RPM_BUILD_ROOT/etc/operaprefs_default.ini
 %else
@@ -134,7 +137,6 @@ sed -i -e 's#DISTRO#PLD/2.0 (Ac)#g' $RPM_BUILD_ROOT/etc/operaprefs_default.ini
 sed -i -e 's#DISTRO#PLD/3.0 (Th)#g' $RPM_BUILD_ROOT/etc/operaprefs_default.ini
 %endif
 %endif
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -163,7 +165,7 @@ fi
 # browser plugins v2
 %{_browserpluginsconfdir}/browsers.d/%{name}.*
 %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
-
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/operaprefs*.ini
 %attr(755,root,root) %{_bindir}/opera
 %attr(755,root,root) %{_bindir}/opera-widget-manager
 %dir %{_libdir}/opera
@@ -182,7 +184,6 @@ fi
 %{_datadir}/opera/defaults
 %{_datadir}/opera/extra
 %{_datadir}/opera/skin
-#%{_datadir}/opera/scripts
 %{_datadir}/opera/styles
 %{_datadir}/opera/ui
 %{_datadir}/opera/unite