- updated to 3.0.0; merged from DEVEL

Changed files:
    mutter.spec -> 1.5

diff --git a/mutter.spec b/mutter.spec
index 26c78290c0d6bf3b0749cbf2997a395e8c7f523c..d399c403aeaafacaf290aa2c4495c71c555b7205 100644 (file)
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,59 +1,67 @@
 Summary:       Window and compositing manager based on Clutter
 Name:          mutter
-Version:       2.28.0
-Release:       3
+Version:       3.0.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Window Managers
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/mutter/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5: eb55cdab86de0f7e4032efada03062f8
 URL:           http://git.gnome.org/cgit/mutter
-Source0:       http://download.gnome.org/sources/mutter/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5: 3926895782024cff7af7ca480df46b4f
-BuildRequires: GConf2-devel
-BuildRequires: autoconf
+BuildRequires: GConf2-devel >= 1.2.0
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: clutter-devel >= 1.0.0
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: gir-repository-devel
+BuildRequires: cairo-devel >= 1.10
+BuildRequires: clutter-devel >= 1.6.0
+BuildRequires: gdk-pixbuf2-devel
+BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: gnome-common
-BuildRequires: gnome-doc-utils
-BuildRequires: gobject-introspection-devel
-BuildRequires: gtk+2-devel
-BuildRequires: intltool
+BuildRequires: gnome-doc-utils >= 0.8.0
+BuildRequires: gobject-introspection-devel >= 0.10.0
+BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: intltool >= 0.35.0
+BuildRequires: libcanberra-gtk3-devel >= 0.26
 BuildRequires: libtool
-BuildRequires: pango-devel
+BuildRequires: pango-devel >= 1.2.0
 BuildRequires: pkgconfig
-BuildRequires: startup-notification-devel
+# only in configure.in
+BuildRequires: python >= 2.5
+BuildRequires: startup-notification-devel >= 0.7
+BuildRequires: xorg-lib-libICE-devel
+BuildRequires: xorg-lib-libSM-devel
 BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXcomposite-devel >= 0.2
 BuildRequires: xorg-lib-libXcursor-devel
 BuildRequires: xorg-lib-libXdamage-devel
 BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXfixes-devel
+BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXrandr-devel
 BuildRequires: xorg-lib-libXrender-devel
 BuildRequires: zenity
-Requires:      GConf2
-Requires:      dbus
-Requires:      startup-notification
+Requires(post,preun):  GConf2
 Requires:      zenity
+Provides:      gnome-wm
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-A window manager based on metacity and clutter
+Mutter is a window and compositing manager that displays and manages
+your desktop via OpenGL. Mutter combines a sophisticated display
+engine using the Clutter toolkit with solid window-management logic
+inherited from the Metacity window manager.
 
 %package devel
-Summary:       Development package for %{name}
-Group:         Development/Libraries
+Summary:       Development package for Mutter
+Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      gtk-doc
-Requires:      pkgconfig
+Requires:      clutter-devel >= 1.2.0
+Requires:      gtk+3-devel >= 3.0.0
 
 %description devel
-Files for development with %{name}.
+Header files and libraries for developing Mutter plugins.
 
 %prep
 %setup -q
-rm po/ca@valencia.po
-rm po/la.po
-sed -i 's/^ca@valencia$//;s/^la$//' po/LINGUAS
 
 %build
 %{__intltoolize}
@@ -71,16 +79,12 @@ sed -i 's/^ca@valencia$//;s/^la$//' po/LINGUAS
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_datadir}/gir-1.0,%{_libdir}/girepository-1.0}
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
-mv $RPM_BUILD_ROOT%{_libdir}/mutter/*.gir $RPM_BUILD_ROOT%{_datadir}/gir-1.0
-mv $RPM_BUILD_ROOT%{_libdir}/mutter/*.typelib $RPM_BUILD_ROOT%{_libdir}/girepository-1.0
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,29 +100,32 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README AUTHORS COPYING NEWS HACKING doc/theme-format.txt rationales.txt
-%{_mandir}/man1/mutter.1*
-%{_mandir}/man1/mutter-message.1*
+%doc README AUTHORS NEWS HACKING doc/theme-format.txt rationales.txt
 %attr(755,root,root) %{_bindir}/mutter
 %attr(755,root,root) %{_bindir}/mutter-message
-%{_desktopdir}/*.desktop
-%{_datadir}/gnome/wm-properties/mutter-wm.desktop
-%{_sysconfdir}/gconf/schemas/mutter.schemas
-%{_datadir}/mutter
-%attr(755,root,root) %{_libdir}/libmutter-private.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmutter-private.so.0
+%attr(755,root,root) %{_bindir}/mutter-theme-viewer
+%attr(755,root,root) %{_bindir}/mutter-window-demo
+%attr(755,root,root) %{_libdir}/libmutter.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmutter.so.0
 %dir %{_libdir}/mutter
 %dir %{_libdir}/mutter/plugins
 %attr(755,root,root) %{_libdir}/mutter/plugins/default.so
-%{_libdir}/girepository-1.0/*.typelib
+# intentionally installed in package-private dir
+%{_libdir}/mutter/Meta-*.typelib
+%{_desktopdir}/mutter.desktop
+%{_datadir}/gnome/wm-properties/mutter-wm.desktop
+%{_sysconfdir}/gconf/schemas/mutter.schemas
+%{_datadir}/mutter
+%{_mandir}/man1/mutter.1*
+%{_mandir}/man1/mutter-message.1*
+%{_mandir}/man1/mutter-theme-viewer.1*
+%{_mandir}/man1/mutter-window-demo.1*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mutter-theme-viewer
-%attr(755,root,root) %{_bindir}/mutter-window-demo
-%{_includedir}/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_pkgconfigdir}/*
-%{_mandir}/man1/mutter-theme-viewer.1*
-%{_mandir}/man1/mutter-window-demo.1*
-%{_datadir}/gir-1.0/*.gir
+%{_includedir}/mutter
+%attr(755,root,root) %{_libdir}/libmutter.so
+# intentionally installed in package-private dir
+%{_libdir}/mutter/Meta-*.gir
+%{_pkgconfigdir}/libmutter.pc
+%{_pkgconfigdir}/mutter-plugins.pc