packages: libgalago/libgalago.spec, libgalago/pkgconfig.patch (NEW) - fix p...

[wiget]

Author: wiget                        Date: Wed Apr  6 12:48:24 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix pkgconfig file on x86_64
- drop glib_gettextize call (plain gettext used)
- some BR fixes
- drop libtool file
- more verbose %file
- rel. 2

---- Files affected:
packages/libgalago:
   libgalago.spec (1.12 -> 1.13) , pkgconfig.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libgalago/libgalago.spec
diff -u packages/libgalago/libgalago.spec:1.12 packages/libgalago/libgalago.spec:1.13
--- packages/libgalago/libgalago.spec:1.12	Sat Nov 28 02:35:26 2009
+++ packages/libgalago/libgalago.spec	Wed Apr  6 14:48:19 2011
@@ -3,17 +3,19 @@
 Summary(pl.UTF-8):	Biblioteka Galago
 Name:		libgalago
 Version:	0.5.2
-Release:	1
+Release:	2
 License:	LGPL v2.1+
 Group:		Applications/System
 Source0:	http://www.galago-project.org/files/releases/source/libgalago/%{name}-%{version}.tar.bz2
 # Source0-md5:	47f27f58dd8b0e46d9d2e037c51063ed
+Patch0:		pkgconfig.patch
 URL:		http://www.galago-project.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	dbus-devel >= 0.71
 BuildRequires:	dbus-glib-devel >= 0.71
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-devel >= 0.18.1
 BuildRequires:	glib2-devel >= 1:2.12.1
 BuildRequires:	gtk-doc >= 1.7
 BuildRequires:	libtool
@@ -70,15 +72,14 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__glib_gettextize}
+%{__gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
-# ??? glib-gettextize already called before
-%{__gettextize}
 %{__automake}
 
 %configure \
@@ -94,7 +95,8 @@
 
 install -d $RPM_BUILD_ROOT%{_libdir}/galago
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/autopackage
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/autopackage
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name}
 
@@ -107,19 +109,19 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libgalago.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgalago.so.3
 %dir %{_libdir}/galago
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_pkgconfigdir}/*
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libgalago.so
+%{_pkgconfigdir}/libgalago.pc
+%{_includedir}/libgalago
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgalago.a
 
 %files apidocs
 %defattr(644,root,root,755)
@@ -131,6 +133,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2011/04/06 12:48:19  wiget
+- fix pkgconfig file on x86_64
+- drop glib_gettextize call (plain gettext used)
+- some BR fixes
+- drop libtool file
+- more verbose %file
+- rel. 2
+
 Revision 1.12  2009/11/28 01:35:26  sparky
 - BR: docbook-dtd412-xml
 

================================================================
Index: packages/libgalago/pkgconfig.patch
diff -u /dev/null packages/libgalago/pkgconfig.patch:1.1
--- /dev/null	Wed Apr  6 14:48:24 2011
+++ packages/libgalago/pkgconfig.patch	Wed Apr  6 14:48:19 2011
@@ -0,0 +1,13 @@
+--- libgalago-0.5.2/libgalago.pc.in.wiget	2011-04-06 14:41:44.841195237 +0200
++++ libgalago-0.5.2/libgalago.pc.in	2011-04-06 14:42:02.111822872 +0200
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ Name: libgalago
+ Description: Galago Association/Presence Communication Library
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libgalago/libgalago.spec?r1=1.12&r2=1.13&f=u