From 1144a078b6af06b82ea9c008b81dc32eb8295cd4 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 26 Sep 2012 15:53:17 +0200
Subject: [PATCH] Package smbprint again and remove unused service files.

---
 nmb.service     | 12 ------------
 samba.spec      |  8 ++++++++
 smb.service     | 13 -------------
 winbind.service | 12 ------------
 4 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 nmb.service
 delete mode 100644 smb.service
 delete mode 100644 winbind.service

diff --git a/nmb.service b/nmb.service
deleted file mode 100644
index a2ecd22..0000000
--- a/nmb.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Samba NMB Daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/nmbd.pid
-EnvironmentFile=-/etc/sysconfig/samba
-ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/samba.spec b/samba.spec
index bb2b8ec..517fae7 100644
--- a/samba.spec
+++ b/samba.spec
@@ -62,6 +62,8 @@ Source5: pam_winbind.conf
 Source6: samba.pamd
 Source7: samba.conf.tmp
 
+Source100: smbprint
+
 Source200: README.dc
 Source201: README.downgrade
 
@@ -510,6 +512,8 @@ install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/samba/smb.conf
 install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/security/pam_winbind.conf
 install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/samba
 
+install -m 0744 %{SOURCE100} %{buildroot}%{_bindir}/smbprint
+
 echo 127.0.0.1 localhost > %{buildroot}%{_sysconfdir}/samba/lmhosts
 
 install -d -m 0755 %{buildroot}%{_sysconfdir}/openldap/schema
@@ -943,6 +947,7 @@ rm -rf %{buildroot}
 %{_bindir}/smbget
 #%{_bindir}/smbiconv
 %{_bindir}/smbpasswd
+%{_bindir}/smbprint
 %{_bindir}/smbspool
 %{_bindir}/smbta-util
 %{_bindir}/smbtree
@@ -1257,6 +1262,9 @@ rm -rf %{buildroot}
 %endif # with_libwbclient
 
 %changelog
+* Wed Sep 26 2012 - Andreas Schneider <asn@redhat.com> - 2:4.0.0-96.rc1
+- Package smbprint again.
+
 * Wed Sep 26 2012 - Andreas Schneider <asn@redhat.com> - 2:4.0.0-95.rc1
 - Update to 4.0.0rc1.
 
diff --git a/smb.service b/smb.service
deleted file mode 100644
index 70d9842..0000000
--- a/smb.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Samba SMB Daemon
-After=syslog.target network.target nmb.service winbind.service
-
-[Service]
-Type=forking
-PIDFile=/run/smbd.pid
-LimitNOFILE=16384
-EnvironmentFile=-/etc/sysconfig/samba
-ExecStart=/usr/sbin/smbd $SMBDOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/winbind.service b/winbind.service
deleted file mode 100644
index 9ce1b52..0000000
--- a/winbind.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Samba Winbind Daemon
-After=syslog.target network.target nmb.service
-
-[Service]
-Type=forking
-PIDFile=/run/winbindd.pid
-EnvironmentFile=-/etc/sysconfig/samba
-ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS"
-
-[Install]
-WantedBy=multi-user.target