rpms/libcgi/devel libcgi-1.0-Makefile.in.patch, NONE, 1.1 libcgi-1.0-cgi.c-hextable.patch, NONE, 1.1 libcgi-1.0-string.c-make_string.patch, NONE, 1.1 libcgi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Jose Pedro Oliveira (jpo)
fedora-extras-commits at redhat.com
Tue Jun 26 18:02:25 UTC 2007
Author: jpo
Update of /cvs/extras/rpms/libcgi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11317/devel
Modified Files:
.cvsignore sources
Added Files:
libcgi-1.0-Makefile.in.patch libcgi-1.0-cgi.c-hextable.patch
libcgi-1.0-string.c-make_string.patch libcgi.spec
Log Message:
Initial import.
libcgi-1.0-Makefile.in.patch:
--- NEW FILE libcgi-1.0-Makefile.in.patch ---
diff -ruN libcgi-1.0-orig/Makefile.in libcgi-1.0/Makefile.in
--- libcgi-1.0-orig/Makefile.in 2003-12-05 11:28:43.000000000 +0000
+++ libcgi-1.0/Makefile.in 2007-01-07 19:46:11.000000000 +0000
@@ -5,22 +5,29 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
-SHAREDOPT = -shared
+SOVERSION = $(SOMAJOR).$(SOMINOR)
+SHAREDOPT = -shared -fPIC -Wl,-soname,libcgi.so.$(SOVERSION)
LIBDIR = $(prefix)/lib
INCDIR = $(prefix)/include
-MANDIR = $(prefix)/man/man3
+MANDIR = $(prefix)/share/man/man3
SHELL = /bin/sh
EXTRA_LIBS =
INCS = -Isrc
-FLAGS = -Wall -fpic
+CFLAGS = @CFLAGS@
OBJS = src/error.o src/cgi.o src/session.o src/base64.o src/md5.o \
src/string.o src/general.o src/list.o src/cookie.o
+SHOBJS=$(OBJS:.o=.sh.o)
-.c.o: $(CC) $(FLAGS) -c $<
+%.o: %.c
+ $(CC) $(CFLAGS) -o $@ -c $<
-all: $(OBJS) src/libcgi.so
+%.sh.o: %.c
+ $(CC) $(CFLAGS) -fPIC -o $@ -c $<
+
+
+all: src/libcgi.so.$(SOVERSION) src/libcgi.a
@echo ""
@echo ""
@@ -42,20 +49,24 @@
@echo ""
-shared: src/libcgi.so
- cp src/libcgi.so $(LIBDIR)
+shared: src/libcgi.so.$(SOVERSION)
+ cp -p src/libcgi.so.$(SOVERSION) $(LIBDIR)
src/libcgi.a: $(OBJS)
$(AR) rc src/libcgi.a $(OBJS)
-src/libcgi.so: src/libcgi.a
- $(CC) $(SHAREDOPT) -o src/libcgi.so $(OBJS) $(EXTRA_LIBS)
+src/libcgi.so.$(SOVERSION): $(SHOBJS)
+ $(CC) $(SHAREDOPT) -o src/libcgi.so.$(SOVERSION) $(SHOBJS) $(EXTRA_LIBS)
-install:
- cp src/libcgi.a $(LIBDIR)
- cp src/libcgi.so $(LIBDIR)
- cp src/cgi.h $(INCDIR)
- cp src/session.h $(INCDIR)
+install: src/libcgi.so.$(SOVERSION) src/libcgi.a
+ [ -d $(DESTDIR)/$(LIBDIR) ] || mkdir -p -m 0755 $(DESTDIR)/$(LIBDIR)
+ cp -p src/libcgi.a $(DESTDIR)$(LIBDIR)
+ cp -p src/libcgi.so.$(SOVERSION) $(DESTDIR)$(LIBDIR)
+ ln -sf libcgi.so.$(SOVERSION) $(DESTDIR)$(LIBDIR)/libcgi.so.$(SOMAJOR)
+ ln -sf libcgi.so.$(SOMAJOR) $(DESTDIR)$(LIBDIR)/libcgi.so
+ [ -d $(DESTDIR)/$(INCDIR) ] || mkdir -p -m 0755 $(DESTDIR)/$(INCDIR)
+ cp -p src/cgi.h $(DESTDIR)$(INCDIR)
+ cp -p src/session.h $(DESTDIR)$(INCDIR)
src/error.o: src/error.c src/error.h
@@ -79,10 +90,10 @@
rm -f $(MANDIR)/libcgi*
install_man:
- cp doc/man/man3/libcgi_base64.3 $(MANDIR)
- cp doc/man/man3/libcgi_cgi.3 $(MANDIR)
- cp doc/man/man3/libcgi_general.3 $(MANDIR)
- cp doc/man/man3/libcgi_string.3 $(MANDIR)
- cp doc/man/man3/libcgi_session.3 $(MANDIR)
- cp doc/man/man3/libcgi_cookie.3 $(MANDIR)
+ [ -d $(DESTDIR)/$(MANDIR) ] || mkdir -p -m 0755 $(DESTDIR)/$(MANDIR)
+ cp -p doc/man/man3/libcgi_cgi.3 $(DESTDIR)$(MANDIR)
+ cp -p doc/man/man3/libcgi_general.3 $(DESTDIR)$(MANDIR)
+ cp -p doc/man/man3/libcgi_string.3 $(DESTDIR)$(MANDIR)
+ cp -p doc/man/man3/libcgi_session.3 $(DESTDIR)$(MANDIR)
+ cp -p doc/man/man3/libcgi_cookie.3 $(DESTDIR)$(MANDIR)
libcgi-1.0-cgi.c-hextable.patch:
--- NEW FILE libcgi-1.0-cgi.c-hextable.patch ---
diff -ruN libcgi-1.0-orig/src/cgi.c libcgi-1.0/src/cgi.c
--- libcgi-1.0-orig/src/cgi.c 2003-12-15 13:30:11.000000000 +0000
+++ libcgi-1.0/src/cgi.c 2007-01-02 00:11:36.000000000 +0000
@@ -336,7 +336,7 @@
hextable['b'] = 11;
hextable['c'] = 12;
hextable['d'] = 13;
- hextable['e'] = 13;
+ hextable['e'] = 14;
hextable['f'] = 15;
hextable['A'] = 10;
hextable['B'] = 11;
libcgi-1.0-string.c-make_string.patch:
--- NEW FILE libcgi-1.0-string.c-make_string.patch ---
diff -ruN libcgi-1.0-orig/src/string.c libcgi-1.0/src/string.c
--- libcgi-1.0-orig/src/string.c 2003-12-15 10:42:26.000000000 +0000
+++ libcgi-1.0/src/string.c 2007-01-02 00:20:51.000000000 +0000
@@ -584,7 +584,7 @@
va_start(ptr, s);
- va_copy(bkp, str);
+ va_copy(bkp, ptr);
len = strlen(s);
while (*str) {
--- NEW FILE libcgi.spec ---
#
# Rebuild option:
#
# --with static creates the -static subpckage
#
%define static 0
%{?_with_static:%define static 1}
%define libcgi_somajor 1
%define libcgi_sominor 0
Name: libcgi
Version: 1.0
Release: 4%{?dist}
Summary: CGI easy as C
Group: System Environment/Libraries
License: LGPL
URL: http://libcgi.sourceforge.net/
Source: http://prdownloads.sourceforge.net/libcgi/libcgi-%{version}.tar.gz
Patch0: libcgi-1.0-Makefile.in.patch
Patch1: libcgi-1.0-cgi.c-hextable.patch
Patch2: libcgi-1.0-string.c-make_string.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
LibCGI is a library written from scratch to easily make CGI applications in C.
%package devel
Summary: Header files and libraries for LibCGI development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
The libcgi-devel package contains the header files and libraries needed
to develop programs that use the LibCGI library.
%if %{static}
%package static
Summary: LibCGI static library
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
The libcgi-static package contains the static library needed
to develop programs that use the LibCGI library.
%endif
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
find examples/ -name "Makefile.am" -delete
%build
%configure
make SOMAJOR=%{libcgi_somajor} \
SOMINOR=%{libcgi_sominor} \
%{?_smp_mflags}
%install
rm -rf ${RPM_BUILD_ROOT}
make SOMAJOR=%{libcgi_somajor} \
SOMINOR=%{libcgi_sominor} \
DESTDIR=$RPM_BUILD_ROOT \
INCDIR=%{_includedir}/%{name} \
install
make DESTDIR=$RPM_BUILD_ROOT install_man
%if ! %{static}
rm -f $RPM_BUILD_ROOT%{_libdir}/libcgi.a
%endif
%clean
rm -rf ${RPM_BUILD_ROOT}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS ChangeLog README THANKS TODO
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%doc doc/html/ examples/
%{_libdir}/*.so
%{_includedir}/%{name}/
%{_mandir}/man3/*.3*
%if %{static}
%files static
%{_libdir}/*.a
%endif
%changelog
* Tue Jun 26 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.0-4
- Install the header files in %%{_includedir}/%%{name}.
* Tue Apr 10 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.0-3
- Don't build the static subpackage by default.
* Sun Jan 21 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.0-2
- Static subpackage.
* Sun Jan 7 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.0-1
- libcgi-1.0-cgi.c-hextable.patch (sourceforge #1024122).
- libcgi-1.0-string.c-make_string.patch (sourceforge #1393115).
- libcgi-1.0-Makefile.in.patch (CFLAGS, DESTDIR, soname).
* Sat Dec 30 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.0-0
- Initial build.
# vim:set ai ts=4 sw=4 sts=4 et:
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcgi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 26 Jun 2007 16:49:18 -0000 1.1
+++ .cvsignore 26 Jun 2007 18:01:48 -0000 1.2
@@ -0,0 +1 @@
+libcgi-1.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcgi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 26 Jun 2007 16:49:18 -0000 1.1
+++ sources 26 Jun 2007 18:01:48 -0000 1.2
@@ -0,0 +1 @@
+110af367081d33c7ed6527a1a60fc274 libcgi-1.0.tar.gz
More information about the fedora-extras-commits
mailing list