X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-desktop.spec;h=b50b4c83f07a1684b4b0bacf6f91242ca623d5d0;hb=d7053aa22f347c3797eed62a4c05d20ed6e10fc9;hp=f062302de0f29ecf1bda6c019126ddbe2db1d99d;hpb=8ade66c778a55dc8e9cca5299bbbf941b7de3459;p=packages%2Fgnome-desktop.git

diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index f062302..b50b4c8 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,31 +1,31 @@
 Summary:	gnome-desktop library
 Summary(pl.UTF-8):	Biblioteka gnome-desktop
 Name:		gnome-desktop
-Version:	3.30.2
+Version:	3.36.1
 Release:	1
 License:	LGPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.30/%{name}-%{version}.tar.xz
-# Source0-md5:	afcee5e8506bcdc1daaac9e6c3682685
-URL:		http://www.gnome.org/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake >= 1:1.11.2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.36/%{name}-%{version}.tar.xz
+# Source0-md5:	585a973df1f59053df8cd2873d1894ad
+URL:		https://www.gnome.org/
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gdk-pixbuf2-devel >= 2.36.5
 BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= 1:2.54.0
-BuildRequires:	gnome-common >= 2.24.0
 BuildRequires:	gobject-introspection-devel >= 0.10.0
-BuildRequires:	gsettings-desktop-schemas-devel >= 3.6.0
+BuildRequires:	gsettings-desktop-schemas-devel >= 3.27.0
 BuildRequires:	gtk+3-devel >= 3.4.0
 BuildRequires:	gtk-doc >= 1.14
-BuildRequires:	intltool >= 0.40.6
 BuildRequires:	iso-codes
+%ifnarch alpha ia64 m68k riscv64 sh4 sparc sparcv9 sparc64
 BuildRequires:	libseccomp-devel
-BuildRequires:	libtool >= 2:2.2.6
+%endif
+BuildRequires:	meson >= 0.49.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	rpmbuild(macros) >= 1.736
+BuildRequires:	systemd-devel >= 1:209
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-devel
 BuildRequires:	xkeyboard-config
@@ -36,7 +36,7 @@ BuildRequires:	xz
 BuildRequires:	yelp-tools
 Requires:	gdk-pixbuf2 >= 2.36.5
 Requires:	glib2 >= 1:2.54.0
-Requires:	gsettings-desktop-schemas >= 3.6.0
+Requires:	gsettings-desktop-schemas >= 3.27.0
 Requires:	gtk+3 >= 3.4.0
 Requires:	iso-codes
 Requires:	xkeyboard-config
@@ -72,7 +72,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki GNOME desktop
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel >= 1:2.54.0
-Requires:	gsettings-desktop-schemas-devel >= 3.6.0
+Requires:	gsettings-desktop-schemas-devel >= 3.27.0
 Requires:	gtk+3-devel >= 3.4.0
 Obsoletes:	gnome-desktop3-devel
 
@@ -88,7 +88,7 @@ Summary(pl.UTF-8):	Dokumentacja API gnome-desktop
 Group:		Documentation
 Requires:	gtk-doc-common
 Obsoletes:	gnome-desktop3-apidocs
-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:	noarch
 %endif
 
@@ -102,24 +102,17 @@ Dokumentacja API gnome-desktop.
 %setup -q
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--enable-gtk-doc \
-	--disable-silent-rules \
-	--with-gnome-distributor="PLD Linux Distribution" \
-	--with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build \
+	--default-library=shared \
+	-Dgnome_distributor="PLD Linux Distribution" \
+	-Dgtk_doc=true
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%ninja_install -C build
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -131,9 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog MAINTAINERS NEWS README
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libgnome-desktop-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnome-desktop-3.so.17
+%attr(755,root,root) %ghost %{_libdir}/libgnome-desktop-3.so.19
 %attr(755,root,root) %{_libexecdir}/gnome-rr-debug
 %{_datadir}/gnome/gnome-version.xml
 %{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib