Author: qboosh                       Date: Fri Feb 17 21:35:09 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups (mostly Provides stuff)

---- Files affected:
SPECS:
   libpcap_mmap.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/libpcap_mmap.spec
diff -u SPECS/libpcap_mmap.spec:1.3 SPECS/libpcap_mmap.spec:1.4
--- SPECS/libpcap_mmap.spec:1.3 Fri Feb 17 22:18:49 2006
+++ SPECS/libpcap_mmap.spec     Fri Feb 17 22:35:04 2006
@@ -7,10 +7,9 @@
 Summary(uk):   îÁÄÁ¤ ÄĎÓÔŐĐ ÄĎ ÍĹŇĹÖĹ×ÉČ ŚÎÔĹŇĆĹĘÓŚ× × promiscuous-ŇĹÖÉÍŚ
 %define                _name   libpcap
 %define                _ver    0.9.3
-Name:          %{_name}_mmap
+Name:          libpcap_mmap
 Version:       0.9.20050810b
 Release:       1
-#Epoch:                0
 License:       BSD
 Group:         Libraries
 Source0:       http://public.lanl.gov/cpw/%{_name}-%{version}.tar.gz
@@ -19,14 +18,14 @@
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: flex
-# beware of tar 1.13.9[12] madness (tarball contains libpcap-0.8.3/./* paths)
-BuildRequires: tar >= 1:1.13.93
-Obsoletes:     %{_name}0
-Obsoletes:     %{_name}
-Provides:      %{_name}
-Provides:      %{_name}.so.0
-Provides:      %{_name}.so.%{_ver}
-Provides:      %{_name} = 2:0.9.4-1
+Provides:      libpcap = 2:0.9.4-1
+%ifarch %{x8664} ia64 ppc64 s390x sparc64
+Provides:      libpcap.so.0()(64bit)
+%else
+Provides:      libpcap.so.0
+%endif
+Obsoletes:     libpcap0
+Obsoletes:     libpcap
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,7 +36,7 @@
 system-independent API that is used by several applications, including
 tcpdump and arpwatch.
 
-A libpcap version which supports MMAP mode on the linux kernel 
+This libpcap version which supports MMAP mode on the Linux kernel
 2.[46].x.
 
 %description -l es
@@ -52,7 +51,7 @@
 libpcap to niezależny od systemu interfejs do przechwytywania pakietów
 z poziomu użytkownika.
 
-Wersja ta obsługuje tryb MMAP obsługiwany przez kernele 2.4 i 2.6
+Wersja ta obsługuje tryb MMAP obsługiwany przez jądra 2.4.x i 2.6.x.
 
 %description -l pt_BR
 A libpcap é uma interface independente de sistema para captura de
@@ -84,10 +83,10 @@
 Summary(ru):   čĹÄĹŇŮ É ÂÉÂĚÉĎÔĹËÉ ĐŇĎÇŇÁÍÉÓÔÁ ÄĚŃ libpcap
 Summary(uk):   čĹÄĹŇÉ ÔÁ ÂŚÂĚŚĎÔĹËÉ ĐŇĎÇŇÁÍŚÓÔÁ ÄĚŃ libpcap
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Provides:      %{_name}-devel = 2:0.9.4-1
-Obsoletes:     %{_name}0-devel
-Obsoletes:     %{_name}-devel
+Requires:      %{name} = %{version}-%{release}
+Provides:      libpcap-devel = 2:0.9.4-1
+Obsoletes:     libpcap0-devel
+Obsoletes:     libpcap-devel
 
 %description devel
 Libpcap provides a portable framework for low-level network
@@ -125,9 +124,9 @@
 Summary(ru):   óÔÁÔÉŢĹÓËÁŃ ÂÉÂĚÉĎÔĹËÁ libpcap
 Summary(uk):   óÔÁÔÉŢÎÁ ÂŚÂĚŚĎÔĹËÁ libpcap
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
-Provides:      %{_name}-static = 2:0.9.4-1
-Obsoletes:     %{_name}-static
+Requires:      %{name}-devel = %{version}-%{release}
+Provides:      libpcap-static = 2:0.9.4-1
+Obsoletes:     libpcap-static
 
 %description static
 Libpcap provides a portable framework for low-level network
