packages: libgksuui/libgksuui.spec, libgksuui/gettext.patch (NEW), libgksuu...

[wiget]

Author: wiget                        Date: Wed Apr  6 16:41:59 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix linking with gtk
- fix gettext macro
- move docs do separate subpackage
- drop libtool file
- more verbose %files
- rel. 8

---- Files affected:
packages/libgksuui:
   libgksuui.spec (1.15 -> 1.16) , gettext.patch (NONE -> 1.1)  (NEW), link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libgksuui/libgksuui.spec
diff -u packages/libgksuui/libgksuui.spec:1.15 packages/libgksuui/libgksuui.spec:1.16
--- packages/libgksuui/libgksuui.spec:1.15	Fri Nov 19 10:53:51 2010
+++ packages/libgksuui/libgksuui.spec	Wed Apr  6 18:41:54 2011
@@ -3,15 +3,21 @@
 Summary(pl.UTF-8):	Biblioteka libgksuui
 Name:		libgksuui
 Version:	1.0.7
-Release:	7
+Release:	8
 License:	LGPL
 Group:		Libraries
 Source0:	http://people.debian.org/~kov/gksu/libgksuui1.0/%{name}1.0-%{version}.tar.gz
 # Source0-md5:	c22648bbb17aa942a97cc325e3a85752
+Patch0:		link.patch
+Patch1:		gettext.patch
 URL:		http://www.nongnu.org/gksu/
+BuildRequires:	autoconf >= 2.57
+BuildRequires:	automake
 BuildRequires:	docbook-dtd412-xml
+BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel >= 2:2.10.1
 BuildRequires:	gtk-doc >= 1.0
+BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,10 +52,29 @@
 %description static -l pl.UTF-8
 Statyczna biblioteka libgksuui.
 
+%package apidocs
+Summary:	libgksuui API documentation
+Summary(pl.UTF-8):	Dokumentacja API biblioteki libgksuui
+Group:		Documentation
+
+%description apidocs
+API and internal documentation for libgksuui library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki libgksuui.
+
 %prep
 %setup -q -n %{name}1.0-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--enable-gtk-doc \
 	--with-html-dir=%{_gtkdocdir}
@@ -61,6 +86,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %find_lang %{name}1.0
 
 %clean
@@ -72,20 +99,23 @@
 %files -f %{name}1.0.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%{_datadir}/%{name}*
+%attr(755,root,root) %{_libdir}/libgksuui1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgksuui1.0.so.1
+%{_datadir}/libgksuui1.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/%{name}*
-%{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/%{name}*
+%attr(755,root,root) %{_libdir}/libgksuui1.0.so
+%{_includedir}/libgksuui1.0
+%{_pkgconfigdir}/libgksuui1.0.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgksuui1.0.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/libgksuui1.0
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -93,6 +123,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2011/04/06 16:41:54  wiget
+- fix linking with gtk
+- fix gettext macro
+- move docs do separate subpackage
+- drop libtool file
+- more verbose %files
+- rel. 8
+
 Revision 1.15  2010/11/19 09:53:51  hawk
 - release 7
 

================================================================
Index: packages/libgksuui/gettext.patch
diff -u /dev/null packages/libgksuui/gettext.patch:1.1
--- /dev/null	Wed Apr  6 18:41:59 2011
+++ packages/libgksuui/gettext.patch	Wed Apr  6 18:41:54 2011
@@ -0,0 +1,21 @@
+--- libgksuui1.0-1.0.7/configure.ac.wiget	2011-04-06 16:18:40.011488426 +0200
++++ libgksuui1.0-1.0.7/configure.ac	2011-04-06 16:18:57.858875677 +0200
+@@ -14,6 +14,7 @@ AC_DEFINE(PACKAGE, AC_PACKAGE_NAME, [pac
+ AC_DEFINE(VERSION, AC_PACKAGE_VERSION, [package version])
+ 
+ # Checks for programs.
++AC_USE_SYSTEM_EXTENSIONS
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
+--- libgksuui1.0-1.0.7/libgksuui/defines.h.wiget	2011-04-06 16:25:17.990857503 +0200
++++ libgksuui1.0-1.0.7/libgksuui/defines.h	2011-04-06 16:25:28.127931759 +0200
+@@ -23,7 +23,7 @@
+ 
+ /* Gettext */
+ #include <libintl.h>
+-#define _(String) dgettext (PACKAGE, String)
++#define _(String) dgettext (PACKAGE_NAME, String)
+ #define gettext_noop(String) (String)
+ #ifndef HAVE_GNOME
+ #define N_(String) gettext_noop (String)

================================================================
Index: packages/libgksuui/link.patch
diff -u /dev/null packages/libgksuui/link.patch:1.1
--- /dev/null	Wed Apr  6 18:41:59 2011
+++ packages/libgksuui/link.patch	Wed Apr  6 18:41:54 2011
@@ -0,0 +1,11 @@
+--- libgksuui1.0-1.0.7/libgksuui/Makefile.am.wiget	2011-04-06 16:10:49.182818410 +0200
++++ libgksuui1.0-1.0.7/libgksuui/Makefile.am	2011-04-06 16:12:13.312786848 +0200
+@@ -21,7 +21,7 @@ pkgconfig_DATA = $(PACKAGE).pc
+ noinst_PROGRAMS = test-gksuui
+ test_gksuui_SOURCES = test-gksuui.c
+ test_gksuui_LDADD = $(PACKAGE).la
+-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
++test_gksuui_LDFLAGS = `pkg-config --libs gtk+-x11-2.0`
+ 
+ EXTRA_DIST = libgksuui.ver
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libgksuui/libgksuui.spec?r1=1.15&r2=1.16&f=u