packages: opera/opera.spec, opera/opera-agent.patch (REMOVED) - ini is back...

[arekm]

Author: arekm                        Date: Sat Jul  3 17:59:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ini is back; debuginfo package disabled as it makes no sense here

---- Files affected:
packages/opera:
   opera.spec (1.305 -> 1.306) , opera-agent.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/opera/opera.spec
diff -u packages/opera/opera.spec:1.305 packages/opera/opera.spec:1.306
--- packages/opera/opera.spec:1.305	Sat Jul  3 19:53:24 2010
+++ packages/opera/opera.spec	Sat Jul  3 19:59:36 2010
@@ -30,7 +30,6 @@
 # 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
@@ -42,6 +41,8 @@
 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
@@ -93,7 +94,6 @@
 %endif
 
 %patch0 -p1
-#%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -121,11 +121,14 @@
 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
@@ -135,7 +138,6 @@
 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
@@ -164,7 +166,7 @@
 # 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
@@ -183,7 +185,6 @@
 %{_datadir}/opera/defaults
 %{_datadir}/opera/extra
 %{_datadir}/opera/skin
-#%{_datadir}/opera/scripts
 %{_datadir}/opera/styles
 %{_datadir}/opera/ui
 %{_datadir}/opera/unite
@@ -252,6 +253,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.306  2010/07/03 17:59:36  arekm
+- ini is back; debuginfo package disabled as it makes no sense here
+
 Revision 1.305  2010/07/03 17:53:24  arekm
 - up to 10.60 final
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera.spec?r1=1.305&r2=1.306&f=u