packages: cgilibc/cgilibc.spec, cgilibc/cgilibc-suffix.patch (NEW), cgilibc...

[qboosh]

Author: qboosh                       Date: Sun Nov 14 06:11:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new URLs
- updated to 0.7 (new soname)
- removed obsolete shared,fix patches
- added suffix patch to keep "c" suffix (libcgic)

---- Files affected:
packages/cgilibc:
   cgilibc.spec (1.9 -> 1.10) , cgilibc-suffix.patch (NONE -> 1.1)  (NEW), cgilibc-fix.patch (1.1 -> NONE)  (REMOVED), cgilibc-shared.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/cgilibc/cgilibc.spec
diff -u packages/cgilibc/cgilibc.spec:1.9 packages/cgilibc/cgilibc.spec:1.10
--- packages/cgilibc/cgilibc.spec:1.9	Mon Jul 28 00:15:11 2008
+++ packages/cgilibc/cgilibc.spec	Sun Nov 14 07:11:25 2010
@@ -4,14 +4,16 @@
 Summary:	Common Gateway Interface library
 Summary(pl.UTF-8):	Biblioteka CGI (Common Gateway Interface)
 Name:		cgilibc
-Version:	0.5
-Release:	3
-License:	GPL
+Version:	0.7
+Release:	1
+License:	GPL v2+
 Group:		Libraries
-Source0:	ftp://ibiblio.org/pub/Linux/libs/%{realname}-%{version}.tar.gz
-# Source0-md5:	5187ba11b2ec165b6c5b6629087733b0
-Patch0:		%{name}-shared.patch
-Patch1:		%{name}-fix.patch
+Source0:	http://www.infodrom.org/projects/cgilib/download/%{realname}-%{version}.tar.gz
+# Source0-md5:	2c7053f58dfb06f7a80a112797ed7e86
+Patch0:		%{name}-suffix.patch
+URL:		http://www.infodrom.org/projects/cgilib/
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake
 BuildRequires:	libtool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,20 +57,25 @@
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
-%{__make} \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -Wall -I." \
-	LIBDIR=%{_libdir}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	LIBDIR=%{_libdir}
+	DESTDIR=$RPM_BUILD_ROOT
+
+# examples - include as source, not binaries
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{cgitest,jumpto}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -p cgitest.c jumpto.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,19 +85,22 @@
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES CREDITS cookies.txt readme
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%doc AUTHORS ChangeLog README cookies.txt
+%attr(755,root,root) %{_libdir}/libcgic.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcgic.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libcgic.so
+%{_libdir}/libcgic.la
 %{_includedir}/cgilibc
-%{_mandir}/man[35]/*
+%{_mandir}/man3/cgi*.3*
+%{_mandir}/man5/cgi.5*
+%{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libcgic.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -98,6 +108,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2010/11/14 06:11:25  qboosh
+- new URLs
+- updated to 0.7 (new soname)
+- removed obsolete shared,fix patches
+- added suffix patch to keep "c" suffix (libcgic)
+
 Revision 1.9  2008/07/27 22:15:11  arekm
 - release 3
 
@@ -124,4 +140,3 @@
 
 Revision 1.1  2003/04/20 10:50:49  qboosh
 - new - renamed, patched to build as shared library
-

================================================================
Index: packages/cgilibc/cgilibc-suffix.patch
diff -u /dev/null packages/cgilibc/cgilibc-suffix.patch:1.1
--- /dev/null	Sun Nov 14 07:11:30 2010
+++ packages/cgilibc/cgilibc-suffix.patch	Sun Nov 14 07:11:25 2010
@@ -0,0 +1,29 @@
+--- cgilib-0.7/Makefile.am.orig	2009-02-07 14:31:43.000000000 +0100
++++ cgilib-0.7/Makefile.am	2010-11-14 06:51:59.223097423 +0100
+@@ -15,19 +15,20 @@
+ #   along with this program; if not, write to the Free Software Foundation
+ #   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-lib_LTLIBRARIES = libcgi.la
++lib_LTLIBRARIES = libcgic.la
+ 
+-libcgi_la_SOURCES = cgi.c cookies.c aux.c
+-libcgi_la_LDFLAGS = -version-info @SO_VERSION@
++libcgic_la_SOURCES = cgi.c cookies.c aux.c
++libcgic_la_LDFLAGS = -version-info @SO_VERSION@
+ 
+ bin_PROGRAMS = cgitest jumpto
+ 
+ cgitest_SOURCES = cgitest.c
+-cgitest_LDADD = libcgi.la
++cgitest_LDADD = libcgic.la
+ 
+ jumpto_SOURCES = cgitest.c
+-jumpto_LDADD = libcgi.la
++jumpto_LDADD = libcgic.la
+ 
+-include_HEADERS = aux.h cgi.h
++cgiincludedir = $(includedir)/cgilibc
++cgiinclude_HEADERS = aux.h cgi.h
+ 
+ man_MANS =  cgi.5 cgiDebug.3 cgiEscape.3 cgiFree.3 cgiFreeList.3 cgiGetCookie.3 cgiGetCookies.3 cgiGetFile.3 cgiGetFiles.3 cgiGetValue.3 cgiGetVariables.3 cgiHeader.3 cgiInit.3 cgiRedirect.3 cgiSetHeader.3 cgiSetType.3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cgilibc/cgilibc.spec?r1=1.9&r2=1.10&f=u