rpms/libpcap/F-7 libpcap-0.9.7-shared.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libpcap.spec, 1.1, 1.2 sources, 1.2, 1.3 libpcap-shared.patch, 1.1, NONE

Miroslav Lichvar (mlichvar) fedora-extras-commits at redhat.com
Tue Jul 31 14:21:32 UTC 2007


Author: mlichvar

Update of /cvs/pkgs/rpms/libpcap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18391

Modified Files:
	.cvsignore libpcap.spec sources 
Added Files:
	libpcap-0.9.7-shared.patch 
Removed Files:
	libpcap-shared.patch 
Log Message:
- update to 0.9.7


libpcap-0.9.7-shared.patch:

--- NEW FILE libpcap-0.9.7-shared.patch ---
--- libpcap-0.9.7/Makefile.in.shared	2007-07-24 04:35:15.000000000 +0200
+++ libpcap-0.9.7/Makefile.in	2007-07-24 14:52:43.000000000 +0200
@@ -22,6 +22,7 @@
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
 #
+VERSION := $(shell cat VERSION)
 
 # Top level hierarchy
 prefix = @prefix@
@@ -97,9 +98,14 @@ TAGHDR = \
 TAGFILES = \
 	$(SRC) $(HDR) $(TAGHDR)
 
-CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
 
-all: libpcap.a
+
+CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so.$(VERSION)
+
+all: libpcap.a libpcap.so.$(VERSION)
+
+libpcap.so.$(VERSION): $(OBJ)
+	gcc -shared -Wl,-soname -Wl,libpcap.so.$(SOVERSION) -o libpcap.so.$(VERSION) $(OBJ) 
 
 libpcap.a: $(OBJ)
 	@rm -f $@
@@ -172,10 +178,13 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
 bpf_filter.o: bpf_filter.c
 	$(CC) $(CFLAGS) -c bpf_filter.c
 
-install: libpcap.a 
+install: libpcap.a libpcap.so.$(VERSION)
 	[ -d $(DESTDIR)$(libdir) ] || \
 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
 	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
+	$(INSTALL_PROGRAM) libpcap.so.$(VERSION)  $(DESTDIR)$(libdir)/libpcap.so.$(VERSION)
+	ln -sf libpcap.so.$(VERSION) $(DESTDIR)$(libdir)/libpcap.so.$(SOVERSION)
+	ln -sf libpcap.so.$(SOVERSION) $(DESTDIR)$(libdir)/libpcap.so
 	$(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
 	[ -d $(DESTDIR)$(includedir) ] || \
 	    (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Nov 2006 11:40:49 -0000	1.2
+++ .cvsignore	31 Jul 2007 14:20:59 -0000	1.3
@@ -1 +1 @@
-libpcap-0.9.5.tar.gz
+libpcap-0.9.7.tar.gz


Index: libpcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/F-7/libpcap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libpcap.spec	28 Nov 2006 11:40:49 -0000	1.1
+++ libpcap.spec	31 Jul 2007 14:20:59 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name: libpcap
 Epoch: 14
-Version: 0.9.5
+Version: 0.9.7
 Release: 1%{?dist}
 Summary: A system-independent interface for user-level packet capture
 Group: Development/Libraries
@@ -13,7 +13,7 @@
 
 Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 Patch1: libpcap-man.patch
-Patch2: libpcap-shared.patch
+Patch2: libpcap-0.9.7-shared.patch
 Patch3: libpcap-s390.patch
 Patch4: libpcap-0.8.3-ppp.patch
 
@@ -55,7 +55,7 @@
 %patch4 -p0 -b .ppp
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)"
 %configure --enable-ipv6
 make SOVERSION=%{pcap_sover}
 
@@ -84,6 +84,9 @@
 %{_mandir}/man3/pcap.3*
 
 %changelog
+* Tue Jul 31 2007 Miroslav Lichvar <mlichvar at redhat.com> 14:0.9.7-1
+- update to 0.9.7
+
 * Tue Nov 28 2006 Miroslav Lichvar <mlichvar at redhat.com> 14:0.9.5-1
 - split from tcpdump package (#193657)
 - update to 0.9.5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Nov 2006 11:40:49 -0000	1.2
+++ sources	31 Jul 2007 14:20:59 -0000	1.3
@@ -1 +1 @@
-b0626ad59004fe5767ddd2ce743a2271  libpcap-0.9.5.tar.gz
+77bc1f1de0de8488c7cb28e4753b9603  libpcap-0.9.7.tar.gz


--- libpcap-shared.patch DELETED ---




More information about the fedora-extras-commits mailing list