Mercurial Mercurial > upstream > oracle > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-08-07 Damien Carbery <[email protected]>
authordcarbery
Tue, 07 Aug 2007 09:15:19 +0000
changeset 10285 1a6aa219ed6e
parent 10284 c4a6bab99cd2
child 10286 55c86b338d34
2007-08-07 Damien Carbery <[email protected]> * base-specs/deskbar-applet.spec: Remove patch 01-browser-locations because it is obsolete. Renumber rest. * patches/deskbar-applet-01-browser-locations.diff: Removed, obsolete. * patches/deskbar-applet-01-webeyes-compatibility.diff: Added, renamed from 01.
ChangeLog file | annotate | diff | comparison | revisions
base-specs/deskbar-applet.spec file | annotate | diff | comparison | revisions
patches/deskbar-applet-01-browser-locations.diff file | annotate | diff | comparison | revisions
patches/deskbar-applet-01-webeyes-compatibility.diff file | annotate | diff | comparison | revisions
patches/deskbar-applet-02-webeyes-compatibility.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Tue Aug 07 09:04:15 2007 +0000
+++ b/ChangeLog	Tue Aug 07 09:15:19 2007 +0000
@@ -1,3 +1,11 @@
+2007-08-07  Damien Carbery <[email protected]>
+
+	* base-specs/deskbar-applet.spec: Remove patch 01-browser-locations
+	  because it is obsolete. Renumber rest.
+	* patches/deskbar-applet-01-browser-locations.diff: Removed, obsolete.
+	* patches/deskbar-applet-01-webeyes-compatibility.diff: Added, renamed
+	  from 01.
+
 2007-08-07  Damien Carbery <[email protected]>
 
 	* base-specs/deskbar-applets.spec: Bump to 2.19.6. Disable patch1
--- a/base-specs/deskbar-applet.spec	Tue Aug 07 09:04:15 2007 +0000
+++ b/base-specs/deskbar-applet.spec	Tue Aug 07 09:15:19 2007 +0000
@@ -15,10 +15,8 @@
 Vendor:			Sun Microsystems, Inc.
 Summary:		Deskbar Applet
 Source:			http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.19/%{name}-%{version}.tar.bz2
-### date:2006-03-17 owner:gman type:branding
-##Patch1:                 deskbar-applet-01-browser-locations.diff
 # date:2003-10-17 owner:gman type:branding
-Patch2:                 deskbar-applet-02-webeyes-compatibility.diff
+Patch1:                 deskbar-applet-01-webeyes-compatibility.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/%{name}
@@ -50,8 +48,7 @@
 
 %prep
 %setup -q
