[ngrep] Cleanup.
Christopher Meng
cicku at fedoraproject.org
Mon Aug 26 04:06:37 UTC 2013
commit bbf527c38267756aa0d1da384b7ece2945f0792b
Author: Koji <koji at fedoraproject.org>
Date: Mon Aug 26 12:05:56 2013 +0800
Cleanup.
ngrep.spec | 48 +++++++++++++++++++++---------------------------
1 files changed, 21 insertions(+), 27 deletions(-)
---
diff --git a/ngrep.spec b/ngrep.spec
index ea0e33c..1762a07 100644
--- a/ngrep.spec
+++ b/ngrep.spec
@@ -1,25 +1,19 @@
# Note: building with PCRE instead of GNU regex because of license
# incompatibilities (this one's basically a BSD with advertising clause).
-Name: ngrep
-Summary: Network layer grep tool
-
-Version: 1.45
-Release: 13%{?dist}
-
-Group: Applications/Internet
-License: BSD with advertising
-URL: http://ngrep.sourceforge.net/
-
-Source0: http://download.sourceforge.net/ngrep/%{name}-%{version}.tar.bz2
-Source1: %{name}-README.fedora
-Patch0: %{name}-system-pcre.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: autoconf >= 2.57
-BuildRequires: pcre-devel
-BuildRequires: libpcap-devel
+Name: ngrep
+Version: 1.45
+Release: 14%{?dist}
+Summary: Network layer grep tool
+License: BSD with advertising
+URL: http://ngrep.sourceforge.net
+Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source1: %{name}-README.fedora
+Patch0: %{name}-system-pcre.patch
+Patch1: ngrep-aarch64.patch
+BuildRequires: autoconf
+BuildRequires: pcre-devel
+BuildRequires: libpcap-devel
%description
ngrep strives to provide most of GNU grep's common features, applying them
@@ -33,29 +27,29 @@ common packet sniffing tools, such as tcpdump and snoop.
%prep
%setup -q
%patch0 -p1
-autoconf
-install -pm 644 %{SOURCE1} ./README.fedora
+%patch1 -p1
+install -pm 644 %{S:1} ./README.fedora
%build
export EXTRA_INCLUDES=$(pcre-config --cflags)
export EXTRA_LIBS=$(pcre-config --libs)
+autoreconf -fiv
%configure --enable-pcre --enable-ipv6 --with-pcap-includes=%{_includedir}/pcap
make %{?_smp_mflags} STRIPFLAG=
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT BINDIR_INSTALL=%{_sbindir}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot} BINDIR_INSTALL=%{_sbindir}
%files
-%defattr(-,root,root,-)
%doc doc/CHANGES.txt doc/CREDITS.txt doc/README.txt LICENSE.txt README.fedora
%{_sbindir}/ngrep
%{_mandir}/man8/ngrep.8*
%changelog
+* Mon Aug 26 2013 Christopher Meng <rpm at cicku.me> - 1.45-14
+- SPEC Cleanup.
+- AArch64 support(BZ#926232).
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.45-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list