fake@rapidnetworks.de:

hi,

as also posted in flyspray as attachment, here the diff to update the 
patches in the cups-package, so they apply again.

who sent in man-1.5m and cups-1.1.19 version updates? they have not been
tested...


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1100 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

package/rene/cups/noinit.patch

@@ -20,8 +20,8 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
---- ./Makefile.orig	2002-07-09 00:39:03.000000000 +0200
-+++ ./Makefile	2002-07-09 00:40:40.000000000 +0200
+--- ./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)
@@ -42,7 +42,7 @@
 -	if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
 -		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
 -		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
--			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices; \
+-			$(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; \

package/rene/cups/setprinter.patch

@@ -20,9 +20,9 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-diff -ur cups-1.1.18/berkeley/Makefile cups-1.1.18-fixed/berkeley/Makefile
---- cups-1.1.18/berkeley/Makefile	2002-12-17 19:56:34.000000000 +0100
-+++ cups-1.1.18-fixed/berkeley/Makefile	2003-05-07 01:26:05.794298504 +0200
+diff -ur cups-1.1.19/berkeley/Makefile cups-1.1.19-fixed/berkeley/Makefile
+--- cups-1.1.19/berkeley/Makefile	2002-12-17 19:56:34.000000000 +0100
++++ cups-1.1.19-fixed/berkeley/Makefile	2003-05-07 01:26:05.794298504 +0200
 @@ -57,11 +57,11 @@
  
  install:	all
@@ -39,9 +39,9 @@ diff -ur cups-1.1.18/berkeley/Makefile cups-1.1.18-fixed/berkeley/Makefile
  
  
  #
-diff -ur cups-1.1.18/man/Makefile cups-1.1.18-fixed/man/Makefile
---- cups-1.1.18/man/Makefile	2002-12-17 19:59:55.000000000 +0100
-+++ cups-1.1.18-fixed/man/Makefile	2003-05-07 01:43:21.878789720 +0200
+diff -ur cups-1.1.19/man/Makefile cups-1.1.19-fixed/man/Makefile
+--- cups-1.1.19/man/Makefile	2002-12-17 19:59:55.000000000 +0100
++++ cups-1.1.19-fixed/man/Makefile	2003-05-07 01:43:21.878789720 +0200
 @@ -70,26 +70,30 @@
  install:	all
  	$(INSTALL_DIR) $(MANDIR)/man1
@@ -83,9 +83,9 @@ diff -ur cups-1.1.18/man/Makefile cups-1.1.18-fixed/man/Makefile
  	$(INSTALL_DIR) $(MANDIR)/cat1
  	for file in $(CAT1); do \
  		$(INSTALL_MAN) $$file $(MANDIR)/cat1; \
-diff -ur cups-1.1.18/systemv/Makefile cups-1.1.18-fixed/systemv/Makefile
---- cups-1.1.18/systemv/Makefile	2002-12-17 20:00:19.000000000 +0100
-+++ cups-1.1.18-fixed/systemv/Makefile	2003-05-07 01:39:48.220270752 +0200
+diff -ur cups-1.1.19/systemv/Makefile cups-1.1.19-fixed/systemv/Makefile
+--- cups-1.1.19/systemv/Makefile.orig	2003-08-16 18:15:53.000000000 +0000
++++ cups-1.1.19-fixed/systemv/Makefile	2003-08-16 18:19:53.000000000 +0000
 @@ -60,25 +60,22 @@
  
  install:	all
@@ -105,7 +105,7 @@ diff -ur cups-1.1.18/systemv/Makefile cups-1.1.18-fixed/systemv/Makefile
  	$(INSTALL_DIR) $(BINDIR)
 -	$(INSTALL_BIN) cancel $(BINDIR)
 +	$(INSTALL_BIN) cancel $(BINDIR)/cancel_cups
- 	$(INSTALL_BIN) cupstestppd $(SBINDIR)
+ 	$(INSTALL_BIN) cupstestppd $(BINDIR)
 -	$(RM) $(BINDIR)/disable
 -	$(LN) ../sbin/accept $(BINDIR)/disable
 -	$(RM) $(BINDIR)/enable
@@ -125,3 +125,4 @@ diff -ur cups-1.1.18/systemv/Makefile cups-1.1.18-fixed/systemv/Makefile
  
  
  #
+