@@ -156,46 +155,44 @@
 
 %prep
 %setup -q -n %{_name}-%{version}
-#%patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 %configure \
-       --enable-shared \
-       --prefix=%{_prefix}
+       --enable-shared
        
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-mkdir -p $RPM_BUILD_ROOT/%{_includedir}
-mkdir -p $RPM_BUILD_ROOT/%{_includedir}/net
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3
-mkdir -p $RPM_BUILD_ROOT/%{_docdir}
-
-install pcap.3                 $RPM_BUILD_ROOT/%{_mandir}/man3
-
-install pcap.h                 $RPM_BUILD_ROOT/%{_includedir}
-install pcap-bpf.h     $RPM_BUILD_ROOT/%{_includedir}/net
-install pcap-int.h     $RPM_BUILD_ROOT/%{_includedir}
-install pcap-namedb.h  $RPM_BUILD_ROOT/%{_includedir}
-install pcap-septel.h  $RPM_BUILD_ROOT/%{_includedir}
-install pcap-dag.h     $RPM_BUILD_ROOT/%{_includedir}
-install pcap-ring.h    $RPM_BUILD_ROOT/%{_includedir}
+install -d $RPM_BUILD_ROOT%{_libdir}
+install -d $RPM_BUILD_ROOT%{_includedir}
+install -d $RPM_BUILD_ROOT%{_includedir}/net
+install -d $RPM_BUILD_ROOT%{_mandir}/man3
+install -d $RPM_BUILD_ROOT%{_docdir}
+
+install pcap.3                 $RPM_BUILD_ROOT%{_mandir}/man3
+
+install pcap.h                 $RPM_BUILD_ROOT%{_includedir}
+install pcap-bpf.h     $RPM_BUILD_ROOT%{_includedir}/net
+install pcap-int.h     $RPM_BUILD_ROOT%{_includedir}
+install pcap-namedb.h  $RPM_BUILD_ROOT%{_includedir}
+install pcap-septel.h  $RPM_BUILD_ROOT%{_includedir}
+install pcap-dag.h     $RPM_BUILD_ROOT%{_includedir}
+install pcap-ring.h    $RPM_BUILD_ROOT%{_includedir}
 
 # some packages want it... but sanitize somehow
 # (don't depend on HAVE_{STRLCPY,SNPRINTF,VSNPRINTF} defines)
 sed -e '262,268d;271,280d' pcap-int.h > 
$RPM_BUILD_ROOT%{_includedir}/pcap-int.h
 
-#install doc/pcap.*    $RPM_BUILD_ROOT/%{_docdir}
+#install doc/pcap.*    $RPM_BUILD_ROOT%{_docdir}
 
-install .libs/%{_name}-%{_ver}.so      $RPM_BUILD_ROOT/%{_libdir}
-install .libs/%{_name}.a               $RPM_BUILD_ROOT/%{_libdir}
+# XXX: change SONAME and STOP THIS MADNESS!
+install .libs/%{_name}-%{_ver}.so      $RPM_BUILD_ROOT%{_libdir}
+install .libs/%{_name}.a               $RPM_BUILD_ROOT%{_libdir}
 
-cd $RPM_BUILD_ROOT/%{_libdir}
+cd $RPM_BUILD_ROOT%{_libdir}
 
 mv -f %{_name}-%{_ver}.so      %{_name}.so.%{_ver}
 ln -s %{_name}.so.%{_ver}      %{_name}.so.0
@@ -234,6 +231,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/02/17 21:35:04  qboosh
+- cleanups (mostly Provides stuff)
+
 Revision 1.3  2006/02/17 21:18:49  mguevara
 - more provides for easy libpcap replacement
 
@@ -245,4 +245,3 @@
   way, implements shared memory ring buffer to speed up capture of data.
   Look at the following URL for more info:
   http://www.snort.org/docs/snort_htmanuals/htmanual_2.4/rc1/node27.html
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libpcap_mmap.spec?r1=1.3&r2=1.4&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to