Yes, if the patch is upstreamed, the Sun messages can be removed.

Note: the patch have not been upsteamed since 2004 at least. The quicksilver 
filename was spec-files/patches/gnome-panel-03-menu-changes.diff

Does the following update make sense?

--- spec-files/po-sun/README.orig       2007-01-11 22:05:04.895085000 +0900
+++ spec-files/po-sun/README    2007-01-11 22:04:20.642453000 +0900
@@ -68,3 +68,50 @@ Please make sure 'make clean; make' and
 in the module dir.


+How to update .spec files
+=========================
+
+Modify spec-files/foo.spec
+--- spec-files/foo.spec.orig
++++ spec-files/foo.spec
+@@ -7,6 +7,7 @@
+ #
+ # Owner: foo
+ #
++%include l10n.inc
+ Name:         foo
+ License:      GPL
+ Group:        System/GUI/GNOME
+@@ -20,6 +21,7 @@
+ Source2:      gfloppy.1.gz
+ Source3:      gnome-dictionary.1.gz
+ Source4:      gnome-screenshot.1.gz
++Source5:      %{name}-po-sun-%{po_sun_version}.tar.bz2
+ # date:2005-05-02 type:bug bugster:6222777 owner:mattman
+ Patch1:       gnome-utils-01-gfloppy-permission.diff
+ # date:2006-04-05 type:branding owner:gman
+@@ -63,6 +65,10 @@ This package contains some essential uti
+
+ %prep
+ %setup -q
++%if %build_l10n
++bzcat %SOURCE5 | tar xf -
++cd po-sun; make; cd ..
++%endif
+ %patch1 -p1
+ %patch2 -p1
+ %patch3 -p1
+@@ -159,3 +165,6 @@ done
+ %{_libdir}/pkgconfig
+
+ %changelog
++* Thu Dec 28 2006 - foo at sun.com
++- Add l10n tarball.
++
+
+How to delete Sun l10n tarball in .spec files
+=============================================
+
+1. Upstream foo.diff
+2. Remove foo-po-sun*.tar.bz2 from .spec files
+


Damien Carbery wrote:
> Is it necessary to add the "SUN_BRANDING" comment to the
> gnome-search-tool.desktop.in file?
> 
> Can some of these changes be pushed upstream?
> 
> Damien
> 
> Takao Fujiwara - Tokyo S/W Center wrote:
> 
>>--- spec-files/patches/gnome-utils-03-search-menu-entry.diff.orig     
>>2006-12-28 18:14:58.763316000 +0900
>>+++ spec-files/patches/gnome-utils-03-search-menu-entry.diff  2006-12-28 
>>18:14:58.762643000 +0900
>>@@ -1,10 +1,11 @@
>> diff -urN gnome-utils-2.14.0/gsearchtool/gnome-search-tool.desktop.in 
>> gnome-utils-2.14.0-hacked/gsearchtool/gnome-search-tool.desktop.in
>> --- gnome-utils-2.14.0/gsearchtool/gnome-search-tool.desktop.in      
>> 2006-01-22 09:18:47.000000000 +1300
>> +++ gnome-utils-2.14.0-hacked/gsearchtool/gnome-search-tool.desktop.in       
>> 2006-05-03 17:13:11.027988000 +1200
>>-@@ -1,6 +1,6 @@
>>+@@ -1,6 +1,7 @@
>>  [Desktop Entry]
>>  Encoding=UTF-8
>> -_Name=Search for Files...
>>++# SUN_BRANDING
>> +_Name=Find Files...
>>  _Comment=Locate documents and folders on this computer by name or content
>>  Exec=gnome-search-tool
> 
> 
> 



Reply via email to