[CVS] RPM: rpm/ devtool.conf

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 09:20:58
  Branch: HEAD Handle: 2007072408205800

  Modified files:
rpm devtool.conf

  Log:
be less chatty when updating

  Summary:
RevisionChanges Path
2.68+2  -2  rpm/devtool.conf
  

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.67 -r2.68 devtool.conf
  --- rpm/devtool.conf  23 Jul 2007 22:26:47 -  2.67
  +++ rpm/devtool.conf  24 Jul 2007 07:20:58 -  2.68
  @@ -16,7 +16,7 @@
   if [ .${release} = . ]; then
   if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then
   echo === ${name} (cvs up HEAD)
  -( cd ${DEVTOOL_SRCDIR}/${name}  cvs up -A -P -d )
  +( cd ${DEVTOOL_SRCDIR}/${name}  cvs -q up -A -P -d )
   else
   echo === ${name} (cvs co HEAD)
   ( cd ${DEVTOOL_SRCDIR}  cvs co -A -d ${name} ${name} )
  @@ -24,7 +24,7 @@
   else
   if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then
   echo === ${name} (cvs up ${release})
  -( cd ${DEVTOOL_SRCDIR}/${name}  cvs up -P -d -r${release} )
  +( cd ${DEVTOOL_SRCDIR}/${name}  cvs -q up -P -d 
-r${release} )
   else
   echo === ${name} (cvs co ${release})
   ( cd ${DEVTOOL_SRCDIR}  cvs co -r${release} -d ${name} 
${name} )
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ configure.ac

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 09:43:00
  Branch: HEAD Handle: 2007072408425900

  Modified files:
rpm configure.ac

  Log:
some nice platforms like Linux have no version information in the
config.guess output, so add some uname(1) information instead

  Summary:
