From a8203eb3db1eafd3881b6e82ccfed25a00eba7ee Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Mon, 18 Sep 2006 12:34:31 +0000 Subject: [PATCH] Stefan Fiedler: downgrade cups (1.1.23) 1.2.x is still no good for KDE... BUGFIX please see http://rocklinux.net/lurker/message/20060630.184103.beb8f89e.html for why you don't want cups 1.2.x in KDE 3.5.x [2006081519440830331] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7912 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/praenti/cups/cups.desc | 4 +- package/praenti/cups/noinit.patch | 72 +++++++++------ package/praenti/cups/setprinter.patch | 125 +++++++++++++++----------- 3 files changed, 120 insertions(+), 81 deletions(-) diff --git a/package/praenti/cups/cups.desc b/package/praenti/cups/cups.desc index c6948486e..ed6976556 100644 --- a/package/praenti/cups/cups.desc +++ b/package/praenti/cups/cups.desc @@ -52,8 +52,8 @@ [L] GPL [S] Stable -[V] 1.2.0 +[V] 1.1.23 [P] X -?---5---9 121.200 -[D] 1154220744 cups-1.2.0-source.tar.bz2 http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/1.2.0/ +[D] 3717166286 cups-1.1.23-source.tar.bz2 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/1.1.23/ diff --git a/package/praenti/cups/noinit.patch b/package/praenti/cups/noinit.patch index fca7cbf40..4fc15b614 100644 --- a/package/praenti/cups/noinit.patch +++ b/package/praenti/cups/noinit.patch @@ -1,34 +1,52 @@ ---- cups-1.2.0/Makefile~ 2006-05-10 20:33:34.000000000 +0200 -+++ cups-1.2.0/Makefile 2006-05-10 20:38:40.000000000 +0200 -@@ -100,31 +100,6 @@ - $(INSTALL_DIR) -m 755 $(BINDIR) +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/praenti/cups/noinit.patch +# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +--- ./Makefile.orig 2003-08-16 17:12:44.000000000 +0000 ++++ ./Makefile 2003-08-16 17:12:58.000000000 +0000 +@@ -89,30 +89,6 @@ + echo Installing cups-config script... + $(INSTALL_DIR) $(BINDIR) $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config - echo Installing startup script... -- if test "x$(INITDIR)" != x; then \ -- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ -- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ -- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ -- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ -- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \ -- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \ -- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \ -- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \ -- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \ -- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \ +- echo Installing startup script... +- if test "x$(INITDIR)" != "x"; then \ +- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ +- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ +- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \ +- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \ +- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \ - fi -- if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ +- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \ - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ - if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \ -- $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \ -- $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ -- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ -- $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ -- elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \ -- $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \ +- $(INSTALL_SCRIPT) cups.osx $(BUILDROOT)$(INITDDIR)/PrintingServices; \ +- $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ +- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ +- $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ - else \ -- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ - fi \ - fi - if test "x$(DBUSDIR)" != x; then \ - echo Installing cups.conf in $(DBUSDIR)...;\ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \ + + # + # Install source and header files... diff --git a/package/praenti/cups/setprinter.patch b/package/praenti/cups/setprinter.patch index 9bd2be9ca..e2c562b7d 100644 --- a/package/praenti/cups/setprinter.patch +++ b/package/praenti/cups/setprinter.patch @@ -1,77 +1,93 @@ -diff -du -dur cups-1.2.0/berkeley/Makefile src.cups.1147287368.508.3890126981/cups-1.2.0/berkeley/Makefile ---- cups-1.2.0/berkeley/Makefile 2006-03-05 17:48:12.000000000 +0100 -+++ src.cups.1147287368.508.3890126981/cups-1.2.0/berkeley/Makefile 2006-05-10 20:56:30.000000000 +0200 +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/praenti/cups/setprinter.patch +# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +diff -Nur ../cups-1.1.21-org/berkeley/Makefile ./berkeley/Makefile +--- ../cups-1.1.21-org/berkeley/Makefile 2004-09-26 16:42:06.254764248 +0200 ++++ ./berkeley/Makefile 2004-09-26 16:43:33.658476864 +0200 @@ -57,11 +57,11 @@ install: all - $(INSTALL_DIR) -m 755 $(BINDIR) + $(INSTALL_DIR) $(BINDIR) - $(INSTALL_BIN) lpq $(BINDIR) - $(INSTALL_BIN) lpr $(BINDIR) - $(INSTALL_BIN) lprm $(BINDIR) + $(INSTALL_BIN) lpq $(BINDIR)/lpq_cups + $(INSTALL_BIN) lpr $(BINDIR)/lpr_cups + $(INSTALL_BIN) lprm $(BINDIR)/lprm_cups - $(INSTALL_DIR) -m 755 $(SBINDIR) + $(INSTALL_DIR) $(SBINDIR) - $(INSTALL_BIN) lpc $(SBINDIR) + $(INSTALL_BIN) lpc $(SBINDIR)/lpc_cups # -diff -du -dur cups-1.2.0/man/Makefile src.cups.1147287368.508.3890126981/cups-1.2.0/man/Makefile ---- cups-1.2.0/man/Makefile 2006-04-30 18:27:50.000000000 +0200 -+++ src.cups.1147287368.508.3890126981/cups-1.2.0/man/Makefile 2006-05-10 21:12:32.000000000 +0200 -@@ -106,27 +106,28 @@ +diff -Nur ../cups-1.1.21-org/man/Makefile ./man/Makefile +--- ../cups-1.1.21-org/man/Makefile 2004-09-26 16:42:07.097636112 +0200 ++++ ./man/Makefile 2004-09-26 16:49:54.448587968 +0200 +@@ -70,25 +70,25 @@ install: all - $(INSTALL_DIR) -m 755 $(MANDIR)/man1 + $(INSTALL_DIR) $(MANDIR)/man1 for file in $(MAN1); do \ - echo Installing $$file in $(MANDIR)/man1...; \ -- $(INSTALL_MAN) $$file $(MANDIR)/man1; \ +- $(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \ + inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \ + $(INSTALL_MAN) $$file $(MANDIR)/man1/$$inst'_cups.1'; \ done - $(INSTALL_DIR) -m 755 $(MANDIR)/man5 +- $(RM) $(MANDIR)/man1/cancel.1 +- $(LN) lp.1 $(MANDIR)/man1/cancel.1 ++ $(RM) $(MANDIR)/man1/cancel_cups.1 ++ $(LN) lp.1 $(MANDIR)/man1/cancel_cups.1 + $(INSTALL_DIR) $(MANDIR)/man5 for file in $(MAN5); do \ - echo Installing $$file in $(MANDIR)/man5...; \ -- $(INSTALL_MAN) $$file $(MANDIR)/man5; \ +- $(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \ + inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ $(INSTALL_MAN) $$file $(MANDIR)/man5/$$inst'_cups.5'; \ ++ $(INSTALL_MAN) $$file $(MANDIR)/man5/$$(inst)'_cups.5'; \ done - $(INSTALL_DIR) -m 755 $(MANDIR)/man7 - for file in $(MAN7); do \ -- echo Installing $$file in $(MANDIR)/man7...; \ -- $(INSTALL_MAN) $$file $(MANDIR)/man7; \ -+ inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ $(INSTALL_MAN) $$file $(MANDIR)/man7/$$inst'_cups.7'; \ - done - $(INSTALL_DIR) -m 755 $(AMANDIR)/man$(MAN8DIR) + $(INSTALL_DIR) $(AMANDIR)/man$(MAN8EXT) for file in $(MAN8); do \ -- echo Installing $$file in $(AMANDIR)/man$(MAN8DIR)...; \ -- $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8DIR); \ -+ echo $$file; \ +- echo Installing $$file in $(AMANDIR)/man$(MAN8EXT)...; \ +- $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \ + inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ $(INSTALL_MAN) $$file $(AMANDIR)/man8/$$inst'_cups'.$(MAN8EXT); \ ++ $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/$$(inst)'_cups'.$(MAN8EXT); \ done -- $(RM) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT) -- $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT) -- $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT) -+ $(RM) $(AMANDIR)/man$(MAN8DIR)/reject_cups.$(MAN8EXT) -+ $(LN) accept_cups.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/reject_cups.$(MAN8EXT) -+ $(RM) $(AMANDIR)/man8/cupsdisable.$(MAN8EXT) - $(LN) cupsenable.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT) - - -diff -du -dur cups-1.2.0/systemv/Makefile src.cups.1147287368.508.3890126981/cups-1.2.0/systemv/Makefile ---- cups-1.2.0/systemv/Makefile 2006-03-21 03:35:37.000000000 +0100 -+++ src.cups.1147287368.508.3890126981/cups-1.2.0/systemv/Makefile 2006-05-10 20:56:30.000000000 +0200 -@@ -59,26 +59,27 @@ - # +- $(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT) +- $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT) +- $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT) +- $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT) ++ $(RM) $(AMANDIR)/man$(MAN8EXT)/reject_cups.$(MAN8EXT) ++ $(LN) accept_cups.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject_cups.$(MAN8EXT) ++ $(RM) $(AMANDIR)/man$(MAN8EXT)/disable_cups.$(MAN8EXT) ++ $(LN) enable_cups.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable_cups.$(MAN8EXT) + $(INSTALL_DIR) $(MANDIR)/cat1 + for file in $(CAT1); do \ + echo Installing $$file in $(MANDIR)/cat1...; \ +diff -Nur ../cups-1.1.21-org/systemv/Makefile ./systemv/Makefile +--- ../cups-1.1.21-org/systemv/Makefile 2004-09-26 16:42:07.529570448 +0200 ++++ ./systemv/Makefile 2004-09-26 16:52:35.884046048 +0200 +@@ -60,26 +60,24 @@ install: all - $(INSTALL_DIR) -m 755 $(SBINDIR) + $(INSTALL_DIR) $(SBINDIR) - $(INSTALL_BIN) accept $(SBINDIR) -+ $(INSTALL_BIN) accept $(SBINDIR)/accept_cups - $(RM) $(SBINDIR)/reject +- $(RM) $(SBINDIR)/reject - $(LN) accept $(SBINDIR)/reject ++ $(INSTALL_BIN) accept $(SBINDIR)/accept_cups + $(LN) accept $(SBINDIR)/reject_cups $(INSTALL_BIN) cupsaddsmb $(SBINDIR) - $(INSTALL_BIN) lpadmin $(SBINDIR) @@ -80,24 +96,29 @@ diff -du -dur cups-1.2.0/systemv/Makefile src.cups.1147287368.508.3890126981/cup + $(INSTALL_BIN) lpadmin $(SBINDIR)/lpadmin_cups + $(INSTALL_BIN) lpinfo $(SBINDIR)/lpinfo_cups + $(INSTALL_BIN) lpmove $(SBINDIR)/lpremove_cups - $(INSTALL_DIR) -m 755 $(BINDIR) + $(INSTALL_DIR) $(BINDIR) - $(INSTALL_BIN) cancel $(BINDIR) + $(INSTALL_BIN) cancel $(BINDIR)/cancel_cups - $(INSTALL_BIN) cupstestdsc $(BINDIR) $(INSTALL_BIN) cupstestppd $(BINDIR) - $(RM) $(SBINDIR)/cupsdisable - $(LN) accept $(SBINDIR)/cupsdisable - $(RM) $(SBINDIR)/cupsenable - $(LN) accept $(SBINDIR)/cupsenable +- $(RM) $(BINDIR)/disable +- $(LN) ../sbin/accept $(BINDIR)/disable +- $(RM) $(BINDIR)/enable +- $(LN) ../sbin/accept $(BINDIR)/enable - $(INSTALL_BIN) lp $(BINDIR) - $(INSTALL_BIN) lpoptions $(BINDIR) - $(INSTALL_BIN) lpstat $(BINDIR) -- $(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR) +- -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) +- if test ! -x $(BINDIR)/lppasswd; then \ +- chmod 755 $(BINDIR)/lppasswd; \ ++ $(LN) ../sbin/accept $(BINDIR)/disable_cups ++ $(LN) ../sbin/accept $(BINDIR)/enable_cups + $(INSTALL_BIN) lp $(BINDIR)/lp_cups + $(INSTALL_BIN) lpoptions $(BINDIR)/lpoptions_cups + $(INSTALL_BIN) lpstat $(BINDIR)/lpstat_cups + $(INSTALL_BIN) lppasswd $(BINDIR)/lppasswd_cups -+ $(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)/lppasswd_cups || $(INSTALL_BIN) lppasswd $(BINDIR)/lppasswd_cups ++ -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)/lppasswd_cups ++ if test ! -x $(BINDIR)/lppasswd_cups; then \ ++ chmod 755 $(BINDIR)/lppasswd_cups; \ + fi - #