- Merge-review cleanup (#226138)
This commit is contained in:
parent
028565eaac
commit
3c5e79b032
@ -3,7 +3,7 @@
|
||||
Summary: Unobtrusive window manager
|
||||
Name: metacity
|
||||
Version: 2.30.3
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
URL: http://download.gnome.org/sources/metacity/
|
||||
Source0: http://download.gnome.org/sources/metacity/2.30/metacity-%{version}.tar.bz2
|
||||
# http://bugzilla.gnome.org/show_bug.cgi?id=558723
|
||||
@ -49,30 +49,29 @@ Source2: mini-window.png
|
||||
|
||||
License: GPLv2+
|
||||
Group: User Interface/Desktops
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: gtk2-devel >= 2.2.0
|
||||
BuildRequires: pango-devel >= 1.2.0
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: pango-devel
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: GConf2-devel >= 2.2.0
|
||||
BuildRequires: desktop-file-utils >= 0.3
|
||||
BuildRequires: libglade2-devel >= 2.0.0
|
||||
BuildRequires: GConf2-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libglade2-devel
|
||||
BuildRequires: autoconf, automake, libtool
|
||||
BuildRequires: intltool >= 0.35
|
||||
BuildRequires: startup-notification-devel >= 0.7
|
||||
BuildRequires: intltool
|
||||
BuildRequires: startup-notification-devel
|
||||
BuildRequires: libtool automake autoconf gettext
|
||||
BuildRequires: xorg-x11-proto-devel >= 7.0-13
|
||||
BuildRequires: xorg-x11-proto-devel
|
||||
BuildRequires: libSM-devel, libICE-devel, libX11-devel
|
||||
BuildRequires: libXext-devel, libXinerama-devel, libXrandr-devel, libXrender-devel
|
||||
BuildRequires: libXcursor-devel
|
||||
BuildRequires: libXcomposite-devel, libXdamage-devel
|
||||
# for gnome-keybindings.pc
|
||||
BuildRequires: control-center >= 2.19.4
|
||||
BuildRequires: control-center
|
||||
BuildRequires: gnome-doc-utils
|
||||
BuildRequires: zenity
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: libcanberra-devel
|
||||
|
||||
Requires: startup-notification >= 0.7
|
||||
Requires: startup-notification
|
||||
Requires: gnome-themes
|
||||
# for /usr/share/control-center/keybindings, /usr/share/gnome/wm-properties
|
||||
Requires: control-center-filesystem
|
||||
@ -80,10 +79,9 @@ Requires: control-center-filesystem
|
||||
Requires: GConf2
|
||||
Requires: zenity
|
||||
|
||||
Requires(post): GConf2 >= 2.14
|
||||
Requires(post): /sbin/ldconfig
|
||||
Requires(pre): GConf2 >= 2.14
|
||||
Requires(preun): GConf2 >= 2.14
|
||||
Requires(post): GConf2
|
||||
Requires(pre): GConf2
|
||||
Requires(preun): GConf2
|
||||
|
||||
# http://bugzilla.redhat.com/605675
|
||||
Provides: firstboot(windowmanager) = metacity
|
||||
@ -96,8 +94,6 @@ your attention.
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Summary: Development files for metacity
|
||||
Requires: gtk2-devel, libX11-devel
|
||||
Requires: pkgconfig
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
@ -129,7 +125,7 @@ API. This package exists purely for technical reasons.
|
||||
%patch29 -p1 -b .mouse-unmaximize
|
||||
|
||||
%patch30 -p1 -b .window-icon
|
||||
cp %{SOURCE1} %{SOURCE2} src/
|
||||
cp -p %{SOURCE1} %{SOURCE2} src/
|
||||
|
||||
# force regeneration
|
||||
rm src/metacity.schemas
|
||||
@ -137,12 +133,10 @@ rm src/metacity.schemas
|
||||
autoreconf -i -f
|
||||
|
||||
%build
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
|
||||
export CPPFLAGS
|
||||
|
||||
%configure
|
||||
%configure --disable-static
|
||||
|
||||
SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION"
|
||||
|
||||
@ -157,7 +151,7 @@ for I in $SHOULD_HAVE_DEFINED; do
|
||||
fi
|
||||
done
|
||||
|
||||
make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS"
|
||||
make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS" %{?_smp_mflags}
|
||||
|
||||
%if 0
|
||||
# strip unneeded translations from .mo files
|
||||
@ -172,14 +166,11 @@ done
|
||||
%endif
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
||||
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
|
||||
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
|
||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
|
||||
# the desktop file is not valid, I've complained on metacity-devel-list
|
||||
#desktop-file-install --vendor "" --delete-original \
|
||||
@ -188,30 +179,20 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/metacity.schemas > /dev/null || :
|
||||
%gconf_schema_upgrade metacity.schemas
|
||||
|
||||
%pre
|
||||
if [ "$1" -gt 1 ]; then
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/metacity.schemas > /dev/null || :
|
||||
fi
|
||||
%gconf_schema_prepare metacity.schemas
|
||||
|
||||
%preun
|
||||
if [ "$1" -eq 0 ]; then
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/metacity.schemas > /dev/null || :
|
||||
fi
|
||||
%gconf_schema_remove metacity.schemas
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%defattr(-,root,root,-)
|
||||
%doc README AUTHORS COPYING NEWS HACKING doc/theme-format.txt doc/metacity-theme.dtd rationales.txt
|
||||
%{_bindir}/metacity
|
||||
%{_bindir}/metacity-message
|
||||
@ -227,7 +208,7 @@ fi
|
||||
%{_datadir}/gnome/help/creating-metacity-themes
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/metacity-theme-viewer
|
||||
%{_bindir}/metacity-window-demo
|
||||
%{_includedir}/*
|
||||
@ -237,6 +218,9 @@ fi
|
||||
%{_mandir}/man1/metacity-window-demo.1.gz
|
||||
|
||||
%changelog
|
||||
* Mon Oct 18 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.30.3-2
|
||||
- Merge-review cleanup (#226138)
|
||||
|
||||
* Thu Sep 30 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.3-1
|
||||
- Uupdate to 2.30.3
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user