[packages/libxfce4util] - updated dependencies, unified subpackages order

[qboosh]

commit ddd576eb5f3e24cccc54eb66bc4fe8ba9a566eba
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Aug 25 19:53:57 2014 +0200

    - updated dependencies, unified subpackages order

 libxfce4util.spec | 73 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 34 deletions(-)
---
diff --git a/libxfce4util.spec b/libxfce4util.spec
index dd45d2a..bef1761 100644
--- a/libxfce4util.spec
+++ b/libxfce4util.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
-%bcond_without	apidocs		# disable gtk-doc
-%bcond_with	static_libs	# don't build static library
+%bcond_without	apidocs		# gtk-doc documentation
+%bcond_with	static_libs	# static library
 #
 %define		xfce_version	4.11.0
 Summary:	Utility library for the Xfce desktop environment
@@ -9,23 +9,25 @@ Summary(pl.UTF-8):	Biblioteka narzędziowa dla środowiska Xfce
 Name:		libxfce4util
 Version:	4.11.0
 Release:	2
-License:	BSD, LGPL
+License:	LGPL v2+
 Group:		Libraries
 Source0:	http://archive.xfce.org/src/xfce/libxfce4util/4.11/%{name}-%{version}.tar.bz2
 # Source0-md5:	319907682b1254ba76dcd81d97841452
 URL:		http://www.xfce.org/projects/libxfce4
 BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.8
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.12.4
-BuildRequires:	gtk-doc-automake
-%{?with_apidocs:BuildRequires:	gtk-doc}
-BuildRequires:	intltool
-BuildRequires:	libtool
+BuildRequires:	glib2-devel >= 1:2.24.0
+BuildRequires:	gtk-doc-automake >= 1.0
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
+BuildRequires:	intltool >= 0.31
+BuildRequires:	libtool >= 2:2.2.6
+BuildRequires:	perl-base
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	rpmbuild(macros) >= 1.98
 BuildRequires:	xfce4-dev-tools >= %{xfce_version}
+Requires:	glib2 >= 1:2.24.0
 Requires:	xfce4-dirs >= 4.6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -35,24 +37,12 @@ Basic utility non-GUI functions for Xfce.
 %description -l pl.UTF-8
 Podstawowe funkcje narzędziowe nie związane z GUI dla Xfce.
 
-%package apidocs
-Summary:	libxfce4util API documentation
-Summary(pl.UTF-8):	Dokumentacja API libxfce4util
-Group:		Documentation
-Requires:	gtk-doc-common
-
-%description apidocs
-libxfce4util API documentation.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API libxfce4util.
-
 %package devel
 Summary:	Development files for libxfce4util library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libxfce4util
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.12.4
+Requires:	glib2-devel >= 1:2.24.0
 
 %description devel
 Development files for the libxfce4util library.
@@ -72,10 +62,23 @@ Static libxfce4util library.
 %description static -l pl.UTF-8
 Statyczna biblioteka libxfce4util.
 
+%package apidocs
+Summary:	libxfce4util API documentation
+Summary(pl.UTF-8):	Dokumentacja API libxfce4util
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+libxfce4util API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API libxfce4util.
+
 %package tools
 Summary:	Tools for libxfce4util library
 Summary(pl.UTF-8):	Narzędzia biblioteki libxfce4util
-Group:		Development/Libraries
+License:	GPL v2+
+Group:		Development/Tools
 Requires:	%{name} = %{version}-%{release}
 
 %description tools
@@ -94,10 +97,10 @@ Narzędzia biblioteki libxfce4util.
 %{__automake}
 %{__autoconf}
 %configure \
-	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
-	--with-html-dir=%{_gtkdocdir} \
+	--enable-gtk-doc%{!?with_apidocs:=no} \
+	--disable-silent-rules \
 	%{?with_static_libs:--enable-static} \
-	--disable-silent-rules
+	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
@@ -108,8 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/libxfce4util}
 
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+# obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+# just a copy of ur
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
 
 %find_lang %{name}
 
@@ -121,16 +126,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING README NEWS THANKS TODO
+%doc AUTHORS ChangeLog NEWS README THANKS TODO
 %attr(755,root,root) %{_libdir}/libxfce4util.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libxfce4util.so.6
 
-%if %{with apidocs}
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/%{name}
-%endif
-
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libxfce4util.so
@@ -144,6 +143,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libxfce4util.a
 %endif
 
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/%{name}
+%endif
+
 %files tools
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/xfce4-kiosk-query
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libxfce4util.git/commitdiff/ddd576eb5f3e24cccc54eb66bc4fe8ba9a566eba