X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mutter.spec;h=be2dd681d7d7cf65c7f5ff571af52e10d515aa8f;hb=547e5cab6458f097c7a0501d5ec65096609e079c;hp=e57af209e393829e00903000a15ea67ef7e1614a;hpb=492147cf309569e1bc1ff5da93726ab7f4535aa1;p=packages%2Fmutter.git

diff --git a/mutter.spec b/mutter.spec
index e57af20..be2dd68 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -3,33 +3,34 @@
 %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.2.0
+Version:	3.8.0
 Release:	2
 License:	GPL v2+
 Group:		X11/Window Managers
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/mutter/3.2/%{name}-%{version}.tar.xz
-# Source0-md5:	a967c8da0e54ae4850fb050109797d0a
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/mutter/3.8/%{name}-%{version}.tar.xz
+# Source0-md5:	7c77374df3d0a25865fc75d192060c9b
 URL:		http://git.gnome.org/cgit/mutter
-BuildRequires:	GConf2-devel >= 1.2.0
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	cairo-devel >= 1.10
-BuildRequires:	clutter-devel >= 1.8.0
+BuildRequires:	clutter-devel >= 1.13.5
+BuildRequires:	cogl-devel >= 1.13.3
 BuildRequires:	gdk-pixbuf2-devel
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.28.0
+BuildRequires:	glib2-devel >= 1:2.26.0
 BuildRequires:	gnome-common
-BuildRequires:	gnome-doc-utils >= 0.8.0
 BuildRequires:	gobject-introspection-devel >= 0.10.0
-BuildRequires:	gtk+3-devel >= 3.0.0
+BuildRequires:	gsettings-desktop-schemas-devel >= 3.7.3
+BuildRequires:	gtk+3-devel >= 3.3.7
+BuildRequires:	gtk-doc >= 1.15
 BuildRequires:	intltool >= 0.35.0
 BuildRequires:	libcanberra-gtk3-devel >= 0.26
 BuildRequires:	libtool
 BuildRequires:	pango-devel >= 1.2.0
 BuildRequires:	pkgconfig
-# only in configure.in
-BuildRequires:	python >= 2.5
+BuildRequires:	rpmbuild(macros) >= 1.98
 BuildRequires:	startup-notification-devel >= 0.7
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-lib-libICE-devel
@@ -40,12 +41,14 @@ BuildRequires:	xorg-lib-libXcursor-devel
 BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXfixes-devel
+BuildRequires:	xorg-lib-libXi-devel >= 1.7
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	xz
-BuildRequires:	zenity
-Requires(post,preun):	GConf2
+Requires(post,postun):	glib2 >= 1:2.26.0
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	gsettings-desktop-schemas >= 3.7.3
 Requires:	zenity
 Provides:	gnome-wm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -56,15 +59,69 @@ 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.13.5
+Requires:	cogl >= 1.13.3
+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
+Requires:	xorg-lib-libXi >= 1.6
+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.13.5
+Requires:	cogl-devel >= 1.13.3
+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.
+
+%package apidocs
+Summary:	Mutter (Meta) API documentation
+Summary(pl.UTF-8):	Dokumentacja API Mutter (Meta)
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+Mutter (Meta) API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API Mutter (Meta).
 
 %prep
 %setup -q
@@ -77,9 +134,11 @@ Header files and libraries for developing Mutter plugins.
 %{__autoheader}
 %{__automake}
 %configure \
+	ZENITY=/usr/bin/zenity \
 	--disable-schemas-install \
 	--disable-silent-rules \
-	--disable-static
+	--disable-static \
+	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
@@ -98,13 +157,13 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install mutter.schemas
-/sbin/ldconfig
+%glib_compile_schemas
 
-%preun
-%gconf_schema_uninstall mutter.schemas
+%postun
+%glib_compile_schemas
 
-%postun -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -113,27 +172,38 @@ 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}
-%{_sysconfdir}/gconf/schemas/mutter.schemas
 %{_datadir}/mutter
+%{_datadir}/GConf/gsettings/mutter-schemas.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
+%{_datadir}/gnome-control-center/keybindings/50-mutter-windows.xml
+%{_datadir}/gnome-control-center/keybindings/50-mutter-navigation.xml
+%{_datadir}/gnome-control-center/keybindings/50-mutter-system.xml
 %{_mandir}/man1/mutter.1*
 %{_mandir}/man1/mutter-message.1*
 %{_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
 %{_pkgconfigdir}/mutter-plugins.pc
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/meta