From 7d3479f4c97cf0bde5caeed4041bdc1b634e364431be143dd23b928d09e2f6cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Sat, 26 Sep 2015 17:31:40 +0000
Subject: [PATCH] Revert "Add missing sysconfig file header; (bnc#947361)."

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=505
---
 patches.tar.bz2      |  4 ++--
 samba.changes        |  5 -----
 samba.spec           | 14 ++++----------
 vendor-files.tar.bz2 |  4 ++--
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index f0a5840..bb31284 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:707aaae289b21abbbffd8cad202da3825215c2b07e18ddb3a2bade4bb12b6b89
-size 29237
+oid sha256:8874bbeaca36120dfcf5ee0edc9f8b80217291f128cc6f503051d0faf3021321
+size 29242
diff --git a/samba.changes b/samba.changes
index 1ea7521..5a40f95 100644
--- a/samba.changes
+++ b/samba.changes
@@ -3,11 +3,6 @@ Fri Sep 25 15:23:47 UTC 2015 - lmuelle@suse.com
 
 - Relocate the tmpfiles.d directory to the client package; (bnc#947552).
 
--------------------------------------------------------------------
-Fri Sep 25 11:58:02 UTC 2015 - lmuelle@suse.com
-
-- Add missing sysconfig file header; (bnc#947361).
-
 -------------------------------------------------------------------
 Tue Sep 22 13:13:02 UTC 2015 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index ff2dc3b..016ca6e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -144,7 +144,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3496
+%define SOURCE_TIMESTAMP 3499
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -434,7 +434,6 @@ PreReq:         %{?insserv_prereq}
 PreReq:         /sbin/ldconfig
 PreReq:         /usr/sbin/groupadd
 PreReq:         coreutils
-PreReq:         grep
 PreReq:         samba-client >= %{version}
 
 %description winbind
@@ -1454,10 +1453,6 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || :
 %if 0%{?suse_version} > 1220
 %service_add_post nmb.service smb.service
 %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf
-grep -m 1 -q "^## Path:" %{_sysconfdir}/sysconfig/samba 2>/dev/null || ( \
-	cat %{_var}/adm/fillup-templates/sysconfig.samba-client %{_sysconfdir}/sysconfig/samba 2>/dev/null \
-		>%{_var}/adm/fillup-templates/sysconfig.samba-client.merged
-	mv %{_var}/adm/fillup-templates/sysconfig.samba-client.merged %{_sysconfdir}/sysconfig/samba )
 %fillup_only
 %endif
 
@@ -1529,6 +1524,9 @@ fi
 if ! test -e %{_bindir}/get_printing_ticket; then
 	ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
 fi
+%if 0%{?suse_version} > 1220
+%{fillup_only -ans samba client}
+%endif
 %{?fillup_only:%{fillup_only -nsd dhcp samba-client network}}
 
 %postun client
@@ -1610,10 +1608,6 @@ fi
 %if 0%{?suse_version} > 1220
 %service_add_post winbind.service
 %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf
-grep -m 1 -q "^## Path:" %{_sysconfdir}/sysconfig/samba 2>/dev/null || ( \
-	cat %{_var}/adm/fillup-templates/sysconfig.samba-client %{_sysconfdir}/sysconfig/samba 2>/dev/null \
-		>%{_var}/adm/fillup-templates/sysconfig.samba-client.merged
-	mv %{_var}/adm/fillup-templates/sysconfig.samba-client.merged %{_sysconfdir}/sysconfig/samba )
 %{fillup_only -ans samba winbind}
 %endif
 
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index e2c1a3e..5402ae2 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d3fcb88eb7ddd2b675796d1699a9b3440e6b98add2dbd2ea058d41f63dc0736
-size 52869
+oid sha256:bd3ffa44c58b0365d5be277d10165fe28bb68a9ff27235bdf6a7e5390e2126c5
+size 52888