- pl

- separated -libs so whole WM is not needed for development
- pass ZENITY so zenity program is not BRed
- added versioned install time dependencies

Changed files:
    mutter.spec -> 1.16

diff --git a/mutter.spec b/mutter.spec
index a8037ec4198d6752b4978a2273d66495c4fe7f84..e7cc50607aaebe6d93874e832b25d9379125ee92 100644 (file)
--- a/mutter.spec
+++ b/mutter.spec
@@ -3,9 +3,10 @@
 %bcond_with    gnome2          # build with support for GNOME2 wm-properties
 #
 Summary:       Window and compositing manager based on Clutter
+Summary(pl.UTF-8):     Zarządca okien i składania oparty na bibliotece Clutter
 Name:          mutter
 Version:       3.4.0
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Window Managers
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/mutter/3.4/%{name}-%{version}.tar.xz
@@ -30,7 +31,7 @@ BuildRequires:        libtool
 BuildRequires: pango-devel >= 1.2.0
 BuildRequires: pkgconfig
 # only in configure.in
-BuildRequires: python >= 2.5
+BuildRequires: python >= 1:2.5
 BuildRequires: startup-notification-devel >= 0.7
 BuildRequires: tar >= 1:1.22
 BuildRequires: xorg-lib-libICE-devel
@@ -45,8 +46,9 @@ BuildRequires:        xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXrandr-devel
 BuildRequires: xorg-lib-libXrender-devel
 BuildRequires: xz
-BuildRequires: zenity
 Requires(post,postun): glib2 >= 1:2.26.0
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      gsettings-desktop-schemas >= 3.3.0
 Requires:      zenity
 Provides:      gnome-wm
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,15 +59,56 @@ 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.
 
+%description -l pl.UTF-8
+Mutter to zarządca okien i składania wyświetlający pulpit i
+zarządzający nim poprzez OpenGL. Łączy wyszukany silnik wyświetlania
+wykorzystujący toolkit Clutter z solidną logiką zarządcy okien
+odziedziczoną z zarządcy okien Metacity.
+
+%package libs
+Summary:       Mutter shared library
+Summary(pl.UTF-8):     Biblioteka współdzielona zarządcy okien Mutter
+Group:         Libraries
+Requires:      cairo >= 1.10
+Requires:      clutter >= 1.9.10
+Requires:      cogl >= 1.9.6
+Requires:      glib2 >= 1:2.26.0
+Requires:      gtk+3 >= 3.3.7
+Requires:      libcanberra-gtk3 >= 0.26
+Requires:      startup-notification >= 0.7
+Requires:      xorg-lib-libXcomposite >= 0.2
+Conflicts:     mutter < 3.4.0-2
+
+%description libs
+Mutter shared library.
+
+%description libs -l pl.UTF-8
+Biblioteka współdzielona zarządcy okien i składania Mutter.
+
 %package devel
 Summary:       Development package for Mutter
+Summary(pl.UTF-8):     Pakiet programistyczny do wtyczek zarządcy okien Mutter
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      clutter-devel >= 1.8.0
-Requires:      gtk+3-devel >= 3.0.0
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      cairo-devel >= 1.10
+Requires:      clutter-devel >= 1.9.10
+Requires:      cogl-devel >= 1.9.6
+Requires:      glib2-devel >= 1:2.26.0
+Requires:      gtk+3-devel >= 3.3.7
+Requires:      libcanberra-gtk3-devel >= 0.26
+Requires:      startup-notification-devel >= 0.7
+Requires:      xorg-lib-libXcomposite-devel >= 0.2
+Requires:      xorg-lib-libXcursor-devel
+Requires:      xorg-lib-libXdamage-devel
+Requires:      xorg-lib-libXfixes-devel
+Requires:      xorg-lib-libXrender-devel
 
 %description devel
-Header files and libraries for developing Mutter plugins.
+Header files for developing Mutter plugins.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe do tworzenia wtyczek zarządcy okien i składania
+Mutter.
 
 %prep
 %setup -q
@@ -78,6 +121,7 @@ Header files and libraries for developing Mutter plugins.
 %{__autoheader}
 %{__automake}
 %configure \
+       ZENITY=/usr/bin/zenity \
        --disable-schemas-install \
        --disable-silent-rules \
        --disable-static
@@ -99,13 +143,14 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 %glib_compile_schemas
 
 %postun
-/sbin/ldconfig
 %glib_compile_schemas
 
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README AUTHORS NEWS HACKING doc/theme-format.txt rationales.txt
@@ -113,13 +158,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/mutter-message
 %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
-# intentionally installed in package-private dir
-%{_libdir}/mutter/Meta-*.typelib
 %{_desktopdir}/mutter.desktop
 %{?with_gnome2:%{_datadir}/gnome/wm-properties/mutter-wm.desktop}
 %{_datadir}/mutter
@@ -131,10 +171,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/mutter-theme-viewer.1*
 %{_mandir}/man1/mutter-window-demo.1*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libmutter.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmutter.so.0
+%dir %{_libdir}/mutter
+# intentionally installed in package-private dir
+%{_libdir}/mutter/Meta-*.typelib
+
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/mutter
 %attr(755,root,root) %{_libdir}/libmutter.so
+%{_includedir}/mutter
 # intentionally installed in package-private dir
 %{_libdir}/mutter/Meta-*.gir
 %{_pkgconfigdir}/libmutter.pc