RevisionChanges Path
2.216   +2  -1  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.215 -r2.216 configure.ac
  --- rpm/configure.ac  23 Jul 2007 22:26:47 -  2.215
  +++ rpm/configure.ac  24 Jul 2007 07:42:59 -  2.216
  @@ -140,8 +140,9 @@
   LINUX* ) RPM_OS_NAME=LINUX ;;
   esac
   v1=0; v2=0; v3=0
  +uname_r=`uname -r`
   eval `dnl
  -[echo $host_os | \
  +[echo $host_os.$uname_r | \
   sed -e 's/^[^0-9]*\([0-9][0-9.]*\).*$/\1/' | \
   sed -e 's/^/X/' \
   -e 
's/^X\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/v1=\1; v2=\2; 
v3=\3/' \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 09:54:22
  Branch: HEAD Handle: 2007072408542200

  Modified files:
rpm devtool.conf

  Log:
enable debug instrumentation for jbj target by default

  Summary:
RevisionChanges Path
2.69+1  -0  rpm/devtool.conf
  

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.68 -r2.69 devtool.conf
  --- rpm/devtool.conf  24 Jul 2007 07:20:58 -  2.68
  +++ rpm/devtool.conf  24 Jul 2007 07:54:22 -  2.69
  @@ -75,6 +75,7 @@
   --enable-build-pie \
   --enable-build-versionscript \
   --enable-build-warnings \
  +--enable-build-debug \
   --enable-maintainer-mode
   
   %fray-cross
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ Makefile.am

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 10:40:55
  Branch: HEAD Handle: 2007072409405500

  Modified files:
rpm Makefile.am

  Log:
do not forget to distribute the lua, zlib and file subdirs in the
distribution tarball

  Summary:
RevisionChanges Path
2.199   +6  -0  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.198 -r2.199 Makefile.am
  --- rpm/Makefile.am   22 Jul 2007 15:14:49 -  2.198
  +++ rpm/Makefile.am   24 Jul 2007 08:40:55 -  2.199
  @@ -7,6 +7,12 @@
   EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL \
autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
db db3/configure \
  + lua/[A-Z]* lua/*.[ch] lua/local/l* \
  + file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc 
file/[A-Z]* file/acinclude.m4 file/aclocal.m4 \
  + file/autogen.sh file/config* file/depcomp file/install-sh 
file/ltmain.sh file/missing file/mkinstalldirs \
  + zlib/[A-Z]* zlib/*.[ch] zlib/autogen.sh zlib/configure.ac 
zlib/config.guess zlib/config.sub \
  + zlib/ltmain.sh zlib/aclocal.m4 zlib/config.h.in zlib/missing 
zlib/install-sh zlib/depcomp \
  + zlib/Makefile.in zlib/configure zlib/stamp-h.in \
perl/Changes perl/MANIFEST perl/META.yml perl/Makefile.PL \
perl/Makefile.PL.in perl/Makefile.am perl/README \
perl/RPM.pm perl/RPM.xs perl/foo.i386.rpm perl/hdlist-test.hdr \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES acinclude.m4

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 10:53:00
  Branch: HEAD Handle: 200707240953

  Modified files:
rpm CHANGES acinclude.m4

  Log:
For libraries prefer pkg-config foo before foo-config as
pkg-config(1) provides more precise CPPFLAGS/CFLAGS and this way makes
Autoconf checks more happy (which insist that -I options are present in
CPPFLAGS or there would be a discrepancy between what the preprocessor
accepts and what the compiler accepts).

  Summary:
RevisionChanges Path
1.1516  +1  -0  rpm/CHANGES
2.20+16 -16 rpm/acinclude.m4
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1515 -r1.1516 CHANGES
  --- rpm/CHANGES   23 Jul 2007 18:41:12 -  1.1515
  +++ rpm/CHANGES   24 Jul 2007 08:53:00 -  1.1516
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- rse: for libraries prefer pkg-config foo before foo-config as 
pkg-config(1) provides more precise CPPFLAGS/CFLAGS
   - rse: unbreak rpm(1) short-hand option --force on package installation
   - rse: use implicit internal library dependencies by default, but allow 
disabling via --disable-build-intlibdep
   - rse: use implicit external library dependencies by default, but allow 
disabling via --disable-build-extlibdep
  @@ .
  patch -p0 '@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.19 -r2.20 acinclude.m4
  --- rpm/acinclude.m4  24 Jul 2007 07:40:00 -  2.19
  +++ rpm/acinclude.m4  24 Jul 2007 08:53:00 -  2.20
  @@ -228,22 +228,7 @@
   ])
   elif test .${__rcl_location} = .external; then
   dnl # detection of library in arbitrary external location
  -if test .`($2-config --version) 2/dev/null` != .; then
  -dnl # via config script in PATH
  -m4_define([__rcl_query_config], [
  -__rcl_flags=`($][1 --$][2) 2/dev/null`
  -if test .${__rcl_flags} != .; then
  -AC_MSG_VERBOSE(-- extending $][3: 
${__rcl_flags})
  -$][3=${$][3} ${__rcl_flags}
  -fi
  -])
  -__rcl_query_config([$2-config], [cppflags], 
[CPPFLAGS])
  -__rcl_query_config([$2-config], [cflags],   [CFLAGS])
  -__rcl_query_config([$2-config], [ldflags],  
[LDFLAGS])
  -__rcl_query_config([$2-config], [libs], [LIBS])
  -__rcl_result_hint=external: via $2-config
  -break
  -elif (pkg-config --exists $2) 2/dev/null; then
  +if (pkg-config --exists $2) 2/dev/null; then
   dnl # via pkg-config(1) script in PATH
   m4_define([__rcl_query_pkgconfig], [
   __rcl_flags=`($][1 --$][2) 2/dev/null`
  @@ -258,6 +243,21 @@
   __rcl_query_pkgconfig([pkg-config $2], 
[libs-only-l],   [LIBS])
   __rcl_result_hint=external: via pkg-config $2
   break
  +elif test .`($2-config --version) 2/dev/null` != .; 
then
  +dnl # via config script in PATH
  +m4_define([__rcl_query_config], [
  +__rcl_flags=`($][1 --$][2) 2/dev/null`
  +if test .${__rcl_flags} != .; then
  +AC_MSG_VERBOSE(-- extending $][3: 
${__rcl_flags})
  +$][3=${$][3} ${__rcl_flags}
  +fi
  +])
  +__rcl_query_config([$2-config], [cppflags], 
[CPPFLAGS])
  +__rcl_query_config([$2-config], [cflags],   [CFLAGS])
  +__rcl_query_config([$2-config], [ldflags],  
[LDFLAGS])
  +__rcl_query_config([$2-config], [libs], [LIBS])
  +__rcl_result_hint=external: via $2-config
  +break
   elif test .${__rcl_found} = .no; then
   dnl # via implicit flags attribution of previous 
checks or
   dnl # in standard

[CVS] RPM: rpm/ configure.ac

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 11:01:52
  Branch: HEAD Handle: 2007072410015200

  Modified files:
rpm configure.ac

  Log:
add version only if no version is already existing in the OS
information, please

  Summary:
RevisionChanges Path
2.217   +6  -2  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.216 -r2.217 configure.ac
  --- rpm/configure.ac  24 Jul 2007 07:42:59 -  2.216
  +++ rpm/configure.ac  24 Jul 2007 09:01:52 -  2.217
  @@ -140,9 +140,13 @@
   LINUX* ) RPM_OS_NAME=LINUX ;;
   esac
   v1=0; v2=0; v3=0
  -uname_r=`uname -r`
  +my_os=$host_os
  +case $my_os in
  +*[[0-9]]* ) ;;
  +* ) my_os=${my_os}`uname -r` ;;
  +esac
   eval `dnl
  -[echo $host_os.$uname_r | \
  +[echo $my_os | \
   sed -e 's/^[^0-9]*\([0-9][0-9.]*\).*$/\1/' | \
   sed -e 's/^/X/' \
   -e 
's/^X\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/v1=\1; v2=\2; 
v3=\3/' \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 12:19:26
  Branch: HEAD Handle: 2007072411192600

  Modified files:
rpm devtool.conf

  Log:
make sure that the correct GNU m4 is picked up (Autoconf prefers gm4
and I had an older gm4 in the system under MacOS X)

  Summary:
RevisionChanges Path
2.71+3  -0  rpm/devtool.conf
  

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.70 -r2.71 devtool.conf
  --- rpm/devtool.conf  24 Jul 2007 08:01:42 -  2.70
  +++ rpm/devtool.conf  24 Jul 2007 10:19:26 -  2.71
  @@ -338,6 +338,9 @@
   --disable-nls
   make
   make install
  +rm -f $prefix_tools/bin/gm4
  +ln $prefix_tools/bin/m4 \
  +   $prefix_tools/bin/gm4 
   ) || exit $?
   ) || exit $?
   fi
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 12:21:36
  Branch: HEAD Handle: 2007072411213600

  Modified files:
