This commit is contained in:
Matthias Clasen 2011-11-22 15:56:36 -05:00
parent 0ea305737a
commit 79ef6764e6
3 changed files with 9 additions and 31 deletions

1
.gitignore vendored
View File

@ -21,3 +21,4 @@ mutter-2.31.5.tar.bz2
/mutter-3.1.92.tar.xz /mutter-3.1.92.tar.xz
/mutter-3.2.0.tar.xz /mutter-3.2.0.tar.xz
/mutter-3.2.1.tar.xz /mutter-3.2.1.tar.xz
/mutter-3.3.2.tar.xz

View File

@ -1,19 +1,18 @@
Name: mutter Name: mutter
Version: 3.2.1 Version: 3.3.2
Release: 2%{?dist} Release: 1%{?dist}
Summary: Window and compositing manager based on Clutter Summary: Window and compositing manager based on Clutter
Group: User Interface/Desktops Group: User Interface/Desktops
License: GPLv2+ License: GPLv2+
#VCS: git:git://git.gnome.org/mutter #VCS: git:git://git.gnome.org/mutter
Source0: http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.xz Source0: http://download.gnome.org/sources/%{name}/3.3/%{name}-%{version}.tar.xz
BuildRequires: clutter-devel >= 1.5.8 BuildRequires: clutter-devel >= 1.5.8
BuildRequires: pango-devel BuildRequires: pango-devel
BuildRequires: startup-notification-devel BuildRequires: startup-notification-devel
BuildRequires: gtk3-devel >= 2.99.0 BuildRequires: gtk3-devel >= 2.99.0
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: GConf2-devel
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel
BuildRequires: libSM-devel BuildRequires: libSM-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
@ -32,7 +31,6 @@ BuildRequires: libcanberra-devel
Requires: control-center-filesystem Requires: control-center-filesystem
Requires: startup-notification Requires: startup-notification
Requires: GConf2
Requires: dbus-x11 Requires: dbus-x11
Requires: zenity Requires: zenity
@ -81,9 +79,7 @@ done
make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1
%install %install
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
#Remove libtool archives. #Remove libtool archives.
rm -rf %{buildroot}/%{_libdir}/*.la rm -rf %{buildroot}/%{_libdir}/*.la
@ -93,28 +89,7 @@ rm -rf %{buildroot}/%{_libdir}/*.la
# Mutter contains a .desktop file so we just need to validate it # Mutter contains a .desktop file so we just need to validate it
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%pre %post -p /sbin/ldconfig
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/mutter.schemas \
> /dev/null || :
fi
%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/mutter.schemas \
> /dev/null || :
fi
%post
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/mutter.schemas \
> /dev/null || :
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
@ -126,7 +101,6 @@ gconftool-2 --makefile-install-rule \
%{_bindir}/mutter-message %{_bindir}/mutter-message
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/gnome/wm-properties/mutter-wm.desktop %{_datadir}/gnome/wm-properties/mutter-wm.desktop
%{_sysconfdir}/gconf/schemas/mutter.schemas
%{_datadir}/mutter %{_datadir}/mutter
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%{_libdir}/mutter/ %{_libdir}/mutter/
@ -141,6 +115,9 @@ gconftool-2 --makefile-install-rule \
%doc %{_mandir}/man1/mutter-window-demo.1.gz %doc %{_mandir}/man1/mutter-window-demo.1.gz
%changelog %changelog
* Tue Nov 22 2011 Matthias Clasen <mclasen@redhat.com> - 3.3.2-1
- Update to 3.3.2
* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-2 * Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-2
- Rebuilt for glibc bug#747377 - Rebuilt for glibc bug#747377

View File

@ -1 +1 @@
7cbe2f903096c2271c76f656e0a7db03 mutter-3.2.1.tar.xz b56a2f6efbb2d066c8a3bf08d010c4ec mutter-3.3.2.tar.xz