SPECS (DEVEL): libxfce4util.spec - updated BR, fixed build, cleane...

[freetz]

Author: freetz                       Date: Tue Apr 18 21:27:03 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- updated BR, fixed build, cleaned up

---- Files affected:
SPECS:
   libxfce4util.spec (1.37.2.1 -> 1.37.2.2) 

---- Diffs:

================================================================
Index: SPECS/libxfce4util.spec
diff -u SPECS/libxfce4util.spec:1.37.2.1 SPECS/libxfce4util.spec:1.37.2.2
--- SPECS/libxfce4util.spec:1.37.2.1	Tue Apr 18 21:20:43 2006
+++ SPECS/libxfce4util.spec	Tue Apr 18 23:26:58 2006
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+#
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
 #
@@ -14,16 +15,19 @@
 URL:		http://www.xfce.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	glib2-devel >= 2.2.0
+BuildRequires:	glib2-devel >= 1:2.6.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 1:0.9.0
-Requires:	glib2 >= 2.2.0
+BuildRequires:	xfce4-dev-tools >= 4.3.90.1
+Requires:	glib2 >= 1:2.6.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		xfce_m4_dir %{_datadir}/xfce4/dev-tools/m4macros
+
 %description
 Basic utility non-GUI functions for Xfce.
 
-%description -l pl
+%description -l pl1
 Podstawowe funkcje narzędziowe nie związane z GUI dla Xfce.
 
 %package devel
@@ -31,8 +35,7 @@
 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.2.0
 
 %description devel
 Development files for the libxfce4util library.
@@ -69,11 +72,10 @@
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I %{xfce_m4_dir}
 %{__autoheader}
-# Something's broken
-#%{__automake}
-#%{__autoconf}
+%{__automake}
+%{__autoconf}
 %configure \
 	--with-html-dir=%{_gtkdocdir} \
 	%{!?with_static_libs:--disable-static}
@@ -82,7 +84,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} \
+	install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -119,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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)
 
================================================================

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