summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@fedoraproject.org>2008-02-06 21:59:26 +0000
committerColin Walters <walters@fedoraproject.org>2008-02-06 21:59:26 +0000
commit17bab9b49c699133c8d296ec41298c2c18825d1b (patch)
treeb7f832dca75309c6a28406e068f7d641ca34f186
parent8574ab4d4ba753a6688b3e2fe40079cb1934a437 (diff)
downloadmetacity-17bab9b49c699133c8d296ec41298c2c18825d1b.tar.gz
metacity-17bab9b49c699133c8d296ec41298c2c18825d1b.tar.xz
metacity-17bab9b49c699133c8d296ec41298c2c18825d1b.zip
- Drop random macros at top of file; spec files should be as amenable to
static analysis as possible, easing our way into the bright future where our software build process isn't a horrible mismash of a preprocessor on shell script, with manual editing required, but something scriptable. - Update to SVN 3554, to which our patches were designed to apply - Readd patch metacity-2.21.13-dont-move-windows.patch, which makes Firefox behave as those multiple-workspace users desire.
-rw-r--r--metacity.spec29
1 files changed, 18 insertions, 11 deletions
diff --git a/metacity.spec b/metacity.spec
index a73ae42..e6c2dd6 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,18 +1,14 @@
-%define gettext_package metacity
-
-%define metacity_version 2.21.8
-
-%define metacity_filename metacity-%{metacity_version}
-
Summary: Metacity window manager
Name: metacity
-Version: %{metacity_version}
+Version: 2.21.8.svn3554
Release: 1%{?dist}
URL: http://download.gnome.org/sources/metacity/
-Source0: http://download.gnome.org/sources/metacity/2.21/%{metacity_filename}.tar.bz2
+Source0: http://download.gnome.org/sources/metacity/2.21/metacity-%{version}.tar.bz2
Patch0: default-theme.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=106249
Patch2: skip-taskbar-tab.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=482354
+Patch3: metacity-2.21.13-dont-move-windows.patch
License: GPLv2+
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,9 +61,10 @@ programs using the metacity-private library, since it is a private
API. This package exists purely for technical reasons.
%prep
-%setup -q -n %{metacity_filename}
+%setup -q -n metacity-2.21.13
%patch0 -p1 -b .default-theme
%patch2 -p1 -b .skip-taskbar-tab
+%patch3 -p0 -b .dont-move-windows
%build
rm -rf $RPM_BUILD_ROOT
@@ -105,7 +102,7 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-%find_lang %{gettext_package}
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -129,7 +126,7 @@ fi
%postun -p /sbin/ldconfig
-%files -f %{gettext_package}.lang
+%files -f %{name}.lang
%defattr(-,root,root)
%doc README AUTHORS COPYING NEWS HACKING doc/theme-format.txt doc/metacity-theme.dtd rationales.txt
%{_bindir}/metacity
@@ -154,6 +151,16 @@ fi
%{_mandir}/man1/metacity-window-demo.1.gz
%changelog
+* Wed Feb 6 2008 Colin Walters <walters@redhat.com> - 2.21.8.svn3554-1
+- Drop random macros at top of file; spec files should be as amenable
+ to static analysis as possible, easing our way into the bright future
+ where our software build process isn't a horrible mismash of a
+ preprocessor on shell script, with manual editing required,
+ but something scriptable.
+- Update to SVN 3554, to which our patches were designed to apply
+- Readd patch metacity-2.21.13-dont-move-windows.patch, which makes
+ Firefox behave as those multiple-workspace users desire.
+
* Wed Feb 6 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.8-1
- Update to 2.21.8