diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | metacity.spec | 93 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 71 insertions, 26 deletions
@@ -1 +1 @@ -metacity-2.4.0.92.tar.bz2 +metacity-2.4.34.tar.bz2 diff --git a/metacity.spec b/metacity.spec index 5d5633a..bcdc47f 100644 --- a/metacity.spec +++ b/metacity.spec @@ -2,30 +2,28 @@ Summary: Metacity window manager Name: metacity -Version: 2.4.0.92 -Release: 5 +Version: 2.4.34 +Release: 3 URL: http://people.redhat.com/~hp/metacity/ Source0: %{name}-%{version}.tar.bz2 License: GPL Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: gtk2-devel >= 2.0.3-3 -BuildRequires: pango-devel >= 1.0.99 -BuildRequires: fontconfig -BuildRequires: Xft -BuildRequires: GConf2-devel >= 1.2.0 +BuildRequires: gtk2-devel >= 2.2.0 +BuildRequires: pango-devel >= 1.2.0 +BuildRequires: fontconfig-devel +BuildRequires: GConf2-devel >= 2.2.0 BuildRequires: desktop-file-utils >= 0.3 BuildRequires: libglade2-devel >= 2.0.0 BuildRequires: intltool >= 0.22 +BuildRequires: startup-notification-devel >= 0.5 -Requires: redhat-artwork >= 0.27 +Requires: redhat-artwork >= 0.62 Patch0: metacity-2.3.987-default-theme.patch Patch1: metacity-2.3.987.92-system-font.patch -Patch2: metacity-2.4.0.92-cvsfixes.patch -Patch3: metacity-2.4.0.92-morecvsfixes.patch -Patch4: metacity-2.4.0.92-cvsfixes3.patch -Patch5: metacity-2.4.0.92-window-shading.patch +Patch2: metacity-2.4.13.90-ctrlaltdel.patch +Patch3: metacity-2.4.34-multihead-constraints.patch %description @@ -37,10 +35,8 @@ GNOME 2. %patch0 -p1 -b .default-theme %patch1 -p1 -b .system-font -%patch2 -p0 -b .cvsfixes -%patch3 -p0 -b .morecvsfixes -%patch4 -p0 -b .cvsfixes3 -%patch5 -p1 -b .window-shading +%patch2 -p1 -b .ctrlaltdel +%patch3 -p0 -b .multihead-constraints %build %configure @@ -50,7 +46,20 @@ GNOME 2. ## force regeneration with intltool in non-UTF-8 locale rm -f src/metacity.schemas rm -f po/.intltool-merge-cache -LANG=en_US.ISO-8859-1 make %{?_smp_mflags} +LANG=en_US.ISO-8859-1 make ## %{?_smp_mflags} + +SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION" + +for I in $SHOULD_HAVE_DEFINED; do + if ! grep -q "define $I" config.h; then + echo "$I was not defined in config.h" + grep "$I" config.h + exit 1 + else + echo "$I was defined as it should have been" + grep "$I" config.h + fi +done %install rm -rf $RPM_BUILD_ROOT @@ -59,11 +68,7 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 %makeinstall unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -desktop-file-install --vendor gnome --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets \ - --add-only-show-in GNOME \ - --add-category X-Red-Hat-Base \ - $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets/* +/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang %{gettext_package} @@ -80,7 +85,7 @@ done %files -f %{gettext_package}.lang %defattr(-,root,root) -%doc README AUTHORS COPYING NEWS HACKING theme-format.txt +%doc README AUTHORS COPYING NEWS HACKING doc/theme-format.txt doc/metacity-theme.dtd %{_bindir}/* %{_libexecdir}/* %{_datadir}/gnome/wm-properties/metacity.desktop @@ -88,9 +93,49 @@ done %{_datadir}/metacity %{_datadir}/themes %{_datadir}/pixmaps -%{_datadir}/control-center-2.0 +%{_includedir}/* +%{_libdir}/lib*.so* +%{_libdir}/lib*.a +%{_libdir}/pkgconfig/* %changelog +* Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com> +- rebuilt + +* Fri Feb 21 2003 Havoc Pennington <hp@redhat.com> 2.4.34-2 +- fix a crash in multihead situations, #84412 + +* Wed Feb 5 2003 Havoc Pennington <hp@redhat.com> 2.4.34-1 +- 2.4.34 +- try disabling smp_mflags and see if it fixes build + +* Wed Jan 22 2003 Havoc Pennington <hp@redhat.com> +- 2.4.21.90 with a bunch o' fixes + +* Wed Jan 22 2003 Tim Powers <timp@redhat.com> +- rebuilt + +* Thu Jan 16 2003 Havoc Pennington <hp@redhat.com> +- bind Ctrl+Alt+Del to logout, #72973 + +* Wed Jan 15 2003 Havoc Pennington <hp@redhat.com> +- 2.4.13.90 cvs snap with event queue lag fix + +* Fri Jan 10 2003 Havoc Pennington <hp@redhat.com> +- 2.4.13 + +* Thu Dec 12 2002 Havoc Pennington <hp@redhat.com> +- 2.4.8 + +* Mon Dec 2 2002 Havoc Pennington <hp@redhat.com> +- 2.4.5.90 +- add little script after configure that checks what config.h + contains, to be sure we detected all the right features. + +* Tue Oct 29 2002 Havoc Pennington <hp@redhat.com> +- 2.4.3 +- remove patches that have gone upstream + * Tue Aug 27 2002 Havoc Pennington <hp@redhat.com> - fix shaded window decorations in Bluecurve theme @@ -1 +1 @@ -8ee9777968306809ee8040fc15c6a8ca metacity-2.4.0.92.tar.bz2 +69650ff5719b958b20f9969902f3f68d metacity-2.4.34.tar.bz2 |