From b1fea4b5ba8503185b9e410567bbe9bf8d5c317a Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Aug 13 2011 12:13:48 +0000
Subject: Upgrade to 1.20


---

diff --git a/.gitignore b/.gitignore
index 65a334c..d6900b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-drbdlinks-1.19.tar.gz
+drbdlinks-1.20.tar.gz
diff --git a/drbdlinks-1.19-selinux.patch b/drbdlinks-1.19-selinux.patch
deleted file mode 100644
index 40d9a3f..0000000
--- a/drbdlinks-1.19-selinux.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for drbdlinks <= 1.19, which
-fixes "ValueError: too many values to unpack" if the SELinux filesystem element
-label includes range as well, e.g. "system_u:object_r:admin_home_t:s0" rather
-only "system_u:object_r:admin_home_t". If you are running mcstrans daemon, you
-will also maybe not see the range. As drbdlinks is also still in use on systems
-with Red Hat Enterprise Linux 4, this patch should be python 2.3 compatible.
-
---- drbdlinks-1.19/drbdlinks			2011-05-06 01:48:53.000000000 +0200
-+++ drbdlinks-1.19/drbdlinks.selinux		2011-07-09 15:32:23.000000000 +0200
-@@ -328,9 +328,11 @@
- 			fp.close()
- 			if line:
- 				line = string.split(line, ' ')[0]
--				seUser, seRole, seType = string.split(line, ':')
--				os.system('chcon -h -u "%s" -r "%s" -t "%s" "%s"'
--						% ( seUser, seRole, seType, linkLocal ))
-+				seUser, seRole, seType, seRange = (string.split(line, ':') + [None] * 4)[:4]
-+				if seRange:
-+					os.system('chcon -h -u "%s" -r "%s" -t "%s" -l "%s" "%s"' % ( seUser, seRole, seType, seRange, linkLocal ))
-+				else:
-+					os.system('chcon -h -u "%s" -r "%s" -t "%s" "%s"' % ( seUser, seRole, seType, linkLocal ))
- 	
- 	if anyLinksChanged:
- 		if restartSyslog(config): errorCount = errorCount + 1
diff --git a/drbdlinks.spec b/drbdlinks.spec
index f909f6f..9120725 100644
--- a/drbdlinks.spec
+++ b/drbdlinks.spec
@@ -1,7 +1,7 @@
 Summary:         A program for managing links into a DRBD shared partition
 Name:            drbdlinks
-Version:         1.19
-Release:         2%{?dist}
+Version:         1.20
+Release:         1%{?dist}
 License:         GPLv2
 Group:           Applications/System
 URL:             http://www.tummy.com/Community/software/%{name}/
@@ -9,7 +9,6 @@ Source0:         ftp://ftp.tummy.com/pub/tummy/%{name}/%{name}-%{version}.tar.gz
 Source1:         drbdlinksclean
 Source2:         drbdlinks.logrotate
 Source3:         drbdlinks.tmpfiles
-Patch0:          drbdlinks-1.19-selinux.patch
 Requires:        python
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -35,7 +34,6 @@ partition isn't mounted, the links are in their normal state.
 
 %prep
 %setup -q
-%patch0 -p1 -b .selinux
 
 %build
 
@@ -88,6 +86,9 @@ fi
 %{_localstatedir}/run/%{name}/
 
 %changelog
+* Sat Aug 13 2011 Robert Scheck <robert@fedoraproject.org> 1.20-1
+- Upgrade to 1.20
+
 * Sun Jul 17 2011 Robert Scheck <robert@fedoraproject.org> 1.19-2
 - Handle visible SELinux range label if mcstrans is not used
 - Added configuration file for tmpfiles handling (#656578)
diff --git a/sources b/sources
index 4391a14..24c9eec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b975be26bcada61dcc587679d799be8c  drbdlinks-1.19.tar.gz
+d706d049d028bbdb94d2c95fc782f139  drbdlinks-1.20.tar.gz