--- a/base-specs/metacity.spec Fri Sep 05 08:26:51 2008 +0000
+++ b/base-specs/metacity.spec Fri Sep 05 08:56:56 2008 +0000
@@ -16,15 +16,21 @@
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: GNOME Window Manager
-Source: http://ftp.gnome.org/pub/GNOME/sources/metacity/2.25/metacity-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/metacity/2.23/metacity-%{version}.tar.bz2
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
%if %build_l10n
Source2: l10n-configure.sh
%endif
#owner:erwannc date:2000-00-00 type:branding
Patch1: metacity-01-default-theme.diff
-#owner:gheet date:2003-07-17 type:branding
-Patch2: metacity-02-ctrl-esc-mod4-r.diff
+%if %option_with_sun_branding
+#owner:jedy date:2008-09-05 type:branding
+Patch2: metacity-02-shortcut.diff
+%endif
+%if %option_with_indiana_branding
+#owner:jedy date:2008-09-05 type:branding
+Patch2: metacity-02-shortcut-indiana.diff
+%endif
#owner:gman date:2003-11-20 type:branding
Patch3: metacity-03-ctrl-alt-del.diff
#owner:erwannc date:2004-04-30 type:branding
@@ -37,14 +43,12 @@
Patch7: metacity-07-branding-hack.diff
#owner:erwannc date:2006-11-02 type:feature bugster:6393724
Patch8: metacity-08-trusted-extensions.diff
-#owner:erwannc date:2004-10-08 type:feature bugster:5103120
-Patch9: metacity-09-enable-Sun-keys-Open-Front.diff
#owner:bewitche date:2008-05-23 type:bug bugster:6676458 bugzilla:156543
-Patch10: metacity-10-wireframe.diff
+Patch9: metacity-09-wireframe.diff
#owner:erwannc date:2008-006-02 type:feature bugster:0000000
-Patch11: metacity-11-remove-xopen-source-posix.diff
+Patch10: metacity-10-remove-xopen-source-posix.diff
#owner:jedy date:2008-08-18 type:branding
-Patch12: metacity-12-font.diff
+Patch11: metacity-11-font.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,7 +78,12 @@
cd po-sun; make; cd ..
%endif
%patch1 -p1
+%if %option_with_sun_branding
%patch2 -p1
+%endif
+%if %option_with_indiana_branding
+%patch2 -p1
+%endif
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -84,7 +93,6 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
%build
%ifos linux
@@ -162,6 +170,12 @@
%{_mandir}/man1/*
%changelog
+* Fri Sep 05 2008 - [email protected]
+- Fix broken link.
+- Merge 02-ctrl-esc-mod4-r.diff with 09-enable-sun-keys-Open-Front.dif
+ into one patch and rename it to 02-shortcut.diff.
+- New patch 02-shortcut-indiana.diff.
+- Reorder patches.
* Tue Sep 02 2008 - [email protected]
- Bump to 2.25.1.
- Rework patches/metacity-08-trusted-extensions.diff.