From b1579e5c1d5012c7e1975ef4aabd5ccc03725ba9 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 04:44:57 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for dropwatch --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From d193a83058c21c04c987a451c38e49173c1c5e75 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:22 +0000 Subject: [PATCH 2/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3763a40..4dec0cd 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := dropwatch SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 57340d30dbeae2529b22e037bc729af78df8c602 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Tue, 20 Apr 2010 19:51:35 +0000 Subject: [PATCH 3/5] Updating to latest version --- .cvsignore | 1 + dropwatch.spec | 19 +++++++++++++++---- sources | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index df25e0d..2b07926 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ dropwatch-1.0.tbz2 +dropwatch-1.1-0.tbz2 diff --git a/dropwatch.spec b/dropwatch.spec index d6a0452..16ec92c 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,13 +1,15 @@ +%define upstream_release 0 Summary: Kernel dropped packet monitor Name: dropwatch -Version: 1.0 -Release: 3%{?dist} -Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2 +Version: 1.1 +Release: 2%{?dist} +Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}-%{upstream_release}.tbz2 URL: http://fedorahosted.org/dropwatch License: GPLv2+ Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: kernel-devel, libnl-devel, readline-devel +BuildRequires: binutils-devel, binutils-static Requires: libnl, readline %description @@ -15,7 +17,7 @@ dropwatch is an utility to interface to the kernel to monitor for dropped network packets. %prep -%setup -q +%setup -q -n dropwatch-%{version} %build cd src @@ -41,6 +43,15 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Thu Apr 07 2010 Neil Horman - 1.1-2 +- Adding more missing buildrequires + +* Wed Apr 07 2010 Neil Horman - 1.1-1 +- Add missing buildrequires + +* Wed Apr 07 2010 Neil Horman - 1.1-0 +- Move to latest upstream sources + * Fri Jul 24 2009 Fedora Release Engineering - 1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index ea50cab..7092b0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34338735d1d2d339c92f21d9c7f1202f dropwatch-1.0.tbz2 +f17a6ec30f82a2c1c5a675325d3e722a dropwatch-1.1-0.tbz2 From 41f4ce336e67b7a5814f2a175017711cd622522c Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Tue, 20 Apr 2010 20:10:18 +0000 Subject: [PATCH 4/5] Fixing build REquires --- dropwatch.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dropwatch.spec b/dropwatch.spec index 16ec92c..5cd4700 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -2,14 +2,14 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}-%{upstream_release}.tbz2 URL: http://fedorahosted.org/dropwatch License: GPLv2+ Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: kernel-devel, libnl-devel, readline-devel -BuildRequires: binutils-devel, binutils-static +BuildRequires: binutils-devel Requires: libnl, readline %description @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Tue Apr 20 2010 Neil Horman - 1.1-3 +- Fixing buildRequires + * Thu Apr 07 2010 Neil Horman - 1.1-2 - Adding more missing buildrequires From c54b69f6557c129075c8a77e696cb163ba626903 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:15:46 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4dec0cd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: dropwatch -# $Id$ -NAME := dropwatch -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 7041828..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -dropwatch-1_0-2_fc10:HEAD:dropwatch-1.0-2.fc10.src.rpm:1237918003