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

diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 455d62b..b50b4c8 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,36 +1,47 @@
 Summary:	gnome-desktop library
 Summary(pl.UTF-8):	Biblioteka gnome-desktop
 Name:		gnome-desktop
-Version:	3.0.0
+Version:	3.36.1
 Release:	1
-License:	LGPL
+License:	LGPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.0/%{name}-%{version}.tar.bz2
-# Source0-md5:	6215d5fee0a3ab517830d3e6553685f2
-URL:		http://www.gnome.org/
-BuildRequires:	autoconf
-BuildRequires:	automake >= 1:1.9
+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.22.0
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.28.0
-BuildRequires:	gnome-common >= 2.24.0
-BuildRequires:	gnome-doc-utils >= 0.14.0
+BuildRequires:	gdk-pixbuf2-devel >= 2.36.5
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.54.0
 BuildRequires:	gobject-introspection-devel >= 0.10.0
-BuildRequires:	gsettings-desktop-schemas-devel >= 3.0.0
-BuildRequires:	gtk+3-devel >= 3.0.0
-BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libtool
+BuildRequires:	gsettings-desktop-schemas-devel >= 3.27.0
+BuildRequires:	gtk+3-devel >= 3.4.0
+BuildRequires:	gtk-doc >= 1.14
+BuildRequires:	iso-codes
+%ifnarch alpha ia64 m68k riscv64 sh4 sparc sparcv9 sparc64
+BuildRequires:	libseccomp-devel
+%endif
+BuildRequires:	meson >= 0.49.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	scrollkeeper
-BuildRequires:	sed >= 4.0
-BuildRequires:	startup-notification-devel >= 0.8
-BuildRequires:	xorg-lib-libXrandr-devel >= 1.2
-Requires(post,postun):	scrollkeeper
-Requires:	gsettings-desktop-schemas >= 3.0.0
+BuildRequires:	rpmbuild(macros) >= 1.736
+BuildRequires:	systemd-devel >= 1:209
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	udev-devel
+BuildRequires:	xkeyboard-config
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel >= 1.1
+BuildRequires:	xorg-lib-libXrandr-devel >= 1.3
+BuildRequires:	xz
+BuildRequires:	yelp-tools
+Requires:	gdk-pixbuf2 >= 2.36.5
+Requires:	glib2 >= 1:2.54.0
+Requires:	gsettings-desktop-schemas >= 3.27.0
+Requires:	gtk+3 >= 3.4.0
+Requires:	iso-codes
+Requires:	xkeyboard-config
+Requires:	xorg-lib-libXext >= 1.1
+Requires:	xorg-lib-libXrandr >= 1.3
 Obsoletes:	gnome-desktop-libs
 Obsoletes:	gnome-desktop3
 Obsoletes:	gnome-desktop3-libs
@@ -60,9 +71,9 @@ Summary:	GNOME desktop includes
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki GNOME desktop
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	gsettings-desktop-schemas-devel >= 3.0.0
-Requires:	gtk+3-devel >= 3.0.0
-Requires:	startup-notification-devel >= 0.8
+Requires:	glib2-devel >= 1:2.54.0
+Requires:	gsettings-desktop-schemas-devel >= 3.27.0
+Requires:	gtk+3-devel >= 3.4.0
 Obsoletes:	gnome-desktop3-devel
 
 %description devel
@@ -71,25 +82,15 @@ GNOME desktop header files.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki GNOME desktop.
 
-%package static
-Summary:	GNOME desktop static library
-Summary(pl.UTF-8):	Statyczna biblioteka GNOME desktop
-Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	gnome-desktop3-static
-
-%description static
-GNOME desktop static library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka GNOME desktop.
-
 %package apidocs
 Summary:	gnome-desktop API documentation
 Summary(pl.UTF-8):	Dokumentacja API gnome-desktop
 Group:		Documentation
 Requires:	gtk-doc-common
 Obsoletes:	gnome-desktop3-apidocs
+%if "%{_rpmversion}" >= "4.6"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 gnome-desktop API documentation.
@@ -100,55 +101,34 @@ Dokumentacja API gnome-desktop.
 %prep
 %setup -q
 
-sed -i -e 's/^kg//' po/LINGUAS
-%{__rm} po/kg.po
-
 %build
-%{__gtkdocize}
-%{__intltoolize}
-%{__gnome_doc_prepare}
-%{__gnome_doc_common}
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--with-gnome-distributor="PLD Linux Distribution" \
-	--enable-gtk-doc \
-	--with-html-dir=%{_gtkdocdir} \
-	--disable-silent-rules
-%{__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 --with-omf --all-name
+%find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-%scrollkeeper_update_post
-
-%postun
-/sbin/ldconfig
-%scrollkeeper_update_postun
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %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.0
+%attr(755,root,root) %ghost %{_libdir}/libgnome-desktop-3.so.19
+%attr(755,root,root) %{_libexecdir}/gnome-rr-debug
 %{_datadir}/gnome/gnome-version.xml
-%{_datadir}/libgnome-desktop-3.0
 %{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
 
 %files devel
@@ -158,10 +138,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/gnome-desktop-3.0.pc
 %{_datadir}/gir-1.0/GnomeDesktop-3.0.gir
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgnome-desktop-3.a
-
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gnome-desktop3