Skip to content

Commit

Permalink
packaging: Move smbprint to a comman location.
Browse files Browse the repository at this point in the history
This also removes all the duplicate smbprint scripts.

This fixes bug #9301.

Signed-off-by: Andreas Schneider <[email protected]>
Signed-off-by: Stefan Metzmacher <[email protected]>

Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Mon Oct 29 14:08:37 CET 2012 on sn-devel-104
  • Loading branch information
cryptomilk committed Oct 29, 2012
1 parent aa41104 commit 334044f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 269 deletions.
176 changes: 0 additions & 176 deletions examples/printing/smbprint

This file was deleted.

2 changes: 1 addition & 1 deletion packaging/RHEL-CTDB/samba.spec.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ install -m644 setup/samba.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samb
install -m755 setup/smb.init $RPM_BUILD_ROOT%{initdir}/smb
install -m755 setup/winbind.init $RPM_BUILD_ROOT%{initdir}/winbind
install -m644 setup/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
install -m755 packaging/printing/smbprint $RPM_BUILD_ROOT%{_bindir}
install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
Expand Down
2 changes: 1 addition & 1 deletion packaging/RHEL/samba.spec.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ install -m644 setup/samba.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samb
install -m755 setup/smb.init $RPM_BUILD_ROOT%{initdir}/smb
install -m755 setup/winbind.init $RPM_BUILD_ROOT%{initdir}/winbind
install -m644 setup/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
install -m755 packaging/printing/smbprint $RPM_BUILD_ROOT%{_bindir}
install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
Expand Down
84 changes: 0 additions & 84 deletions packaging/RHEL/setup/smbprint

This file was deleted.

3 changes: 3 additions & 0 deletions packaging/printing/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
The smbprint script is an input filter for printcap printing on a unix machine.
It uses the smbclient program to print the file to the specified smb-based
server and service.
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
#!/bin/sh
# This script is an input filter for printcap printing on a unix machine. It
# uses the smbclient program to print the file to the specified smb-based
# uses the smbclient program to print the file to the specified smb-based
# server and service.
# For example you could have a printcap entry like this
#
# smb:lp=/dev/null:sd=/usr/spool/smb:sh:if=/usr/local/samba/smbprint
#
# which would create a unix printer called "smb" that will print via this
# which would create a unix printer called "smb" that will print via this
# script. You will need to create the spool directory /usr/spool/smb with
# appropriate permissions and ownerships for your system.

# Set these to the server and service you wish to print to
# In this example I have a WfWg PC called "lapland" that has a printer
# Set these to the server and service you wish to print to
# In this example I have a WfWg PC called "lapland" that has a printer
# exported called "printer" with no password.

#
# Script further altered by [email protected] (Michael Hamilton)
# so that the server, service, and password can be read from
# so that the server, service, and password can be read from
# a /usr/var/spool/lpd/PRINTNAME/.config file.
#
# In order for this to work the /etc/printcap entry must include an
# In order for this to work the /etc/printcap entry must include an
# accounting file (af=...):
#
# cdcolour:\
Expand Down Expand Up @@ -47,7 +47,7 @@
# Concat this with /.config to get the config file.
#
eval acct_file=\${$#}
spool_dir=`dirname $acct_file`
spool_dir=`dirname $acct_file`
config_file=$spool_dir/.config

# Should read the following variables set in the config file:
Expand Down

0 comments on commit 334044f

Please sign in to comment.