diff --git a/.gitignore b/.gitignore index e58e84a..59b4599 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ net-tools-1.60.tar.bz2 /net-tools-1.60.20120917git.tar.xz /net-tools-2.0.20121004git.tar.xz /net-tools-2.0.20121106git.tar.xz +/net-tools-2.0.20130109git.tar.xz diff --git a/net-tools-version-bump-to-2.0.patch b/net-tools-version-bump-to-2.0.patch deleted file mode 100644 index b65fa59..0000000 --- a/net-tools-version-bump-to-2.0.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c14bac4f216c452d1e82cb73e4b53c2ccdd77987 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Tue, 2 Oct 2012 22:19:58 -0400 -Subject: [PATCH] version bump to 2.0 - -This is somewhat redundant as most distros are rolling snapshots -themselves, but maybe we should celebrate by throwing a 2.0 release -out there. It's been over 10 years since the last release after all. - -Note: We'll need Bernd to actually run `make dist` and post the tarball - to sf.net. - -Signed-off-by: Mike Frysinger ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index b2ea629..155e249 100644 ---- a/Makefile -+++ b/Makefile -@@ -102,7 +102,7 @@ endif - # -------- end of user definitions -------- - - MAINTAINER = Philip.Blundell@pobox.com --RELEASE = 1.60 -+RELEASE = 2.0 - - .EXPORT_ALL_VARIABLES: - --- -1.7.11.4 - diff --git a/net-tools.spec b/net-tools.spec index d8ff697..f2c3bce 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -1,9 +1,9 @@ -%global checkout 20121106git +%global checkout 20130109git Summary: Basic networking tools Name: net-tools Version: 2.0 -Release: 0.4.%{checkout}%{?dist} +Release: 0.5.%{checkout}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/net-tools/ @@ -53,10 +53,6 @@ Patch10: net-tools-ifconfig-long-iface-crasher.patch # fixed tcp timers info in netstat (#466845) Patch11: net-tools-netstat-probe.patch -# the git snapshot we ship is actually much more a -# 2.0 pre-release then 1.60 post-release -Patch12: net-tools-version-bump-to-2.0.patch - BuildRequires: gettext, libselinux BuildRequires: libselinux-devel BuildRequires: systemd-units @@ -80,7 +76,6 @@ Most of them are obsolete. For replacement check iproute package. %patch9 -p1 -b .sctp %patch10 -p1 -b .long_iface %patch11 -p1 -b .probe -%patch12 -p1 -b .bump cp %SOURCE1 ./config.h cp %SOURCE2 ./config.make @@ -168,6 +163,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir} %attr(0644,root,root) %{_unitdir}/arp-ethers.service %changelog +* Wed Jan 09 2013 Jiri Popelka - 2.0-0.5.20130109git +- latest snapshot (#579855) + * Fri Nov 30 2012 Jiri Popelka - 2.0-0.4.20121106git - fix URL diff --git a/sources b/sources index c5306c6..f2e030d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -65c8dd77f2cd6f928b248ee64bfcdfd6 net-tools-2.0.20121106git.tar.xz +bbad2c1a56b0c72939d0465570334759 net-tools-2.0.20130109git.tar.xz