X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcups;h=47d7c54e8cc95163f411669b35cec2e315387d1b;hb=c7845ac1102ab98add72d01a7d1d62e2aca493b8;hp=8750936f2068e5dcf1ff0dfd2f914860cda69996;hpb=52f5423e649a89dc532f7f4a0db34279d80d6f0b;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/cups b/lfs/cups
index 8750936f20..47d7c54e8c 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -28,13 +28,13 @@ include Config
 
 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
@@ -78,10 +78,8 @@ $(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) && ./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)