Zwischencommit fuer LFS.

[people/pmueller/ipfire-2.x.git] / lfs / cups

diff --git a/lfs/cups b/lfs/cups
index eea9f8d5cb270f9fd65912869f6dca79aa5944c5..8750936f2068e5dcf1ff0dfd2f914860cda69996 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -26,13 +26,15 @@
 
 include Config
 
-VER        = 1.1.23
+VER        = 1.2.2
 
 THISAPP    = cups-$(VER)-source
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = cups
+PAK_VER    = ipfire-beta1
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4ce09b1dce09b6b9398af0daae9adf63
+$(DL_FILE)_MD5 = 091de9109c9252cb37427859e90190ad
 
 install : $(TARGET)
 
@@ -53,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-       make-packages.sh cups $(THISAPP)-ipfire-beta-1
+       @$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -75,7 +77,7 @@ $(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) && 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