rpms/libnet10/devel libnet10-1.0.2a-apivers.patch, NONE, 1.1 libnet10-gcc33.patch, NONE, 1.1 libnet10.spec, 1.12, 1.13 gcc33.patch, 1.1, NONE
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Tue Mar 20 21:55:11 UTC 2007
- Previous message (by thread): rpms/sobby/devel sobby.spec,1.10,1.11
- Next message (by thread): rpms/gocr/devel Makefile, NONE, 1.1 gocr-0.44-man.patch, NONE, 1.1 gocr.spec, NONE, 1.1 sources, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pertusus
Update of /cvs/extras/rpms/libnet10/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14425
Modified Files:
libnet10.spec
Added Files:
libnet10-1.0.2a-apivers.patch libnet10-gcc33.patch
Removed Files:
gcc33.patch
Log Message:
* Tue Aug 29 2006 Patrice Dumas <pertusus at free.fr> - 1.0.2a-12
- rename gcc33.patch to libnet10-gcc33.patch
- patch to have a version parallel installable with libnet (#229297),
correct perms and keep timestamps
- remove Obsoletes and Provides for libnet and libnet-devel (#229297)
libnet10-1.0.2a-apivers.patch:
--- NEW FILE libnet10-1.0.2a-apivers.patch ---
--- Libnet-1.0.2a/libnet-config.in.apivers 2000-12-12 19:33:42.000000000 +0100
+++ Libnet-1.0.2a/libnet-config.in 2007-03-20 22:39:47.000000000 +0100
@@ -6,10 +6,13 @@
# (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
#
# @configure_input@
-
+prefix=@prefix@
+includedir=@includedir@
+api_version='-1.0'
+package="libnet$api_version"
libnet_defines="@LIBNET_CONFIG_DEFINES@"
-libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
+libnet_cflags="@LIBNET_CONFIG_CFLAGS@ -I$includedir/$package"
+libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet$api_version"
usage()
{
--- Libnet-1.0.2a/Makefile.in.apivers 2001-02-05 18:51:41.000000000 +0100
+++ Libnet-1.0.2a/Makefile.in 2007-03-20 22:41:46.000000000 +0100
@@ -17,6 +17,7 @@
INC_PREFIX = @includedir@/
LIB_PREFIX = @libdir@/
MAN_PREFIX = @MAN_PREFIX@
+API_VERSION = -1.0
LIBNET = libnet
LIBPWRITE = libpwrite
@@ -94,22 +95,23 @@
install: libnet
$(ENSUREDIR) $(DESTDIR)$(prefix) 755
$(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755
- $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755
$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
+ $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET)$(API_VERSION) 755
+ $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET)$(API_VERSION)/$(LIBNET) 755
$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
$(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
- $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIB_PREFIX)
+ $(INSTALL_DATA) -m 644 $(LIB) $(DESTDIR)$(LIB_PREFIX)$(LIBNET)$(API_VERSION).a
rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
- cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a
- $(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX)
- $(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- $(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- $(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- $(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- $(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- $(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- $(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
- $(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
+ cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET)$(API_VERSION).a $(LIBPWRITE).a
+ $(INSTALL_DATA) -m 644 $(INCLUDE) $(DESTDIR)$(INC_PREFIX)$(LIBNET)$(API_VERSION)
+ $(INSTALL_DATA) -m 644 $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET)$(API_VERSION)/$(LIBNET)
+ $(INSTALL_DATA) -m 644 $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET)$(API_VERSION)/$(LIBNET)
+ $(INSTALL_DATA) -m 644 $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)$(LIBNET)$(API_VERSION)/$(LIBNET)
+ $(INSTALL_DATA) -m 644 $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)$(API_VERSION)/$(LIBNET)
+ $(INSTALL_DATA) -m 644 $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)$(API_VERSION)/$(LIBNET)
+ $(INSTALL_DATA) -m 644 $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)$(API_VERSION)/$(LIBNET)
+ $(INSTALL_DATA) -m 644 $(MAN) $(DESTDIR)$(MAN_PREFIX)$(LIBNET)$(API_VERSION).3
+ $(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)$(CONFIG)$(API_VERSION)
--- Libnet-1.0.2a/install-sh.apivers 2007-03-20 22:41:55.000000000 +0100
+++ Libnet-1.0.2a/install-sh 2007-03-20 22:42:08.000000000 +0100
@@ -33,7 +33,7 @@
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
+cpprog="${CPPROG-cp -p}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
libnet10-gcc33.patch:
--- NEW FILE libnet10-gcc33.patch ---
--- Libnet-1.0.2a/include/libnet.h.gcc33 2001-02-07 00:19:25.000000000 +0100
+++ Libnet-1.0.2a/include/libnet.h 2003-07-29 22:21:26.000000000 +0200
@@ -84,9 +84,7 @@
#define LIBNET_VERSION "1.0.2a"
#if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
-#error "byte order has not been specified, you'll
-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the
-documentation regarding the libnet-config script."
+#error "byte order has not been specified, you'll need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the documentation regarding the libnet-config script."
#endif
#endif /* __LIBNET_H */
Index: libnet10.spec
===================================================================
RCS file: /cvs/extras/rpms/libnet10/devel/libnet10.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libnet10.spec 29 Aug 2006 11:21:33 -0000 1.12
+++ libnet10.spec 20 Mar 2007 21:54:39 -0000 1.13
@@ -1,17 +1,20 @@
Summary: High-level API (toolkit) to construct and inject network packets
Name: libnet10
Version: 1.0.2a
-Release: 11%{?dist}
+Release: 12%{?dist}
URL: http://www.packetfactory.net/libnet/
License: BSD
Group: System Environment/Libraries
Source0: http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
-Patch0: gcc33.patch
+Patch0: libnet10-gcc33.patch
+# add an api version prefix, keep timestamps and correct permissions
+Patch1: libnet10-1.0.2a-apivers.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: libnet < 1.1.0
-Obsoletes: libnet-devel < 1.1.0
-Provides: libnet = %{version}-%{release}
-Provides: libnet-devel = %{version}-%{release}
+#Obsoletes: libnet < 1.1.0
+#Obsoletes: libnet-devel < 1.1.0
+#Provides: libnet = %{version}-%{release}
+#Provides: libnet-devel = %{version}-%{release}
+Provides: libnet10-devel = %{version}-%{release}
%description
Libnet is a high-level API (toolkit) allowing the application programmer to
@@ -26,12 +29,14 @@
more time, more complex programs can be written (Traceroute and ping were
easily rewritten using libnet and libpcap).
-
+This package contains an old and deprecated version of libnet. You need
+it only if the software you are using hasn't been updated to work with
+the newer version and the newer API.
%prep
%setup -q -n Libnet-%{version}
-%patch0 -p1
-
+%patch0 -p1 -b .gcc33
+%patch1 -p1 -b .apivers
%build
@@ -39,37 +44,35 @@
make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"
-
%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3/
mv ${RPM_BUILD_ROOT}/usr/man/man3/* ${RPM_BUILD_ROOT}%{_mandir}/man3/
-chmod 0644 ${RPM_BUILD_ROOT}%{_mandir}/man3/*
-chmod 0644 ${RPM_BUILD_ROOT}%{_libdir}/*.*
-chmod 0644 ${RPM_BUILD_ROOT}%{_includedir}/*.*
-chmod 0644 ${RPM_BUILD_ROOT}%{_includedir}/libnet/*.*
-
%clean
rm -rf ${RPM_BUILD_ROOT}
-
%files
%defattr(-,root,root,-)
%doc README doc/COPYING doc/CHANGELOG
-%{_bindir}/*
-%{_includedir}/libnet
-%{_includedir}/*.h
-%{_libdir}/*
-%{_mandir}/man3/*
-
+%{_bindir}/libnet-config-1.0
+%{_includedir}/libnet-1.0/
+%{_libdir}/libnet-1.0.a
+%{_libdir}/libpwrite.a
+%{_mandir}/man3/libnet-1.0.3*
%changelog
+* Tue Aug 29 2006 Patrice Dumas <pertusus at free.fr> - 1.0.2a-12
+- rename gcc33.patch to libnet10-gcc33.patch
+- patch to have a version parallel installable with libnet (#229297),
+ correct perms and keep timestamps
+- remove Obsoletes and Provides for libnet and libnet-devel (#229297)
+
* Tue Aug 29 2006 Patrice Dumas <pertusus at free.fr> - 1.0.2a-11
- rebuild for FC6
--- gcc33.patch DELETED ---
- Previous message (by thread): rpms/sobby/devel sobby.spec,1.10,1.11
- Next message (by thread): rpms/gocr/devel Makefile, NONE, 1.1 gocr-0.44-man.patch, NONE, 1.1 gocr.spec, NONE, 1.1 sources, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list