+++ /dev/null
---- cgilib-0.5/cgitest.c.orig 1999-08-17 15:21:20.000000000 +0200
-+++ cgilib-0.5/cgitest.c 2003-04-20 10:34:16.000000000 +0200
-@@ -113,7 +113,7 @@
- cgiHeader();
- printf ("<html>\n<head><title>cgilib</title></title>\n\n<body bgcolor=\"#ffffff\">\n");
- printf ("<h1><a href=\"%s\">cgilib</a></h1>\n", URL);
-- printf ("<h3>Cookie "Library" set</h3>\n");
-+ printf ("<h3>Cookie \"Library\" set</h3>\n");
- printf ("<p><br><p><br><a href=\"/cgi-bin/cgitest\">Test</a><p>\n");
- printf ("<p><br><p><br><a href=\"/cgi-bin/cgitest/redirect\">Redirect</a><p>\n");
- printf ("<p><br><p><br><a href=\"/cgi-bin/cgitest/listall\">List Everything</a><p>\n");
+++ /dev/null
-diff -Nur cgilib-0.5.orig/Makefile cgilib-0.5/Makefile
---- cgilib-0.5.orig/Makefile 1999-08-20 23:14:07.000000000 +0200
-+++ cgilib-0.5/Makefile 2003-04-20 10:25:24.000000000 +0200
-@@ -15,24 +15,35 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
-
- CFLAGS = -I. -Wall -O2 -g
--LDFLAGS = -L.
--LIBS = -lcgi
--
--OBJS = cgi.o cookies.o
--
--libcgi.a: $(OBJS)
-- ar rc $@ $^
--
--cgitest: cgitest.o libcgi.a
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
--
--jumpto: jumpto.o libcgi.a
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
--
--all: libcgi.a cgitest jumpto
--
--install: cgitest
-- install -m 755 cgitest /usr/lib/cgi-bin
-+# used to be libcgi, but conflicted with cgilib++
-+LIBS = libcgic.la
-+LIBDIR = /usr/lib
-+INCLUDEDIR = /usr/include/cgilibc
-+MANDIR = /usr/share/man
-+
-+OBJS = cgi.lo cookies.lo
-+HEADERS = cgi.h
-+
-+all: $(LIBS) cgitest jumpto
-+
-+libcgic.la: $(OBJS)
-+ libtool --mode=link $(CC) -o libcgic.la $(OBJS) -rpath $(LIBDIR)
-+
-+cgitest: cgitest.o $(LIBS)
-+ libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-+
-+jumpto: jumpto.o $(LIBS)
-+ libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-+
-+%.lo: %.c
-+ libtool --mode=compile $(CC) $(CFLAGS) -o $@ -c $<
-+
-+install: libcgic.la
-+ install -d $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(MANDIR)/man{3,5}
-+ libtool --mode=install install libcgic.la $(DESTDIR)$(LIBDIR)
-+ install $(HEADERS) $(DESTDIR)$(INCLUDEDIR)
-+ install *.3 $(DESTDIR)$(MANDIR)/man3
-+ install *.5 $(DESTDIR)$(MANDIR)/man5
-
- clean:
- rm -f cgitest cgitest.o jumpto jumpto.o libcgi.a $(OBJS) *.[35].html
--- /dev/null
+--- 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
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)
%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
%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
projects / packages / cgilibc.git / commitdiff