X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mutter.spec;h=e279a3ad7e5aee7f7a105ac9a56186a90d347409;hb=47f105a2ee348645f53b9ce8ad73e27474434033;hp=6921777973491f1185ce0637d5bdfb072249987a;hpb=629080e14abcde1efb1a63e83091b44bfc975495;p=packages%2Fmutter.git

diff --git a/mutter.spec b/mutter.spec
index 6921777..e279a3a 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,38 +1,46 @@
-#
-# Conditional build:
-%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.6.0
-Release:	2
+Version:	3.20.3
+Release:	1
 License:	GPL v2+
 Group:		X11/Window Managers
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/mutter/3.6/%{name}-%{version}.tar.xz
-# Source0-md5:	d893841e391767cf883f7d81d05d3086
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/mutter/3.20/%{name}-%{version}.tar.xz
+# Source0-md5:	7b847d952a108be4c4096e8842db00eb
 URL:		http://git.gnome.org/cgit/mutter
-BuildRequires:	autoconf >= 2.50
+BuildRequires:	Mesa-libgbm-devel >= 10.3
+BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.11
-BuildRequires:	cairo-devel >= 1.10
-BuildRequires:	clutter-devel >= 1.9.10
-BuildRequires:	cogl-devel >= 1.9.6
+BuildRequires:	cairo-devel >= 1.10.0
+# clutter-egl-1.0 clutter-wayland-1.0 clutter-wayland-compositor-1.0
+BuildRequires:	clutter-devel >= 1.26.0
+BuildRequires:	cogl-devel >= 1.18.0
 BuildRequires:	gdk-pixbuf2-devel
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.26.0
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.35.1
 BuildRequires:	gnome-common
+BuildRequires:	gnome-desktop-devel >= 3.0
 BuildRequires:	gobject-introspection-devel >= 0.10.0
-BuildRequires:	gsettings-desktop-schemas-devel >= 3.3.0
-BuildRequires:	gtk+3-devel >= 3.3.7
-BuildRequires:	intltool >= 0.35.0
+BuildRequires:	gsettings-desktop-schemas-devel >= 3.20.0
+BuildRequires:	gtk+3-devel >= 3.20.0
+BuildRequires:	intltool >= 0.41.0
 BuildRequires:	libcanberra-gtk3-devel >= 0.26
-BuildRequires:	libtool
-BuildRequires:	pango-devel >= 1.2.0
-BuildRequires:	pkgconfig
-# only in configure.in
-BuildRequires:	python >= 1:2.5
+BuildRequires:	libdrm-devel
+BuildRequires:	libinput-devel
+BuildRequires:	libtool >= 2:2.2.6
+# xcb-randr
+BuildRequires:	libxcb-devel
+BuildRequires:	pango-devel >= 1:1.2.0
+BuildRequires:	pkgconfig >= 1:0.21
+BuildRequires:	rpmbuild(macros) >= 1.98
 BuildRequires:	startup-notification-devel >= 0.7
+BuildRequires:	systemd-devel
 BuildRequires:	tar >= 1:1.22
+BuildRequires:	udev-glib-devel
+BuildRequires:	upower-devel >= 0.99.0
+BuildRequires:	wayland-devel >= 1.6.90
+BuildRequires:	wayland-protocols >= 1.1
+BuildRequires:	xkeyboard-config
 BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libX11-devel
@@ -41,15 +49,22 @@ 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:	xorg-lib-libxkbcommon-devel >= 0.4.3
+BuildRequires:	xorg-lib-libxkbcommon-x11-devel
+BuildRequires:	xorg-lib-libxkbfile-devel
 BuildRequires:	xz
-Requires(post,postun):	glib2 >= 1:2.26.0
+Requires(post,postun):	glib2 >= 1:2.35.1
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gsettings-desktop-schemas >= 3.3.0
+Requires:	gsettings-desktop-schemas >= 3.20.0
 Requires:	zenity
 Provides:	gnome-wm
+Obsoletes:	mutter-apidocs < 3.18
+Obsoletes:	mutter-wayland < 3.14
+Obsoletes:	mutter-wayland-apidocs < 3.14
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -68,14 +83,20 @@ odziedziczoną z zarządcy okien Metacity.
 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:	Mesa-libgbm >= 10.3
+Requires:	cairo >= 1.10.0
+Requires:	clutter >= 1.26.0
+Requires:	cogl >= 1.18.0
+Requires:	glib2 >= 1:2.35.1
+Requires:	gnome-desktop >= 3.0
+Requires:	gtk+3 >= 3.20.0
 Requires:	libcanberra-gtk3 >= 0.26
 Requires:	startup-notification >= 0.7
+Requires:	upower-libs >= 0.99.0
+Requires:	wayland >= 1.6.90
 Requires:	xorg-lib-libXcomposite >= 0.2
+Requires:	xorg-lib-libXi >= 1.7
+Obsoletes:	mutter-wayland-libs < 3.14
 Conflicts:	mutter < 3.4.0-2
 
 %description libs
@@ -89,11 +110,11 @@ Summary:	Development package for Mutter
 Summary(pl.UTF-8):	Pakiet programistyczny do wtyczek zarządcy okien Mutter
 Group:		X11/Development/Libraries
 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:	cairo-devel >= 1.10.0
+Requires:	clutter-devel >= 1.26.0
+Requires:	cogl-devel >= 1.18.0
+Requires:	glib2-devel >= 1:2.35.1
+Requires:	gtk+3-devel >= 3.20.0
 Requires:	libcanberra-gtk3-devel >= 0.26
 Requires:	startup-notification-devel >= 0.7
 Requires:	xorg-lib-libXcomposite-devel >= 0.2
@@ -101,6 +122,7 @@ Requires:	xorg-lib-libXcursor-devel
 Requires:	xorg-lib-libXdamage-devel
 Requires:	xorg-lib-libXfixes-devel
 Requires:	xorg-lib-libXrender-devel
+Obsoletes:	mutter-wayland-devel < 3.14
 
 %description devel
 Header files for developing Mutter plugins.
@@ -121,7 +143,7 @@ Mutter.
 %{__automake}
 %configure \
 	ZENITY=/usr/bin/zenity \
-	--disable-schemas-install \
+	--enable-compile-warnings=maximum \
 	--disable-silent-rules \
 	--disable-static
 %{__make}
@@ -132,8 +154,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{!?with_gnome2:%{__rm} $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties/mutter-wm.desktop}
-
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name}
@@ -152,23 +172,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README AUTHORS NEWS HACKING doc/theme-format.txt rationales.txt
+%doc NEWS doc/*.txt
 %attr(755,root,root) %{_bindir}/mutter
-%attr(755,root,root) %{_bindir}/mutter-message
-%attr(755,root,root) %{_bindir}/mutter-theme-viewer
-%attr(755,root,root) %{_bindir}/mutter-window-demo
 %dir %{_libdir}/mutter/plugins
 %attr(755,root,root) %{_libdir}/mutter/plugins/default.so
+%attr(755,root,root) %{_libexecdir}/mutter-restart-helper
 %{_desktopdir}/mutter.desktop
-%{?with_gnome2:%{_datadir}/gnome/wm-properties/mutter-wm.desktop}
-%{_datadir}/mutter
 %{_datadir}/GConf/gsettings/mutter-schemas.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.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)
@@ -185,4 +201,3 @@ rm -rf $RPM_BUILD_ROOT
 # intentionally installed in package-private dir
 %{_libdir}/mutter/Meta-*.gir
 %{_pkgconfigdir}/libmutter.pc
-%{_pkgconfigdir}/mutter-plugins.pc