SPECS (AC-branch): libxfce4util.spec - updated to 4.4.0, merged fr...

Sun Jan 28 19:57:12 CET 2007

Author: megabajt                     Date: Sun Jan 28 18:57:12 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated to 4.4.0, merged from HEAD

---- Files affected:
SPECS:
   libxfce4util.spec (1.35.2.1 -> 1.35.2.2) 

---- Diffs:

================================================================
Index: SPECS/libxfce4util.spec
diff -u SPECS/libxfce4util.spec:1.35.2.1 SPECS/libxfce4util.spec:1.35.2.2

--- SPECS/libxfce4util.spec:1.35.2.1	Tue Jul  4 20:07:51 2006
+++ SPECS/libxfce4util.spec	Sun Jan 28 19:57:06 2007
@@ -1,23 +1,27 @@
 # $Revision$, $Date$
+#
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
 #
 Summary:	Utility library for the Xfce desktop environment
 Summary(pl):	Biblioteka narzędziowa dla środowiska Xfce
 Name:		libxfce4util
-Version:	4.2.3.2
+Version:	4.4.0
 Release:	1
 License:	BSD, LGPL
 Group:		Libraries
-Source0:	http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5:	2d312ba48da612501d6776f8b4a65797
+Source0:	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	543fb8efe96d6e83f897a7c64c48e9e6
 URL:		http://www.xfce.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	glib2-devel >= 2.2.0
+BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.10.3
+BuildRequires:	gtk-doc-automake
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 1:0.9.0
-Requires:	glib2 >= 2.2.0
+BuildRequires:	rpmbuild(macros) >= 1.98
+BuildRequires:	xfce4-dev-tools >= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -26,13 +30,24 @@
 %description -l pl
 Podstawowe funkcje narzędziowe nie związane z GUI dla Xfce.
 
+%package apidocs
+Summary:	libxfce4util API documentation
+Summary(pl):	Dokumentacja API libxfce4util
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+libxfce4util API documentation.
+
+%description apidocs -l pl
+Dokumentacja API libxfce4util.
+
 %package devel
 Summary:	Development files for libxfce4util library
 Summary(pl):	Pliki nagłówkowe biblioteki libxfce4util
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 2.2.0
-Requires:	gtk-doc-common
+Requires:	glib2-devel >= 1:2.10.3
 
 %description devel
 Development files for the libxfce4util library.
@@ -69,11 +84,12 @@
 
 %build
 %{__libtoolize}
-%{__aclocal} -I m4
+%{__aclocal}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
 %configure \
+	--enable-gtkdoc \
 	--with-html-dir=%{_gtkdocdir} \
 	%{!?with_static_libs:--disable-static}
 %{__make}
@@ -81,7 +97,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_datadir}/xfce4
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,31 +110,33 @@
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING README
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc AUTHORS ChangeLog COPYING README NEWS THANKS TODO
+%attr(755,root,root) %{_libdir}/libxfce4util.so.*.*.*
 %dir %{_datadir}/xfce4
 
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/%{name}
+
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libxfce4util.so
+%{_libdir}/libxfce4util.la
 %dir %{_includedir}/xfce4
 %{_includedir}/xfce4/libxfce4util
-%{_datadir}/xfce4/m4
 %{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/libxfce4util
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libxfce4util.a
 %endif
 
 %files tools
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/xfce4-kiosk-query
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -121,6 +144,60 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35.2.2  2007/01/28 18:57:06  megabajt
+- updated to 4.4.0, merged from HEAD
+
+Revision 1.44  2007/01/21 18:57:31  megabajt
+- updated to 4.4.0
+- added apidocs subpackage
+
+Revision 1.43  2007/01/04 16:03:42  arekm
+- rel 2
+
+Revision 1.42  2006/11/05 17:40:27  megabajt
+- up to 4.3.99.2 (Xfce 4.4RC2)
+- updated deps
+
+Revision 1.41  2006/09/06 10:10:53  charles
+- BR: gettext-devel
+
+Revision 1.40  2006/09/04 11:25:23  megabajt
+- updated to 4.3.99.1
+
+Revision 1.39  2006/07/24 18:18:40  freetz
+- rel.2, removed LDFLAGS
+
+Revision 1.38  2006/07/16 11:29:01  freetz
+- merged from DEVEL
+
+Revision 1.37.2.9  2006/07/16 11:27:19  freetz
+- 4.3.90.2, use common aclocal dir for m4 macros, updated deps, --as-needed
+  support
+
+Revision 1.37.2.8  2006/05/19 01:53:42  undefine
+- rel 4.. fix (sleep!)
+
+Revision 1.37.2.7  2006/05/19 01:42:46  undefine
+- create dir :> (and sleep())
+
+Revision 1.37.2.6  2006/05/19 01:38:19  undefine
+- back %dir %{_datadir}/xfce4
+
+Revision 1.37.2.5  2006/05/17 02:20:05  charles
+- BR: gtk-doc-automake
+
+Revision 1.37.2.4  2006/04/18 21:44:06  freetz
+- really cleaned up
+
+Revision 1.37.2.3  2006/04/18 21:32:18  freetz
+- typo
+
+Revision 1.37.2.2  2006/04/18 21:26:58  freetz
+- updated BR, fixed build, cleaned up
+
+Revision 1.37.2.1  2006/04/18 19:20:43  troll
+- updated to 4.3.90.1 (4.4 beta 1)
+
 Revision 1.35.2.1  2006/07/04 18:07:51  havner
 - 4.2.3.2, HEAD merge
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libxfce4util.spec?r1=1.35.2.1&r2=1.35.2.2&f=u

