From a51d63175dc2a0d69bca752acdd4099e17a824afdefd5b49d9923538ae3d0fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 11 Apr 2014 13:53:11 +0000
Subject: [PATCH] Remove references to the obsolete samba-krb-printing package
 and get_printing_ticket binary.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=400
---
 patches.tar.bz2      |  4 +--
 samba.changes        |  6 +++++
 samba.spec           | 62 +-------------------------------------------
 vendor-files.tar.bz2 |  4 +--
 4 files changed, 11 insertions(+), 65 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 7c0be8b..c2a5669 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38c323a266f145c753ed640616fd4c674af0d2951cb4149798374317a6846731
-size 284690
+oid sha256:8ef1bee7dded31a3c0683ed1b86faeb6a2cc7754176c89ca2cccbccde95e8c91
+size 278585
diff --git a/samba.changes b/samba.changes
index 3778938..bddcccd 100644
--- a/samba.changes
+++ b/samba.changes
@@ -3,6 +3,12 @@ Fri Apr 11 12:37:48 UTC 2014 - ddiss@suse.com
 
 - Fix minor compiler warnings in snapshot code-path; (bnc#873177).
 
+-------------------------------------------------------------------
+Fri Apr 11 12:21:48 UTC 2014 - lmuelle@suse.com
+
+- Remove references to the obsolete samba-krb-printing package and
+  get_printing_ticket binary.
+
 -------------------------------------------------------------------
 Fri Apr 11 12:09:23 UTC 2014 - ddiss@suse.com
 
diff --git a/samba.spec b/samba.spec
index 6d65c4e..64e1e13 100644
--- a/samba.spec
+++ b/samba.spec
@@ -144,11 +144,10 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3221
+%define SOURCE_TIMESTAMP 3222
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
-%global with_get_printing_ticket 0
 Version:        4.1.6
 Release:        0
 License:        GPL-3.0+
@@ -331,26 +330,6 @@ Branch:         %{BRANCH}
 
 %endif
 
-%if %with_get_printing_ticket
-%package krb-printing
-License:        GPL-3.0+
-Summary:        Wrapper binary for kerberized printing
-Group:          Productivity/Networking/Samba
-PreReq:         coreutils
-Provides:       samba-gplv3-krb-printing = %{version}
-Obsoletes:      samba-gplv3-krb-printing < %{version}
-%if 0%{?suse_version} > 1000
-PreReq:         permissions
-%endif
-Requires:       samba-client >= %{version}
-
-%description krb-printing
-A wrapper binary to run smbspool with the original calling UID.
-
-Source Timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-%endif
-
 
 %package libs
 License:        GPL-3.0+
@@ -1146,9 +1125,6 @@ for file in docs/htmldocs/index.html vendor-files/docu/README.vendor; do
 	sed -e "s/VENDOR/%{VENDOR}/g" "${file}" >"${file}.new" && \
 		mv "${file}.new" "${file}"
 done
-%if %with_get_printing_ticket
-install -m 0644 vendor-files/tools/get_printing_ticket.c source3/client/get_printing_ticket.c
-%endif
 install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/
 # Create and add vendor suffix
 test -f vendor-files/tools/package-data && \
@@ -1644,29 +1620,6 @@ fi
 
 %postun -n %{libwbclient_name} -p /sbin/ldconfig
 
-%if %with_get_printing_ticket
-%post krb-printing
-if test ${1:-0} -eq 1 -a -d %{cups_lib_dir}/backend; then
-	ln -fs %{_bindir}/get_printing_ticket %{cups_lib_dir}/backend/smb
-fi
-%if 0%{?suse_version} > 0
-%if 0%{?suse_version} < 1131
-%{run_permissions}
-%else
-%{set_permissions} %{_bindir}/get_printing_ticket
-%endif
-%endif
-
-%postun krb-printing
-if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{cups_lib_dir}/backend; then
-	ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
-fi
-%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000
-%verifyscript krb-printing
-%verify_permissions -e %{_bindir}/get_printing_ticket
-%endif
-%endif
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -2202,19 +2155,6 @@ fi
 %doc %{_datadir}/susehelp
 %endif
 
-%if %with_get_printing_ticket
-%files krb-printing
-%defattr(-,root,root)
-%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000
-%verify(not mode) %attr(4750,root,lp) %{_bindir}/get_printing_ticket
-%else
-%attr(0750,root,lp) %{_bindir}/get_printing_ticket
-%endif
-%dir %{cups_lib_dir}
-%dir %{cups_lib_dir}/backend
-%ghost %{cups_lib_dir}/backend/smb
-%endif
-
 %files -n libdcerpc-atsvc0
 %defattr(-,root,root)
 %_libdir/libdcerpc-atsvc.so.0*
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index a8a7e2c..c4f51bd 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:331fb296c0504d668088358b3b24f6fe5e311f8b715b856ca2839ea6c3bd3831
-size 54412
+oid sha256:9df31153a6a3447e0e472b23da9c3d257e97f9eef709cb87c10c4a08eaa623b7
+size 54798