-##%patch1 -p1
-%patch2 -p1
+%patch1 -p1
 
 for po in po/*.po; do
   dos2unix -ascii $po $po
@@ -116,6 +113,9 @@
 
 %changelog
 * Tue Aug 07 2007 - [email protected]
+- Remove patch 01-browser-locations because it is obsolete. Renumber rest.
+
+* Tue Aug 07 2007 - [email protected]
 - Bump to 2.19.6. Disable patch1 01-browser-locations because we don't install
   mozilla or firefox under /usr/sfw.
 
--- a/patches/deskbar-applet-01-browser-locations.diff	Tue Aug 07 09:04:15 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-diff -urN deskbar-applet-2.14.0.1/deskbar/handlers/mozilla.py deskbar-applet-2.14.0.1-hacked/deskbar/handlers/mozilla.py
---- deskbar-applet-2.14.0.1/deskbar/handlers/mozilla.py	2006-03-04 13:53:49.000000000 +1300
-+++ deskbar-applet-2.14.0.1-hacked/deskbar/handlers/mozilla.py	2006-03-17 10:45:22.706404000 +1300
-@@ -190,6 +190,7 @@
- 				get_firefox_home_file("search"),
- 				expanduser("~/.mozilla/searchplugins"),
- 				"/usr/lib/firefox/searchplugins",
-+				"/usr/sfw/lib/firefox/searchplugins",
- 				"/usr/local/lib/firefox/searchplugins",
- 				"/usr/lib/mozilla-firefox/searchplugins",
- 				"/usr/local/lib/mozilla-firefox/searchplugins"]
-@@ -198,6 +199,7 @@
- 				get_mozilla_home_file("search"),
- 				expanduser("~/.mozilla/searchplugins"),
- 				"/usr/lib/mozilla/searchplugins",
-+				"/usr/sfw/lib/mozilla/searchplugins",
- 				"/usr/local/lib/mozilla/searchplugins"]
- 		
- 		if not hasattr(self, 'watcher'):
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/deskbar-applet-01-webeyes-compatibility.diff	Tue Aug 07 09:15:19 2007 +0000
@@ -0,0 +1,35 @@
+diff -urN deskbar-applet-2.16.0/data/GNOME_WebEyes.server deskbar-applet-2.16.0-hacked/data/GNOME_WebEyes.server
+--- deskbar-applet-2.16.0/data/GNOME_WebEyes.server	1970-01-01 12:00:00.000000000 +1200
++++ deskbar-applet-2.16.0-hacked/data/GNOME_WebEyes.server	2006-10-17 23:34:11.811988000 +1300
+@@ -0,0 +1,18 @@
++<oaf_info>
++
++<!-- webeyes was replaced by deskbar-applet, transparently upgrade the user -->
++<oaf_server iid="OAFIID:GNOME_WebEyes"
++	    type="factory" 
++	    location="OAFIID:Deskbar_Applet_Factory">
++
++	<oaf_attribute name="repo_ids" type="stringv">
++		<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
++		<item value="IDL:Bonobo/Control:1.0"/>
++		<item value="IDL:Bonobo/Unknown:1.0"/>
++	</oaf_attribute>
++	<oaf_attribute name="name" type="string" value="Internet Search"/>
++	<oaf_attribute name="description" type="string" value="Replaced with deskbar-applet"/>
++
++</oaf_server>
++
++</oaf_info>
+diff -urN deskbar-applet-2.16.0/data/Makefile.am deskbar-applet-2.16.0-hacked/data/Makefile.am
+--- deskbar-applet-2.16.0/data/Makefile.am	2006-08-22 01:23:25.000000000 +1200
++++ deskbar-applet-2.16.0-hacked/data/Makefile.am	2006-10-17 23:36:52.928571000 +1300
+@@ -12,7 +12,8 @@
+ # ******************************************************************************
+ serverdir = $(libdir)/bonobo/servers
+ server_in_files = Deskbar_Applet.server.in
+-server_DATA = $(server_in_files:.server.in=.server)
++server_DATA = $(server_in_files:.server.in=.server) \
++	GNOME_WebEyes.server
+ 
+ # ******************************************************************************
+ # GConf Schemas
--- a/patches/deskbar-applet-02-webeyes-compatibility.diff	Tue Aug 07 09:04:15 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-diff -urN deskbar-applet-2.16.0/data/GNOME_WebEyes.server deskbar-applet-2.16.0-hacked/data/GNOME_WebEyes.server
---- deskbar-applet-2.16.0/data/GNOME_WebEyes.server	1970-01-01 12:00:00.000000000 +1200
-+++ deskbar-applet-2.16.0-hacked/data/GNOME_WebEyes.server	2006-10-17 23:34:11.811988000 +1300
-@@ -0,0 +1,18 @@
-+<oaf_info>
-+
-+<!-- webeyes was replaced by deskbar-applet, transparently upgrade the user -->
-+<oaf_server iid="OAFIID:GNOME_WebEyes"
-+	    type="factory" 
-+	    location="OAFIID:Deskbar_Applet_Factory">
-+
-+	<oaf_attribute name="repo_ids" type="stringv">
-+		<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
-+		<item value="IDL:Bonobo/Control:1.0"/>
-+		<item value="IDL:Bonobo/Unknown:1.0"/>
-+	</oaf_attribute>
-+	<oaf_attribute name="name" type="string" value="Internet Search"/>
-+	<oaf_attribute name="description" type="string" value="Replaced with deskbar-applet"/>
-+
-+</oaf_server>
-+
-+</oaf_info>
-diff -urN deskbar-applet-2.16.0/data/Makefile.am deskbar-applet-2.16.0-hacked/data/Makefile.am
---- deskbar-applet-2.16.0/data/Makefile.am	2006-08-22 01:23:25.000000000 +1200
-+++ deskbar-applet-2.16.0-hacked/data/Makefile.am	2006-10-17 23:36:52.928571000 +1300
-@@ -12,7 +12,8 @@
- # ******************************************************************************
- serverdir = $(libdir)/bonobo/servers
- server_in_files = Deskbar_Applet.server.in
--server_DATA = $(server_in_files:.server.in=.server)
-+server_DATA = $(server_in_files:.server.in=.server) \
-+	GNOME_WebEyes.server
- 
- # ******************************************************************************
- # GConf Schemas
upstream/oracle/spec-files