Browse Source

* tcpdump: rebuild
* libpcap: rebuild; remove *.a file


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5945 ec354946-7b23-47d6-9f5a-488ba84defc7

shaolin 12 years ago
parent
commit
f4e8026f84
2 changed files with 24 additions and 18 deletions
  1. 10 7
      lib/libp/libpcap/libpcap-vl.spec
  2. 14 11
      t/tcpdump/tcpdump-vl.spec

+ 10 - 7
lib/libp/libpcap/libpcap-vl.spec

@@ -7,7 +7,7 @@ Name: libpcap
 Summary: A system-independent interface for user-level packet capture.
 Summary(ja): ユーザレベルでパケットをキャプチャするインターフェイス
 Version: %{libpcap_ver}
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Epoch: 1
 
 Group: System Environment/Libraries
@@ -78,14 +78,15 @@ DEFS="$DEFS -DHAVE_ETHER_HOSTTON=1 -DLBL_ALIGN=1"
 make DEFS="$DEFS"
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}
+mkdir -p %{buildroot}%{_bindir}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
+rm -f %{buildroot}%{_libdir}/libpcap.a
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
  
@@ -103,13 +104,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/pcap
 %{_includedir}/pcap/*
 %{_libdir}/libpcap.so
-%{_libdir}/libpcap.a
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_mandir}/man5/*
 %{_mandir}/man7/*
 
 %changelog
+* Thu Mar 22 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1:1.1.1-3
+- rebuild; remove *.a file
+
 * Sat Sep 18 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1:1.1.1-2
 - fixed header file location <BTS:994>
 - added URL tag

+ 14 - 11
t/tcpdump/tcpdump-vl.spec

@@ -7,7 +7,7 @@ Name: tcpdump
 Version: %{tcpdump_ver}
 %define	tcpdump_dir	tcpdump-%{tcpdump_ver}
 %define tcpslice_dir	tcpslice
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 Epoch: 1
 
 Group: Applications/System
@@ -40,7 +40,7 @@ BuildRequires: autoconf, automake
 
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: Daisuke SUZUKI <daisuke@linux.or.jp>
+Packager: daisuke, shaolin
 
 
 %description
@@ -105,24 +105,24 @@ make DEFS="$DEFS"
 popd
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{3,8}
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}
+mkdir -p %{buildroot}%{_mandir}/man{3,8}
+mkdir -p %{buildroot}%{_sbindir}
 
 pushd %tcpslice_dir
-install -m755 -s tcpslice ${RPM_BUILD_ROOT}%{_sbindir}
-install -m644 tcpslice.1 ${RPM_BUILD_ROOT}%{_mandir}/man8/tcpslice.8
+install -m755 -s tcpslice %{buildroot}%{_sbindir}
+install -m644 tcpslice.1 %{buildroot}%{_mandir}/man8/tcpslice.8
 popd
 
 pushd %tcpdump_dir
-install -m755 -s tcpdump ${RPM_BUILD_ROOT}%{_sbindir}
-install -m644 tcpdump.1 ${RPM_BUILD_ROOT}%{_mandir}/man8/tcpdump.8
+install -m755 -s tcpdump %{buildroot}%{_sbindir}
+install -m644 tcpdump.1 %{buildroot}%{_mandir}/man8/tcpdump.8
 popd
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -137,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 22 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1:4.1.1-4
+- rebuild
+
 * Sat Jan 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1:4.1.1-3
 - rebuild with openssl-1.0.0c