pool/cups
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 38364 from home:jsmeix:branches:Printing

Browse Source 
Copy from home:jsmeix:branches:Printing/cups via accept of submit request 38364 revision 2.
Request was accepted with message:
Adapted cups.xinetd to work with upstream compliant CUPS 1.4 on all platforms (bnc#575544)

OBS-URL: https://build.opensuse.org/request/show/38364
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=188
This commit is contained in:
Johannes Meixner 2010-04-20 15:02:40 +00:00 committed by Git OBS Bridge
parent b6916d428c
commit 43d7af687e
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cups.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Apr 20 15:53:26 CEST 2010 - jsmeix@suse.de
- In cups.xinetd replaced '@LIB@' by '/usr/lib' and removed
the perl substitute calls regarding '@LIB@' in cups.spec because
since the upstream compliant CUPS 1.4 it is '/usr/lib/cups/'
on all platforms (see Novell/Suse Bugzilla bnc#575544).
-------------------------------------------------------------------
Wed Mar 31 12:52:02 CEST 2010 - jsmeix@suse.de

14
cups.spec
View File

@ -236,11 +236,10 @@ make BUILDROOT=$RPM_BUILD_ROOT install
install -d -m755 $RPM_BUILD_ROOT/etc/init.d
# Source101: cups.init
install -m755 %{SOURCE101} $RPM_BUILD_ROOT/etc/init.d/cups
install -d -m755 $RPM_BUILD_ROOT/var/adm/fillup-templates
# Source103: cups.sysconfig
install -m 644 %{SOURCE103} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.cups
perl -pi -e "s:\@LIB\@:%{_libdir}:g" $RPM_BUILD_ROOT/etc/init.d/cups
ln -sf ../../etc/init.d/cups $RPM_BUILD_ROOT/usr/sbin/rccups
# Source103: cups.sysconfig
install -d -m755 $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 %{SOURCE103} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.cups
# Use Ghostscript fonts instead of CUPS fonts:
rm -r $RPM_BUILD_ROOT/usr/share/cups/fonts
mkdir -p $RPM_BUILD_ROOT/usr/share/ghostscript/fonts
@ -249,11 +248,11 @@ ln -sf /usr/share/ghostscript/fonts $RPM_BUILD_ROOT/usr/share/cups/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
# Add a client.conf as template (Source108: cups-client.conf):
install -m644 %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
# Add D-BUS Configuration:
install -m 644 -D packaging/cups-dbus.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/cups.conf
# Source104: cups.xinetd
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
install -m 644 -D %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd
perl -pi -e "s:\@LIB\@:%{_libdir}:g" $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd
# Make the libraries accessible also via generic named links:
ln -sf libcupsimage.so.2 $RPM_BUILD_ROOT%{_libdir}/libcupsimage.so
ln -sf libcups.so.2 $RPM_BUILD_ROOT%{_libdir}/libcups.so
@ -344,7 +343,7 @@ exit 0
# installed in the build system regardless of an explicite
# configure setting ' --with-pdftops=/usr/bin/pdftops',
# see also http://www.cups.org/str.php?L3278).
# When all mandatory files are explicitely listed.
# When all mandatory files are explicitely listed,
# the build fails intentionally if a mandatory file was not built
# which ensures that already existing correctly built binary RPMs
# are not overwritten by broken RPMs where mandatory files are missing.
@ -538,3 +537,4 @@ exit 0
%doc %{_mandir}/man1/cups-config.1.gz
%changelog

2
cups.xinetd
View File

@ -6,6 +6,6 @@ service printer
protocol = tcp
wait = no
user = lp
server = @LIB@/cups/daemon/cups-lpd
server = /usr/lib/cups/daemon/cups-lpd
server_args = cups-lpd -o document-format=application/octet-stream
}