sgallagh pushed to realmd (f22). "Resolves: rhbz#1210483"

[notifications at fedoraproject.org]

>From 4499214a5058fb9ab4b39a262a75cac6067087be Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Thu, 9 Apr 2015 16:32:33 -0400
Subject: Resolves: rhbz#1210483


diff --git a/0001-Fedora-fix-package-of-usr-bin-net.patch b/0001-Fedora-fix-package-of-usr-bin-net.patch
new file mode 100644
index 0000000..ed0898e
--- /dev/null
+++ b/0001-Fedora-fix-package-of-usr-bin-net.patch
@@ -0,0 +1,29 @@
+From 798aa84cf45fae4b4f78d4abda9d992fb3e8d062 Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh at redhat.com>
+Date: Thu, 9 Apr 2015 16:30:15 -0400
+Subject: [PATCH] Fedora: fix package of /usr/bin/net
+
+---
+ service/realmd-redhat.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/service/realmd-redhat.conf b/service/realmd-redhat.conf
+index e0bfbf55dcf05dd1dd1f7ff650099f33033e3aa9..e39fad525c716d1ed99715280cd5d497b9039427 100644
+--- a/service/realmd-redhat.conf
++++ b/service/realmd-redhat.conf
+@@ -1,11 +1,11 @@
+ # Distro specific overrides for redhat
+ [paths]
+ smb.conf = /etc/samba/smb.conf
+ 
+ [samba-packages]
+-samba-common = /usr/bin/net
++samba-common-tools = /usr/bin/net
+ 
+ [winbind-packages]
+ samba-winbind = /usr/sbin/winbindd
+ samba-winbind-clients = /usr/bin/wbinfo
+ oddjob = /usr/sbin/oddjobd
+-- 
+2.3.4
+
diff --git a/realmd.spec b/realmd.spec
index dfd35bb..c0ff43a 100644
--- a/realmd.spec
+++ b/realmd.spec
@@ -1,6 +1,6 @@
 Name:		realmd
 Version:	0.15.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Kerberos realm enrollment service
 License:	LGPLv2+
 URL:		http://cgit.freedesktop.org/realmd/realmd/
@@ -19,6 +19,9 @@ BuildRequires:	xmlto
 
 Requires:	authconfig
 
+Patch0001: 0001-Fedora-fix-package-of-usr-bin-net.patch
+
+
 %description
 realmd is a DBus system service which manages discovery and enrollment in realms
 and domains like Active Directory or IPA. The control center uses realmd as the
@@ -35,6 +38,7 @@ applications that use %{name}.
 
 %prep
 %setup -q
+%patch0001 -p1
 
 %build
 %configure --disable-silent-rules
@@ -68,6 +72,9 @@ make install DESTDIR=%{buildroot}
 %doc ChangeLog
 
 %changelog
+* Thu Apr 09 2015 Stephen Gallagher <sgallagh at redhat.com> 0.15.2-2
+- Resolves: rhbz#1210483
+
 * Mon Oct 06 2014 Stef Walter <stefw at redhat.com> - 0.15.2-1
 - Update to upstream 0.15.2
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/realmd.git/commit/?h=f22&id=4499214a5058fb9ab4b39a262a75cac6067087be