[packages/giblib] - added pc patch (don't store LDFLAGS in pkg-config --libs), package .pc file - verbose bin, lib fil

qboosh qboosh at pld-linux.org
Sun Jan 12 09:21:49 CET 2014


commit bf604e83863904d1bb24c897ceb8a770c53404a8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 12 09:22:40 2014 +0100

    - added pc patch (don't store LDFLAGS in pkg-config --libs), package .pc file
    - verbose bin, lib files, cleanup

 giblib-pc.patch | 10 ++++++++++
 giblib.spec     | 41 ++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 17 deletions(-)
---
diff --git a/giblib.spec b/giblib.spec
index 8118f5d..174dc1c 100644
--- a/giblib.spec
+++ b/giblib.spec
@@ -3,19 +3,19 @@ Summary(pl.UTF-8):	Biblioteka narzędziowa używana w wielu aplikacjach LinuxBri
 Name:		giblib
 Version:	1.2.4
 Release:	3
-License:	BSD-like
+License:	MIT
 Group:		X11/Libraries
 Source0:	http://www.linuxbrit.co.uk/downloads/%{name}-%{version}.tar.gz
 # Source0-md5:	c810ef5389baf24882a1caca2954385e
+Patch0:		%{name}-pc.patch
 URL:		http://www.linuxbrit.co.uk/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	imlib2-devel
-BuildRequires:	libltdl-devel
+BuildRequires:	imlib2-devel >= 1.0.0
 BuildRequires:	libtool
+Requires:	imlib2 >= 1.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
 giblib is a utility library used by many of the applications LinuxBrit
 writes. It incorporates doubly linked lists, some string functions,
@@ -26,8 +26,8 @@ wraps imlib2's context API to simplify calls.
 
 %description -l pl.UTF-8
 giblib to biblioteka narzędziowa używana w wielu aplikacjach autorstwa
-LinuxBrit. Zawiera dwukierunkowe listy, funkcje do obsługi ciągów
-znaków i wrapper do Imlib2. Wrapper robi dwie rzeczy: dostęp do styli
+LinuxBrit. Zawiera dwukierunkowe listy, funkcje do obsługi łańcuchów
+znaków i wrapper dla Imlib2. Wrapper robi dwie rzeczy: dostęp do styli
 fontów, które mogą być wczytywane z plików, zapisywane do plików lub
 definiowane dynamicznie poprzez API, oraz upraszcza wywołania
 niektórych funkcji Imlib2.
@@ -37,6 +37,7 @@ Summary:	Header files for giblib
 Summary(pl.UTF-8):	Pliki nagłówkowe giblib
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	imlib2-devel >= 1.0.0
 
 %description devel
 Header files for giblib.
@@ -58,12 +59,13 @@ Statyczna wersja biblioteki giblib.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure
 
@@ -72,7 +74,11 @@ rm -f missing
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,17 +88,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.1
+%doc AUTHORS COPYING ChangeLog
+%attr(755,root,root) %{_libdir}/libgiblib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgiblib.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/%{name}
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_bindir}/giblib-config
+%attr(755,root,root) %{_libdir}/libgiblib.so
+%{_libdir}/libgiblib.la
+%{_includedir}/giblib
+%{_pkgconfigdir}/giblib.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgiblib.a
diff --git a/giblib-pc.patch b/giblib-pc.patch
new file mode 100644
index 0000000..4cfd87e
--- /dev/null
+++ b/giblib-pc.patch
@@ -0,0 +1,10 @@
+--- giblib-1.2.4/giblib.pc.in.orig	2004-09-04 16:40:40.000000000 +0200
++++ giblib-1.2.4/giblib.pc.in	2014-01-12 09:14:49.440333813 +0100
+@@ -6,6 +6,6 @@
+ Name: giblib
+ Description: wrapper library for imlib2, and other stuff
+ Version: @VERSION@
+-Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@
++Libs: -L${libdir} -lgiblib @IMLIB_LIBS@
+ Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/giblib.git/commitdiff/bf604e83863904d1bb24c897ceb8a770c53404a8



More information about the pld-cvs-commit mailing list