rpm devtool.conf

  Log:
remove all trailing blanks in this script

  Summary:
RevisionChanges Path
2.72+5  -5  rpm/devtool.conf
  

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.71 -r2.72 devtool.conf
  --- rpm/devtool.conf  24 Jul 2007 10:19:26 -  2.71
  +++ rpm/devtool.conf  24 Jul 2007 10:21:36 -  2.72
  @@ -44,7 +44,7 @@
   %make
   #   intentionally just a pass-through target
   #   (important for use with devtool.bashrc)
  -make $@ 
  +make $@
   
   %prepare
   %checkout
  @@ -266,7 +266,7 @@
   
   #determine some local tools
   SHTOOL=`cd ${DEVTOOL_SRCDIR}  pwd`/devtool.shtool
  -
  +
   #   helper function for downloading a file from an URL
   download () {
   file=$1
  @@ -340,7 +340,7 @@
   make install
   rm -f $prefix_tools/bin/gm4
   ln $prefix_tools/bin/m4 \
  -   $prefix_tools/bin/gm4 
  +   $prefix_tools/bin/gm4
   ) || exit $?
   ) || exit $?
   fi
  @@ -414,7 +414,7 @@
   make install
   rm -f $prefix_tools/bin/glibtoolize
   ln $prefix_tools/bin/libtoolize \
  -   $prefix_tools/bin/glibtoolize 
  +   $prefix_tools/bin/glibtoolize
   ) || exit $?
   ) || exit $?
   fi
  @@ -811,7 +811,7 @@
   $prefix/bin/rpm -qa
   $prefix/bin/rpm -Va
   }
  -
  +
   #   do all at once
   all () {
   prepare
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.shtool

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 12:28:57
  Branch: HEAD Handle: 2007072411285700

  Modified files:
rpm devtool.shtool

  Log:
upgrade devtool.shtool to a newer snapshot version of GNU shtool so it
better detects MacOS X, too

  Summary:
RevisionChanges Path
2.2 +41 -11 rpm/devtool.shtool
  

  patch -p0 '@@ .'
  Index: rpm/devtool.shtool
  
  $ cvs diff -u -r2.1 -r2.2 devtool.shtool
  --- rpm/devtool.shtool20 Jul 2007 12:13:53 -  2.1
  +++ rpm/devtool.shtool24 Jul 2007 10:28:57 -  2.2
  @@ -165,7 +165,7 @@
   exit 0
   fi
   if [ .$1 = .-r ] || [ .$1 = .--recreate ]; then
  -shtoolize -odevtool.shtool subst platform
  +shtoolize -oshtool subst platform
   exit 0
   fi
   if [ .$1 = .-d ] || [ .$1 = .--debug ]; then
  @@ -794,7 +794,7 @@
  -e 's/^#.*$//'`
   case `util_lower ${n}` in
   redhat )
  -if [ .`grep 'Red Hat Enterprise Linux' 
/etc/${tagfile}` != . ]; then
  +if [ .`egrep '(Red Hat Enterprise 
Linux|CentOS)' /etc/${tagfile}` != . ]; then
   n=Red Hat Enterprise Linux
   else
   n=Red Hat Linux
  @@ -803,7 +803,7 @@
   debian ) n=Debian[ GNU/Linux];;
   ubuntu ) n=Ubuntu[ GNU/Linux];;
   fedora ) n=Fedora Core[ GNU/Linux] ;;
  -suse   ) n=SuSE[ Linux]  ;;
  +suse   ) n=[Novell ]SUSE[ Linux] ;;
   mandrake*|mandriva ) n=Mandriva[ Linux]  ;;
   gentoo ) n=Gentoo[ GNU/Linux];;
   slackware  ) n=Slackware[ Linux] ;;
  @@ -963,6 +963,7 @@
   
   #   IBM AIX
   *:AIX:* )
  +#   determine architecture
   cpu_arch=rs6000
   if [ -x /usr/sbin/lsdev -a -x /usr/sbin/lsattr ]; then
   cpu_id=`/usr/sbin/lsdev -C -c processor -S available | sed 
1q | awk '{ print $1 }'`
  @@ -984,6 +985,7 @@
   AT=${cpu_arch}
   AP=${AT}
   AC=${AP}
  +#   determine system
   ST=[IBM ]AIX ${os_level}
   SP=${ST}
   case ${os_level} in
  @@ -992,20 +994,48 @@
   esac
   ;;
   
  -#   Apple MacOS X Darwin
  +#   Apple Mac OS X (Darwin)
   *:Darwin:* )
  -AT=`uname -p`
  +#   determine architecture
  +AT=`uname -p`
   case ${AT} in
   powerpc ) AT=PPC ;;
   esac
   AP=${AT}
  -AC=${AP}
  -case ${AC} in
  -i?86 ) AC=iX86 ;;
  +case ${AP} in
  +i?86 ) AP=iX86 ;;
   esac
  -ST=[Apple ]${UNAME_SYSTEM} ${UNAME_RELEASE}
  -SP=${ST}
  -SC=4.4BSD/Mach3
  +AC=${AP}
  +#   determine system
  +unset v1; unset v2; unset v3
  +eval `echo ${UNAME_RELEASE} |\
  +  sed -e 's/^/#/' \
  +  -e 
's/^#\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/v1=\1; v2=\2; 
v3=\3/' \
  +  -e 's/^#\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/v1=\1; 
v2=\2/' \
  +  -e 's/^#\([0-9][0-9]*\).*$/v1=\1/' \
  +  -e 's/^#.*$/v1=0/'`
  +ST=[Apple ]${UNAME_SYSTEM} ${v1}${v2+.$v2}${v3+[.$v3]}
  +SP=$ST
  +v=`(sw_vers) 2/dev/null | grep 'ProductVersion:' | sed -e 
's/^ProductVersion:[^0-9]*\([0-9][0-9.]*\).*$/\1/'`
  +if [ .$v = . ]; then
  +for name in System Server; do
  +if [ -f 
/System/Library/CoreServices/${name}Version.plist ]; then
  +v=`(defaults read 
/System/Library/CoreServices/${name}Version ProductVersion) 2/dev/null`
  +[ .$v != . ]  break
  +fi
  +done
  +fi
  +if [ .$v != . ]; then
  +unset v1; unset v2; unset v3
  +eval `echo ${v} |\
  +  sed -e 's/^/#/' \

[CVS] RPM: rpm/build/ poptBT.c

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 12:40:50
  Branch: HEAD Handle: 2007072411405000

  Modified files:
rpm/build   poptBT.c

  Log:
remove unused variable

  Summary:
RevisionChanges Path
2.14+0  -3  rpm/build/poptBT.c
  

  patch -p0 '@@ .'
  Index: rpm/build/poptBT.c
  
  $ cvs diff -u -r2.13 -r2.14 poptBT.c
  --- rpm/build/poptBT.c23 Jul 2007 18:56:52 -  2.13
  +++ rpm/build/poptBT.c24 Jul 2007 10:40:50 -  2.14
  @@ -54,9 +54,6 @@
   /[EMAIL PROTECTED]@*/
   
   /[EMAIL PROTECTED]@*/
  -static int noBuild = 0;
  -
  -/[EMAIL PROTECTED]@*/
   static int signIt = 0;
   
   /[EMAIL PROTECTED]@*/
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/misc/ glob.c

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 12:54:01
  Branch: HEAD Handle: 2007072411540100

  Modified files:
rpm/miscglob.c

  Log:
MacOS X has an __alloca define in system headers, so explicitly #undef
here

  Summary:
RevisionChanges Path
1.20+1  -0  rpm/misc/glob.c
  

  patch -p0 '@@ .'
  Index: rpm/misc/glob.c
  
  $ cvs diff -u -r1.19 -r1.20 glob.c
  --- rpm/misc/glob.c   19 Jul 2007 19:12:47 -  1.19
  +++ rpm/misc/glob.c   24 Jul 2007 10:54:01 -  1.20
  @@ -48,6 +48,7 @@
   
   # include assert.h
   
  +#undef __alloca
   #define  __allocaalloca
   #define  __stat  stat
   #define  NAMLEN(_d)  NLENGTH(_d)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ configure.ac

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 13:14:10
  Branch: HEAD Handle: 2007072412140900

  Modified files:
rpm configure.ac

  Log:
The Mac OS X (aka Darwin) ld(1) uses a strange non-standard Unix library
search path order. This causes great problems when linking against the
third-party libraries (especially Zlib which exists under Mac OS X in
/usr/lib/libz.dylib, too). Force ld(1) to stick standard Unix search
path order.

  Summary:
RevisionChanges Path
2.218   +8  -0  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.217 -r2.218 configure.ac
  --- rpm/configure.ac  24 Jul 2007 09:01:52 -  2.217
  +++ rpm/configure.ac  24 Jul 2007 11:14:09 -  2.218
  @@ -528,6 +528,14 @@
   m68k-*-amigaos ) CFLAGS=$CFLAGS -Dfork=vfork ;;
   esac
   
  +dnl # platform-hack: The Mac OS X (aka Darwin) ld(1) uses a strange
  +dnl # non-standard Unix library search path order. This causes great
  +dnl # problems when linking against the third-party libraries.
  +dnl # Force ld(1) to stick standard Unix search path order.
  +case $host in
  +*-*-darwin8* ) LDFLAGS=$LDFLAGS -Wl,-search_paths_first ;;
  +esac
  +
   dnl # FIXME: platform-hack: SCO and SunOS 4.x
   if echo $target_os | grep sco  /dev/null; then
AC_DEFINE(NEED_STRINGS_H, 1, [Define as one if we need to include 
strings.h (along with string.h)])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 14:37:29
  Branch: HEAD Handle: 2007072413372900

  Modified files:
rpm devtool.conf

  Log:
RPM successfully ported to one more (esoteric ;-) platform: Mac OS X

  Summary:
RevisionChanges Path
2.73+1  -0  rpm/devtool.conf
  

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.72 -r2.73 devtool.conf
  --- rpm/devtool.conf  24 Jul 2007 10:21:36 -  2.72
  +++ rpm/devtool.conf  24 Jul 2007 12:37:29 -  2.73
  @@ -175,6 +175,7 @@
   ##  o 2007-07-17: sparc64-solaris9-gcc4.1.2
   ##  o 2007-07-17: sparc64-solaris10-gcc4.1.2
   ##  o 2007-07-17: amd64-solaris10-gcc4.1.2
  +##  o 2007-07-24: ppc-macosx10.4-gcc4.0.1
   ##
   
   #   third-party development tools distribution versions
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: file/src/ Makefile.am

2007-07-24 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: file Date:   24-Jul-2007 15:03:34
  Branch: HEAD Handle: 2007072414033400

  Modified files:
file/srcMakefile.am

  Log:
if external -lz is gud enuf for neon, then same for file.

  Summary:
RevisionChanges Path
1.31+3  -3  file/src/Makefile.am
  

  patch -p0 '@@ .'
  Index: file/src/Makefile.am
  
  $ cvs diff -u -r1.30 -r1.31 Makefile.am
  --- file/src/Makefile.am  23 Jul 2007 22:26:47 -  1.30
  +++ file/src/Makefile.am  24 Jul 2007 13:03:34 -  1.31
  @@ -6,7 +6,7 @@
   pkglibdir = @USRLIBRPM@
   MAGIC = $(pkglibdir)/magic
   
  -AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_builddir)/../zlib 
-I$(top_srcdir)/../zlib
  +AM_CPPFLAGS = -I$(top_builddir)/.. # -I$(top_builddir)/../zlib 
-I$(top_srcdir)/../zlib
   AM_CPPFLAGS += -DMAGIC='$(MAGIC)' -DHAVE_LIBZ=1
   
   noinst_HEADERS = file.h magic.h names.h patchlevel.h readelf.h tar.h
  @@ -20,8 +20,8 @@
   
   noinst_PROGRAMS = file
   file_SOURCES = file.c
  -file_LDFLAGS = -L$(top_builddir)/../zlib
  -file_LDADD = libmagic.la -lrpmz
  +file_LDFLAGS = # -L$(top_builddir)/../zlib
  +file_LDADD = libmagic.la # -lrpmz
   
   listobjs:
@echo $(libmagic_la_SOURCES:.c=.lo)  $@
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES build.c rpm/build/ poptBT.c spec.c rpm/lib/ po...

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 16:36:47
  Branch: HEAD Handle: 2007072415364601

  Modified files:
rpm CHANGES build.c rpmpopt.in
rpm/build   poptBT.c spec.c
rpm/lib poptALL.c poptI.c poptQV.c rpmcli.h

  Log:
re-implement --force option (on installation) with a simple POPT alias
instead of twisted and spreaded code.

  Summary:
RevisionChanges Path
1.1517  +1  -0  rpm/CHANGES
2.106   +1  -1  rpm/build.c
2.15+0  -4  rpm/build/poptBT.c
2.151   +1  -2  rpm/build/spec.c
2.38+0  -2  rpm/lib/poptALL.c
2.36+0  -8  rpm/lib/poptI.c
2.42+0  -10 rpm/lib/poptQV.c
2.69+1  -3  rpm/lib/rpmcli.h
2.45+5  -1  rpm/rpmpopt.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1516 -r1.1517 CHANGES
  --- rpm/CHANGES   24 Jul 2007 08:53:00 -  1.1516
  +++ rpm/CHANGES   24 Jul 2007 14:36:46 -  1.1517
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- rse: re-implement --force option (on installation) with a simple POPT 
alias instead of twisted and spreaded code
   - rse: for libraries prefer pkg-config foo before foo-config as 
pkg-config(1) provides more precise CPPFLAGS/CFLAGS
   - rse: unbreak rpm(1) short-hand option --force on package installation
   - rse: use implicit internal library dependencies by default, but allow 
disabling via --disable-build-intlibdep
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build.c
  
  $ cvs diff -u -r2.105 -r2.106 build.c
  --- rpm/build.c   16 Jul 2007 01:32:25 -  2.105
  +++ rpm/build.c   24 Jul 2007 14:36:46 -  2.106
  @@ -255,7 +255,7 @@
   #define  _anyarch(_f)\
   
(((_f)(RPMBUILD_PREP|RPMBUILD_BUILD|RPMBUILD_INSTALL|RPMBUILD_PACKAGEBINARY)) 
== 0)
   if (parseSpec(ts, specURL, ba-rootdir, 0, passPhrase,
  - cookie, _anyarch(buildAmount), ba-force, verify))
  + cookie, _anyarch(buildAmount), 0, verify))
   {
rc = 1;
goto exit;
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/poptBT.c
  
  $ cvs diff -u -r2.14 -r2.15 poptBT.c
  --- rpm/build/poptBT.c24 Jul 2007 10:40:50 -  2.14
  +++ rpm/build/poptBT.c24 Jul 2007 14:36:47 -  2.15
  @@ -118,10 +118,6 @@
rba-noDeps = 1;
break;
   
  -case RPMCLI_POPT_FORCE:
  - rba-force = 1;
  - break;
  -
   }
   }
   /[EMAIL PROTECTED]@*/
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/spec.c
  
  $ cvs diff -u -r2.150 -r2.151 spec.c
  --- rpm/build/spec.c  16 Jul 2007 21:40:34 -  2.150
  +++ rpm/build/spec.c  24 Jul 2007 14:36:47 -  2.151
  @@ -754,14 +754,13 @@
   char * passPhrase = ;
   int recursing = 0;
   char *cookie = NULL;
  -int force = 1;
   int verify = 0;
   int xx;
   
   /[EMAIL PROTECTED]@*/
   /[EMAIL PROTECTED]@*/ /* FIX: make spec abstract */
   if (parseSpec(ts, specName, /, recursing, passPhrase,
  - cookie, anyarch, force, verify)
  + cookie, anyarch, 1, verify)
 || (spec = rpmtsSetSpec(ts, NULL)) == NULL)
   {
rpmError(RPMERR_QUERY,
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/poptALL.c
  
  $ cvs diff -u -r2.37 -r2.38 poptALL.c
  --- rpm/lib/poptALL.c 23 Jul 2007 18:54:53 -  2.37
  +++ rpm/lib/poptALL.c 24 Jul 2007 14:36:47 -  2.38
  @@ -345,8 +345,6 @@
   
{ debug, 'd', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, _debug, -1,
   NULL, NULL },
  - { force, '\0', 0, NULL, RPMCLI_POPT_FORCE,
  - N_(force operation (short hand for --replacepkgs --replacefiles on 
installation and ignores ExcludeArch: directives on building), NULL},
   
   #if defined(POPT_ARGFLAG_RANDOM)
{ rsegfault, '\0', 
POPT_ARG_INT|POPT_ARGFLAG_RANDOM|POPT_ARGFLAG_DOC_HIDDEN,
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/poptI.c
  
  $ cvs diff -u -r2.35 -r2.36 poptI.c
  --- rpm/lib/poptI.c   23 Jul 2007 18:54:53 -  2.35
  +++ rpm/lib/poptI.c   24 Jul 2007 14:36:47 -  2.36
  @@ -190,14 +190,6

[CVS] RPM: rpm/ devtool.conf

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 17:16:45
  Branch: HEAD Handle: 2007072416164500

  Modified files:
rpm devtool.conf

  Log:
there are too many Unix which(1) out there, so change the negative
filter to a positive filter as this has more chance to work everywhere

  Summary:
RevisionChanges Path
2.74+9  -9  rpm/devtool.conf
  

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.73 -r2.74 devtool.conf
  --- rpm/devtool.conf  24 Jul 2007 12:37:29 -  2.73
  +++ rpm/devtool.conf  24 Jul 2007 15:16:45 -  2.74
  @@ -237,7 +237,7 @@
   if [ .$val = .set ]; then
   eval $tool=\\${$variable}\
   else
  -if [ .`(which $tool) 2/dev/null | grep -v '^no'` != . ]; then
  +if [ .`(which $tool) 2/dev/null | egrep '^/'` != . ]; then
   eval $tool=\$tool\
   else
   echo devtool:ERROR: sorry, \$tool\ required in \$PATH (or 
set \$$variable) 12
  @@ -251,17 +251,17 @@
   #   chain is built with the same one in order to avoid incompatibilities)
   if [ .$CC != . ]; then
   cc=$CC
  -elif [ .`(which gcc) 2/dev/null | grep -v '^no'` != . ]; then
  +elif [ .`(which gcc) 2/dev/null | egrep '^/'` != . ]; then
   cc=gcc
  -elif [ .`(which icc) 2/dev/null | grep -v '^no'` != . ]; then
  +elif [ .`(which icc) 2/dev/null | egrep '^/'` != . ]; then
   cc=icc
  -elif [ .`(which cc) 2/dev/null | grep -v '^no'` != . ]; then
  +elif [ .`(which cc) 2/dev/null | egrep '^/'` != . ]; then
   cc=cc
   else
   echo devtool:ERROR: sorry, C compiler (\cc\) required in \$PATH 
(or set \$CC) 12
   exit 1
   fi
  -if [ .`(which ccache) 2/dev/null | grep -v '^no'` != . ]; then
  +if [ .`(which ccache) 2/dev/null | egrep '^/'` != . ]; then
   cc=ccache $cc
   fi
   
  @@ -274,13 +274,13 @@
   name=`echo $file | sed -e 's;^.*/\([^/]*\)$;\1;'`
   for url in `echo $2 | sed -e 's/,/ /g'`; do
   echo -- downloading $url$name
  -if [ .`(which curl) 2/dev/null | grep -v '^no'` != . ]; then
  +if [ .`(which curl) 2/dev/null | egrep '^/'` != . ]; then
   curl -s -o $file $url$name || continue
  -elif [ .`(which wget) 2/dev/null | grep -v '^no'` != . ]; then
  +elif [ .`(which wget) 2/dev/null | egrep '^/'` != . ]; then
   wget -q -O $file $url$name || continue
  -elif [ .`(which fetch) 2/dev/null | grep -v '^no'` != . ]; 
then
  +elif [ .`(which fetch) 2/dev/null | egrep '^/'` != . ]; then
   fetch -o $file $url$name || continue
  -elif [ .`(which lwp-download) 2/dev/null | grep -v '^no'` != 
. ]; then
  +elif [ .`(which lwp-download) 2/dev/null | egrep '^/'` != . 
]; then
   lwp-download $url$name $file || continue
   else
   echo devtool:ERROR: sorry, no download tool found in \$PATH 
(\curl\, \wget\, \fetch\, \lwp-download\) 12
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ configure.ac

2007-07-24 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Jul-2007 21:46:26
  Branch: HEAD Handle: 2007072420462500

  Modified files:
rpm configure.ac

  Log:
link against db-4.6 internal.

  Summary:
RevisionChanges Path
2.220   +1  -1  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.219 -r2.220 configure.ac
  --- rpm/configure.ac  24 Jul 2007 18:48:48 -  2.219
  +++ rpm/configure.ac  24 Jul 2007 19:46:25 -  2.220
  @@ -862,7 +862,7 @@
   DBLIBSRCS=
   RPM_CHECK_LIB(
   [Berkeley-DB], [db],
  -[db-4.5 db], [db_create], [db.h],
  +[db-4.6 db-4.5 db], [db_create], [db.h],
   [yes,internal:external], [db3],
   [ DBLIBSRCS=$DBLIBSRCS db3.c
 AM_CONDITIONAL(WITH_DB, [ true ])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/lib/ fsm.c

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   25-Jul-2007 07:48:16
  Branch: HEAD Handle: 2007072506481600

  Modified files:
rpm/lib fsm.c

  Log:
unbreak build under #undef HAVE_MMAP

  Summary:
RevisionChanges Path
2.125   +0  -2  rpm/lib/fsm.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/fsm.c
  
  $ cvs diff -u -r2.124 -r2.125 fsm.c
  --- rpm/lib/fsm.c 18 Jul 2007 12:53:17 -  2.124
  +++ rpm/lib/fsm.c 25 Jul 2007 05:48:16 -  2.125
  @@ -941,9 +941,7 @@
   struct stat * st = fsm-sb;
   struct stat * ost = fsm-osb;
   size_t left;
  -#if defined(HAVE_MMAP)
   int xx;
  -#endif
   int rc;
   
   st-st_size = (writeData ? ost-st_size : 0);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmdb/ legacy.c

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   25-Jul-2007 07:49:26
  Branch: HEAD Handle: 2007072506492500

  Modified files:
rpm/rpmdb   legacy.c

  Log:
remove warning under #define HAVE_MMAP

  Summary:
RevisionChanges Path
1.32+2  -0  rpm/rpmdb/legacy.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/legacy.c
  
  $ cvs diff -u -r1.31 -r1.32 legacy.c
  --- rpm/rpmdb/legacy.c15 Jul 2007 16:32:17 -  1.31
  +++ rpm/rpmdb/legacy.c25 Jul 2007 05:49:25 -  1.32
  @@ -166,7 +166,9 @@
   int use_mmap;
   int rc = 0;
   int fdno;
  +#if defined(HAVE_MMAP)
   int xx;
  +#endif
   
   /[EMAIL PROTECTED] -internalglobs -mods @*/
   fdno = open_dso(path, pid, fsize);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmio/ rpmdav.c

2007-07-24 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   25-Jul-2007 07:50:01
  Branch: HEAD Handle: 2007072506500100

  Modified files:
rpm/rpmio   rpmdav.c

  Log:
fix building under AIX

  Summary:
RevisionChanges Path
2.42+1  -1  rpm/rpmio/rpmdav.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmdav.c
  
  $ cvs diff -u -r2.41 -r2.42 rpmdav.c
  --- rpm/rpmio/rpmdav.c19 Jul 2007 19:24:40 -  2.41
  +++ rpm/rpmio/rpmdav.c25 Jul 2007 05:50:01 -  2.42
  @@ -1610,7 +1610,7 @@
   dp-d_ino = i + 1;   /* W2DO? */
   dp-d_reclen = 0;/* W2DO? */
   
  -#if !(defined(hpux) || defined(__hpux) || defined(sun))
  +#if !(defined(hpux) || defined(__hpux) || defined(sun) || 
defined(RPM_OS_AIX))
   #if !defined(__APPLE__)  !defined(__FreeBSD_kernel__)  
!defined(__FreeBSD__)  !defined(__NetBSD__)
   dp-d_off = 0;   /* W2DO? */
   #endif
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org