Update to 3.24.2

[packages/gnome-desktop.git] / gnome-desktop.spec

diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index f835caa823216b17887935e4d0bd6f5c8864fda7..2c224834e567cf07599287eb90786ed3bb976e5c 100644 (file)
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,25 +1,24 @@
 Summary:       gnome-desktop library
 Summary(pl.UTF-8):     Biblioteka gnome-desktop
 Name:          gnome-desktop
-Version:       3.8.0
+Version:       3.24.2
 Release:       1
-License:       LGPL
+License:       LGPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.8/%{name}-%{version}.tar.xz
-# Source0-md5: 67cdf987d1d9a4b515bb933eeb0bf726
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.24/%{name}-%{version}.tar.xz
+# Source0-md5: af7c6a243df7a335a010bdc05b34ca93
 URL:           http://www.gnome.org/
-BuildRequires: autoconf
-BuildRequires: automake >= 1:1.11
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake >= 1:1.11.2
 BuildRequires: docbook-dtd412-xml
-BuildRequires: gdk-pixbuf2-devel >= 2.22.0
-BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.34.0
+BuildRequires: gdk-pixbuf2-devel >= 2.36.5
+BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 1:2.44.0
 BuildRequires: gnome-common >= 2.24.0
-BuildRequires: gnome-doc-utils >= 0.14.0
 BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: gsettings-desktop-schemas-devel >= 3.6.0
 BuildRequires: gtk+3-devel >= 3.4.0
-BuildRequires: gtk-doc >= 1.8
+BuildRequires: gtk-doc >= 1.14
 BuildRequires: intltool >= 0.40.6
 BuildRequires: iso-codes
 BuildRequires: libtool >= 2:2.2.6
@@ -27,13 +26,21 @@ BuildRequires:      pkgconfig
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: tar >= 1:1.22
+BuildRequires: udev-devel
 BuildRequires: xkeyboard-config
-BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel >= 1.1
 BuildRequires: xorg-lib-libXrandr-devel >= 1.3
-BuildRequires: xorg-lib-libxkbfile-devel
 BuildRequires: xz
+BuildRequires: yelp-tools
+Requires:      gdk-pixbuf2 >= 2.36.5
+Requires:      glib2 >= 1:2.44.0
 Requires:      gsettings-desktop-schemas >= 3.6.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
@@ -63,6 +70,7 @@ Summary:      GNOME desktop includes
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki GNOME desktop
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      glib2-devel >= 1:2.44.0
 Requires:      gsettings-desktop-schemas-devel >= 3.6.0
 Requires:      gtk+3-devel >= 3.4.0
 Obsoletes:     gnome-desktop3-devel
@@ -79,6 +87,9 @@ Summary(pl.UTF-8):    Dokumentacja API gnome-desktop
 Group:         Documentation
 Requires:      gtk-doc-common
 Obsoletes:     gnome-desktop3-apidocs
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description apidocs
 gnome-desktop API documentation.
@@ -90,10 +101,6 @@ Dokumentacja API gnome-desktop.
 %setup -q
 
 %build
-%{__gtkdocize}
-%{__intltoolize}
-%{__gnome_doc_prepare}
-%{__gnome_doc_common}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -101,15 +108,14 @@ Dokumentacja API gnome-desktop.
 %{__autoheader}
 %{__automake}
 %configure \
-       --with-gnome-distributor="PLD Linux Distribution" \
        --enable-gtk-doc \
-       --with-html-dir=%{_gtkdocdir} \
-       --disable-silent-rules
+       --disable-silent-rules \
+       --with-gnome-distributor="PLD Linux Distribution" \
+       --with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -120,20 +126,16 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README
 %attr(755,root,root) %{_libdir}/libgnome-desktop-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnome-desktop-3.so.7
+%attr(755,root,root) %ghost %{_libdir}/libgnome-desktop-3.so.12
 %attr(755,root,root) %{_libdir}/gnome-rr-debug
 %{_datadir}/gnome/gnome-version.xml
-%{_datadir}/libgnome-desktop-3.0
 %{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
 
 %files devel