From acf5cfe3aa594ebcd83c4c3cb1a059b084508cdd Mon Sep 17 00:00:00 2001
From: Petr Sabata <contyk@redhat.com>
Date: May 30 2011 12:31:16 +0000
Subject: 1.5 bump


---

diff --git a/.gitignore b/.gitignore
index 5696630..b1e4daf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 bridge-utils-1.2.tar.gz
+/bridge-utils-1.5.tar.gz
diff --git a/bridge-utils-1.2-foreach.patch b/bridge-utils-1.2-foreach.patch
deleted file mode 100644
index bc178bb..0000000
--- a/bridge-utils-1.2-foreach.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/libbridge/libbridge_init.c b/libbridge/libbridge_init.c
-index a7473bd..d093bb1 100644
---- a/libbridge/libbridge_init.c
-+++ b/libbridge/libbridge_init.c
-@@ -49,6 +49,12 @@ static int isbridge(const struct dirent *entry)
- 	char path[SYSFS_PATH_MAX];
- 	struct stat st;
- 
-+	/* Ignore "." and ".." entries. */
-+	if (entry->d_name[0] == '.' &&
-+	    (entry->d_name[1] == 0 ||
-+	     (entry->d_name[1] == '.' && entry->d_name[2] == 0)))
-+		return 0;
-+
- 	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge", entry->d_name);
- 	return stat(path, &st) == 0 && S_ISDIR(st.st_mode);
- }
diff --git a/bridge-utils-1.2-show-ports.patch b/bridge-utils-1.2-show-ports.patch
deleted file mode 100644
index 82ba521..0000000
--- a/bridge-utils-1.2-show-ports.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c
-diff --git a/libbridge/libbridge_init.c b/libbridge/libbridge_init.c
-index e2eab77..38b8a18 100644
---- a/libbridge/libbridge_init.c
-+++ b/libbridge/libbridge_init.c
-@@ -186,12 +186,15 @@ int br_foreach_port(const char *brname,
- 	struct dirent **namelist;
- 	char path[SYSFS_PATH_MAX];
- 
--	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/brport", brname);
-+	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/brif", brname);
- 	count = scandir(path, &namelist, 0, alphasort);
- 	if (count < 0)
- 		return old_foreach_port(brname, iterator, arg);
- 
- 	for (i = 0; i < count; i++) {
-+		if (!strcmp(namelist[i]->d_name, ".") ||
-+		    !strcmp(namelist[i]->d_name, ".."))
-+			continue;
- 		if (iterator(brname, namelist[i]->d_name, arg))
- 			break;
- 	}
diff --git a/bridge-utils.spec b/bridge-utils.spec
index 366e44c..d51dd28 100644
--- a/bridge-utils.spec
+++ b/bridge-utils.spec
@@ -1,19 +1,15 @@
-Summary: Utilities for configuring the linux ethernet bridge
-Name: bridge-utils
-Version: 1.2
-Release: 10%{?dist}
-License: GPLv2+
-URL: http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge
-Group: System Environment/Base
-Source: http://dl.sf.net/bridge/bridge-utils-%{version}.tar.gz
-Patch0: bridge-utils-1.0.4-inc.patch
-Patch1: bridge-utils-1.2-show-ports.patch
-Patch2: bridge-utils-1.2-foreach.patch
-Patch3: bridge-utils-1.2-params.patch
-
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: libsysfs-devel autoconf
-BuildRequires: kernel-headers >= 2.6.16
+Summary:        Utilities for configuring the linux ethernet bridge
+Name:           bridge-utils
+Version:        1.5
+Release:        1%{?dist}
+License:        GPLv2+
+URL:            http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge
+Group:          System Environment/Base
+Source:         http://dl.sf.net/bridge/%{name}-%{version}.tar.gz
+Patch0:         bridge-utils-1.0.4-inc.patch
+Patch1:         bridge-utils-1.2-params.patch
+BuildRequires:  libsysfs-devel autoconf
+BuildRequires:  kernel-headers >= 2.6.16
 
 %description
 This package contains utilities for configuring the linux ethernet
@@ -26,11 +22,8 @@ Install bridge-utils if you want to use the linux ethernet bridge.
 
 %prep
 %setup -q
-
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 autoconf
@@ -38,19 +31,20 @@ autoconf
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} SUBDIRS="brctl doc" install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} SUBDIRS="brctl doc" install
 
 %files
-%defattr (-,root,root,0755)
 %doc AUTHORS COPYING doc/FAQ doc/HOWTO
 %{_sbindir}/brctl
 %{_mandir}/man8/brctl.8*
 
 %changelog
+* Mon May 30 2011 Petr Sabata <contyk@redhat.com> - 1.5-1
+- 1.5 bump
+- BuildRoot and defattr cleanup
+- Use macros in Sources
+- Drop show-ports and foreach patches -- those have been included upstream
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 3105de1..22ad9d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e6cff57ac90d7ab984d9512fdd9f2dd  bridge-utils-1.2.tar.gz
+ec7b381160b340648dede58c31bb2238  bridge-utils-1.5.tar.gz