[patch] patch needed by turboprint 1.92 ebuild

setup.patch (text/plain), 2.75 KB, created by Sven on 2005-04-24 12:46:08 UTC

diff -ur turboprint-1.92-orig/lib/install-post turboprint-1.92/lib/install-post
--- turboprint-1.92-orig/lib/install-post	2005-04-15 16:31:20.000000000 +0200
+++ turboprint-1.92/lib/install-post	2005-04-24 21:28:36.000000000 +0200
@@ -8,10 +8,6 @@
 # (c) 2000-2002 ZEDOnet
 # [e-mail]
 
-# get TurboPrint configuration
-
-eval $(cat /etc/turboprint/system.cfg)
-
 # override help browser if set by command line
 
 TP_RPM=0
@@ -39,8 +35,8 @@
 
 # link documentation
 
-if [ ! -e $TPPATH_DOC/html_fr ] ; then
-	ln -s $TPPATH_DOC/html $TPPATH_DOC/html_fr
+if [ ! -e "$TPPATH_DOC/html_fr" ] ; then
+	ln -s html "$TPPATH_DOC/html_fr"
 fi
 
 # write system.cfg
@@ -78,8 +74,8 @@
 
 # generate PPD files; add to CUPS if present
 
-mkdir -p "$RBR$TPPATH_SHARE/ppd"
-tpsetup --writeppdfiles "$TPPATH_SHARE/ppd/"
+mkdir -p "$TPPATH_SHARE/ppd"
+"$TPPATH_BIN/tpsetup" --writeppdfiles "$TPPATH_SHARE/ppd/"
 
 if [ $TP_CUPS -eq 1 ] ; then
 	if [ -e "$TPPATH_CUPSFILTER" ] ; then
@@ -95,25 +91,13 @@
 	install --mode=755 $TPPATH_SHARE/ppd/* "$TPPATH_CUPSDRIVER/turboprint"
 fi
 
-# call setup to update LPD config files / CUPS PPD files
-
-tpsetup --update
-
-# restart CUPS scheduler
-
-if [ $TP_CUPS -eq 1 ] ; then
-	echo "Restarting CUPS printing system..."
-	rccups restart &> /dev/null
-	echo ""
-fi
-
 # remove dump files
 
 if [ -e "$TPPATH_SHARE/dump/dj970aligncontrol.prn" ] ; then
 	rm -r "$TPPATH_SHARE/dump/dj970aligncontrol.prn"
 fi
 
-# exit 0
+exit 0
 
 # add entry to KDE menu
 # KDE1 no longer supported
Nur in turboprint-1.92/lib: install-post~.
diff -ur turboprint-1.92-orig/lib/install-static turboprint-1.92/lib/install-static
--- turboprint-1.92-orig/lib/install-static	2005-04-15 16:31:20.000000000 +0200
+++ turboprint-1.92/lib/install-static	2005-04-24 21:16:45.000000000 +0200
@@ -8,8 +8,6 @@
 # (c) 2000-2002 ZEDOnet
 # [e-mail]
 
-eval $(cat system.cfg)
-
 if [ "$1" == "--rpm" ] ; then
 	# additional setup if called for rpm creation
 	RBR="$RPM_BUILD_ROOT"
Nur in turboprint-1.92/lib: install-static~.
diff -ur turboprint-1.92-orig/setup turboprint-1.92/setup
--- turboprint-1.92-orig/setup	2005-04-15 16:31:20.000000000 +0200
+++ turboprint-1.92/setup	2005-04-24 21:19:58.000000000 +0200
@@ -38,8 +38,7 @@
 echo "TurboPrint Installation"
 echo "======================="
 
-bin/tpsetup --printkey *.key
-result=$?
+result=99
 
 if [ $TP_BATCH -eq 0 ] ; then
 	echo
@@ -147,7 +146,7 @@
  fi
 fi
 
-eval $(cat system.cfg)
+eval $(cat system.cfg | sed -r 's|^TP|export &|')
 
 # override help browser if set by command line
 
@@ -205,12 +204,6 @@
 
 lib/install-info --tgz --cups=$TP_CUPS --language=$TP_LANGUAGE
 
-# install keyfile if present
-
-if [ $result -eq 0 ] ; then
-	tpsetup --install *.key
-fi
-
 echo
 echo "$TP_DOCU $TPPATH_DOC/html"
 
Nur in turboprint-1.92: setup~.