007-01-17 Erwann Chenede - <
[email protected]>
* Solaris/SUNWgnome-wm.spec: removed Solaris only patches
* Solaris/patches/metacity-01-sdtprocess.diff: removed to fix 6510394
* Solaris/patches/metacity-02-enable-Sun-keys-Open-Front.diff : moved
to patches/metacity-11-enable-Sun-keys-Open-Front.diff
* metacity.spec: added patch and comments.
* tango-icon-theme.spec: added patch owners
* glib2.spec: added patch owners
--- a/ChangeLog Wed Jan 17 09:25:50 2007 +0000
+++ b/ChangeLog Wed Jan 17 10:46:38 2007 +0000
@@ -1,3 +1,14 @@
+2007-01-17 Erwann Chenede - <[email protected]>
+
+ * Solaris/SUNWgnome-wm.spec: removed Solaris only patches
+ * Solaris/patches/metacity-01-sdtprocess.diff: removed to fix 6510394
+ * Solaris/patches/metacity-02-enable-Sun-keys-Open-Front.diff : moved
+ to patches/metacity-11-enable-Sun-keys-Open-Front.diff
+ * metacity.spec: added patch and comments.
+ * tango-icon-theme.spec: added patch owners
+ * glib2.spec: added patch owners
+
+
2007-01-17 Padraig O'Briain <[email protected]>
* metacity.spec: Fixed some errors in patch comments
--- a/Solaris/SUNWgnome-wm.spec Wed Jan 17 09:25:50 2007 +0000
+++ b/Solaris/SUNWgnome-wm.spec Wed Jan 17 10:46:38 2007 +0000
@@ -17,8 +17,6 @@
Summary: GNOME window manager
Version: %{default_pkg_version}
Source: %{name}-manpages-0.1.tar.gz
-Patch1: metacity-01-sdtprocess.diff
-Patch2: metacity-02-enable-Sun-keys-Open-Front.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -67,10 +65,6 @@
%metacity.prep -d %name-%version
cd %{_builddir}/%name-%version
gzcat %SOURCE0 | tar xf -
-cd %{_builddir}/%name-%version/metacity-%{metacity.version}
-%patch1 -p1
-%patch2 -p1
-cd ..
%build
export CFLAGS="%optflags -I/usr/sfw/include -I/usr/X11/include -I/usr/sfw/include/freetype2 -DANSICPP"
--- a/Solaris/patches/metacity-01-sdtprocess.diff Wed Jan 17 09:25:50 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- metacity-2.8.0/src/metacity.schemas.in 2004-08-26 17:28:32.857204000 +0600
-+++ metacity-2.8.0-new/src/metacity.schemas.in 2004-08-26 17:32:08.026401000 +0600
-@@ -1833,7 +1833,7 @@ you set
- <applyto>/apps/metacity/keybinding_commands/command_process_manager</applyto>
- <owner>metacity</owner>
- <type>string</type>
-- <default>gnome-system-monitor</default>
-+ <default>sdtprocess</default>
- <locale name="C">
- <short>The process manager command</short>
- <long>
--- a/Solaris/patches/metacity-02-enable-Sun-keys-Open-Front.diff Wed Jan 17 09:25:50 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-diff -Nrup metacity-2.16.3/src/metacity.schemas.in ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/metacity.schemas.in
---- metacity-2.16.3/src/metacity.schemas.in 2006-10-20 15:09:51.136549000 +0200
-+++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/metacity.schemas.in 2006-10-20 15:10:15.395755000 +0200
-@@ -509,7 +509,7 @@ you set
- <applyto>/apps/metacity/window_keybindings/minimize</applyto>
- <owner>metacity</owner>
- <type>string</type>
-- <default><Alt>F9</default>
-+ <default>F17</default>
- <locale name="C">
- <short>Minimize window</short>
- <long>
-@@ -971,7 +971,7 @@ you set
- <applyto>/apps/metacity/window_keybindings/raise_or_lower</applyto>
- <owner>metacity</owner>
- <type>string</type>
-- <!-- no default for this one -->
-+ <default>F15</default>
- <locale name="C">
- <short>Raise obscured window, otherwise lower</short>
- <long>
--- a/glib2.spec Wed Jan 17 09:25:50 2007 +0000
+++ b/glib2.spec Wed Jan 17 10:46:38 2007 +0000
@@ -40,10 +40,11 @@
Patch2: glib-02-default-path.diff
# owner:laca type:bug date:2005-10-13
Patch3: glib-03-gmodule-always-lazy.diff
-# owner:laca type:bug date:2006-05-02 bugzilla:341988
+#owner:laca type:bug date:2006-05-02 bugzilla:341988
Patch4: glib-04-msgfmt-c.diff
#owner:yippi date:2006-05-25 type:bug bugzilla:342981
Patch5: glib-05-hidden.diff
+# owner:laca type:bug date:2006-07-13
Patch6: glib-06-ALL_LINGUAS.diff
#owner:stephen date:2006-11-01 type:feature bugster:6393731
Patch7: glib-07-trusted-extensions.diff
--- a/metacity.spec Wed Jan 17 09:25:50 2007 +0000
+++ b/metacity.spec Wed Jan 17 10:46:38 2007 +0000
@@ -40,6 +40,8 @@
Patch9: metacity-09-empty-struct.diff
#owner:erwannc date:2006-09-27 type:feature
Patch10: metacity-10-composite.diff
+#owner:erwannc date:2004-10-08 type:feature bugster:5103120
+Patch11: metacity-11-enable-Sun-keys-Open-Front.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -73,6 +75,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%build
%ifos linux
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/metacity-11-enable-Sun-keys-Open-Front.diff Wed Jan 17 10:46:38 2007 +0000
@@ -0,0 +1,21 @@
+diff -Nrup metacity-2.16.3/src/metacity.schemas.in ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/metacity.schemas.in
+--- metacity-2.16.3/src/metacity.schemas.in 2006-10-20 15:09:51.136549000 +0200
++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/metacity.schemas.in 2006-10-20 15:10:15.395755000 +0200
+@@ -509,7 +509,7 @@ you set
+ <applyto>/apps/metacity/window_keybindings/minimize</applyto>
+ <owner>metacity</owner>
+ <type>string</type>
+- <default><Alt>F9</default>
++ <default>F17</default>
+ <locale name="C">
+ <short>Minimize window</short>
+ <long>
+@@ -971,7 +971,7 @@ you set
+ <applyto>/apps/metacity/window_keybindings/raise_or_lower</applyto>
+ <owner>metacity</owner>
+ <type>string</type>
+- <!-- no default for this one -->
++ <default>F15</default>
+ <locale name="C">
+ <short>Raise obscured window, otherwise lower</short>
+ <long>
--- a/tango-icon-theme.spec Wed Jan 17 09:25:50 2007 +0000
+++ b/tango-icon-theme.spec Wed Jan 17 10:46:38 2007 +0000
@@ -17,6 +17,7 @@
Vendor: Sun Microsystems, Inc.
Summary: tango icon theme
Source: http://tango-project.org/releases/%name-%version.tar.gz
+#owner: damienc date:2006-01-06 type:bug
Patch1: tango-icon-theme-01-pkgconfig_ver.diff
URL: http://www.tango-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build