X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcups;h=47d7c54e8cc95163f411669b35cec2e315387d1b;hb=fcb5057d1f99bcb166446a6beb5af94f38b3ad00;hp=7320097936c752dda2b41c9e719b63c673a8cd85;hpb=483f59cd335706e8311bf70b55d7d537cf173aff;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/cups b/lfs/cups
index 732009793..47d7c54e8 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -26,15 +26,15 @@
 
 include Config
 
-VER        = 1.1.23
+VER        = 1.2.2
 
-THISAPP    = cups-$(VER)-source
-DL_FILE    = $(THISAPP).tar.bz2
+THISAPP    = cups-$(VER)
+DL_FILE    = $(THISAPP)-source.tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4ce09b1dce09b6b9398af0daae9adf63
+$(DL_FILE)_MD5 = 091de9109c9252cb37427859e90190ad
 
 install : $(TARGET)
 
@@ -77,11 +77,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && sed -i -e "s@pam/pam@security/pam@g" {config-scripts/cups-pam.m4,scheduler/auth.c,configure}
-#	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/patches/cups-1.1.23-testsuite_fix-1.patch
+#	cd $(DIR_APP) && sed -i -e "s@pam/pam@security/pam@g" {config-scripts/cups-pam.m4,scheduler/auth.c,configure}
 	cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire
 	cd $(DIR_APP) && make
-#	cd $(DIR_APP) && make check
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
 	@rm -rf $(DIR_APP)