Sophie

Sophie

distrib > Mandriva > 2007.1 > x86_64 > by-pkgid > 55244e2bfc43c59ac8c92bcf269ff798 > files > 1

checkinstall-1.6.1-2mdv2007.1.src.rpm

--- checkinstall-1.6.0/installwatch-0.7.0beta4/installwatch.mdk	2005-08-11 00:40:01.000000000 +0200
+++ checkinstall-1.6.0/installwatch-0.7.0beta4/installwatch	2005-08-11 09:09:43.000000000 +0200
@@ -14,7 +14,7 @@
 	exit 1
 fi
 
-LIBDIR=$PREFIX/lib
+LIBDIR=$PREFIX/lib/checkinstall
 
 BASE_TMP_DIR=/var/tmp
 
--- checkinstall-1.6.0/checkinstall.mdk	2005-08-11 00:39:55.000000000 +0200
+++ checkinstall-1.6.0/checkinstall	2005-08-11 09:11:20.000000000 +0200
@@ -45,7 +45,7 @@
 
 
 # gettext variables
-export TEXTDOMAINDIR=/usr/local/lib/checkinstall/locale
+export TEXTDOMAINDIR=/usr/lib/checkinstall/locale
 export TEXTDOMAIN=checkinstall
 
 # .spec file path
@@ -385,13 +385,13 @@
 ckversion
 echo
 
-if ! [ -f /usr/local/lib/checkinstall/checkinstallrc ]; then
-   echog "The checkinstallrc file was not found at:\n/usr/local/lib/checkinstall/checkinstallrc"
+if ! [ -f /usr/lib/checkinstall/checkinstallrc ]; then
+   echog "The checkinstallrc file was not found at:\n/usr/lib/checkinstall/checkinstallrc"
    echo
    echog "Assuming default values."
 else
 # Get our default settings from the rc file
-source /usr/local/lib/checkinstall/checkinstallrc
+source /usr/lib/checkinstall/checkinstallrc
 fi
 
 
@@ -754,7 +754,7 @@
 
 ################################################################
 # User-configurable variables were moved to the checkinstallrc #
-# file which is probably found at /usr/local/lib/checkinstall  #          
+# file which is probably found at /usr/lib/checkinstall  #          
 #                                                              #
 #                  DO NOT modify them here!!                   #
 ################################################################
@@ -1643,8 +1643,8 @@
  cd $BUILD_DIR
  
  # Compress man pages
- COMPRESS="gzip -9"
- COMPRESS_EXT=.gz
+ COMPRESS="bzip2 -9"
+ COMPRESS_EXT=.bz2
  
  for d in ./usr/local/man/man* ./usr/local/man/*/man* ./usr/local/info \
  	./usr/local/share/man/man* ./usr/local/share/man/*/man* \
@@ -2139,6 +2139,7 @@
 BuildRoot: $BROOTPATH
 Provides:  $PROVIDES
 Requires:  $REQUIRES,/bin/sh
+%define _unpackaged_files_terminate_build      0
 
 %description
 EOF
--- checkinstall-1.6.0/checkinstallrc-dist.mdk	2005-08-11 00:39:55.000000000 +0200
+++ checkinstall-1.6.0/checkinstallrc-dist	2005-08-11 09:09:43.000000000 +0200
@@ -16,14 +16,14 @@
 DEBUG=0
 
 # Location of the "installwatch" program
-INSTALLWATCH_PREFIX="/usr/local"
+INSTALLWATCH_PREFIX="/usr"
 INSTALLWATCH=${INSTALLWATCH_PREFIX}/bin/installwatch
 
 # Location of the makepkg program. "makepak" is the default, and is 
 # included with checkinstall. If you want to use Slackware's native "makepkg"
 # then set this to "makepkg"
 
-MAKEPKG=/sbin/makepkg
+MAKEPKG=/usr/sbin/makepkg
 
 # makepkg optional flags. These are recommended if running a newer Slackware
 # version: "-l y -c n"
@@ -36,10 +36,10 @@
 SHOW_MAKEPKG=0
 
 # Where will we keep our temp files?
-BASE_TMP_DIR=/var/tmp   ##  Don't set this to /tmp or / !! 
+BASE_TMP_DIR=$HOME/tmp   ##  Don't set this to /tmp or / !! 
 
 # Where to place the installed document files
-DOC_DIR=""
+DOC_DIR="/usr/share/doc"
 
 # Default architecture type (Leave it empty to allow auto-guessing)
 ARCHITECTURE=""
@@ -49,7 +49,7 @@
 #   R : RPM
 #   D : Debian
 
-INSTYPE=""
+INSTYPE="R"
 
 # Storage directory for newly created packages
 # By default they will be stored at the default
@@ -137,3 +137,6 @@
       
 # Install the package or just create it?
 INSTALL=0
+
+# gw special RPM group for checkinstalled packages
+PKG_GROUP=checkinstall