[CVS] RPM: rpm/ Makefile.am configure.ac

2007-06-19 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:   19-Jun-2007 16:48:19
  Branch: HEAD Handle: 2007061915481900

  Modified files:
rpm Makefile.am configure.ac

  Log:
the variable LIBMISC is never actually set to a value in this build
environment so nuke it

  Summary:
RevisionChanges Path
2.169   +1  -2  rpm/Makefile.am
2.92+0  -2  rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.168 -r2.169 Makefile.am
  --- rpm/Makefile.am   19 Jun 2007 12:46:26 -  2.168
  +++ rpm/Makefile.am   19 Jun 2007 14:48:19 -  2.169
  @@ -40,8 +40,7 @@
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/rpmio/librpmio.la \
@WITH_POPT_LIB@ \
  - @WITH_ZLIB_LIB@ \
  - @LIBMISC@
  + @WITH_ZLIB_LIB@
   
   bin_PROGRAMS =   rpm rpmbuild
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.91 -r2.92 configure.ac
  --- rpm/configure.ac  19 Jun 2007 14:45:36 -  2.91
  +++ rpm/configure.ac  19 Jun 2007 14:48:19 -  2.92
  @@ -1418,8 +1418,6 @@
   AC_SUBST(testdir)
   
   AC_SUBST(INCPATH)
  -AC_SUBST(LIBMISC)
  -
   AC_SUBST(RPM)
   
   AC_CONFIG_SUBDIRS(popt zlib file sqlite db3)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ Makefile.am configure.ac

2007-06-20 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:   20-Jun-2007 18:50:21
  Branch: HEAD Handle: 2007062017502000

  Modified files:
rpm Makefile.am configure.ac

  Log:
move the remaining -fpie stuff also to configure.ac and under the
Linux section for now

  Summary:
RevisionChanges Path
2.170   +2  -2  rpm/Makefile.am
2.96+1  -1  rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.169 -r2.170 Makefile.am
  --- rpm/Makefile.am   19 Jun 2007 14:48:19 -  2.169
  +++ rpm/Makefile.am   20 Jun 2007 16:50:20 -  2.170
  @@ -54,13 +54,13 @@
   rpm_LDFLAGS =$(myLDFLAGS) $(staticLDFLAGS)
   rpm_LDADD =  rpm.o $(top_builddir)/build/.libs/librpmbuild.a 
$(myLDADD)
   rpm.o:   $(top_srcdir)/rpmqv.c
  - $(COMPILE) -fpie -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK 
-DIAM_RPMQV -o $@ -c $<
  + $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV 
-o $@ -c $<
   
   rpmbuild_SOURCES =   $(top_srcdir)/build.c
   rpmbuild_LDFLAGS =   $(myLDFLAGS) $(staticLDFLAGS)
   rpmbuild_LDADD = rpmbuild.o $(top_builddir)/build/librpmbuild.la 
$(myLDADD)
   rpmbuild.o: $(top_srcdir)/rpmqv.c
  - $(COMPILE) -fpie -DIAM_RPMBT -o $@ -c $<
  + $(COMPILE) -DIAM_RPMBT -o $@ -c $<
   
   $(PROGRAMS): $(myLDADD) @WITH_APIDOCS_TARGET@
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.95 -r2.96 configure.ac
  --- rpm/configure.ac  20 Jun 2007 10:22:46 -  2.95
  +++ rpm/configure.ac  20 Jun 2007 16:50:20 -  2.96
  @@ -39,7 +39,7 @@
   CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
   CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wstrict-prototypes 
-Wmissing-prototypes -Wno-char-subscripts"
   case "$target" in
  -*-*-linux* ) LDFLAGS="$LDFLAGS -pie" ;;
  +*-*-linux* ) CFLAGS="$CFLAGS -fpie"; LDFLAGS="$LDFLAGS -pie" ;;
   esac
   fi
   export CFLAGS LDFLAGS
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ Makefile.am configure.ac

2007-06-20 Thread Arkadiusz Miskiewicz 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Arkadiusz Miskiewicz
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-Jun-2007 23:42:24
  Branch: HEAD Handle: 2007062022422400

  Modified files:
rpm Makefile.am configure.ac

  Log:
po/ and m4/ really shouldn't be here. gettextize adds these.

  Summary:
RevisionChanges Path
2.172   +1  -1  rpm/Makefile.am
2.99+1  -1  rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.171 -r2.172 Makefile.am
  --- rpm/Makefile.am   20 Jun 2007 21:10:19 -  2.171
  +++ rpm/Makefile.am   20 Jun 2007 21:42:24 -  2.172
  @@ -4,7 +4,7 @@
   
   LINT = splint
   
  -EXTRA_DIST = m4/ChangeLog  config.rpath m4/ChangeLog  CHANGES CREDITS 
Doxyheader GROUPS INSTALL \
  +EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS INSTALL \
autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
config.site db db3/configure installplatform platform* \
perl/Changes perl/MANIFEST perl/META.yml perl/Makefile.PL \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.98 -r2.99 configure.ac
  --- rpm/configure.ac  20 Jun 2007 21:21:18 -  2.98
  +++ rpm/configure.ac  20 Jun 2007 21:42:24 -  2.99
  @@ -1295,7 +1295,7 @@
   
   AC_CONFIG_SUBDIRS()
   
  -AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec 
po/Makefile.in
  +AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
scripts/Makefile
scripts/macros.perl scripts/macros.php scripts/macros.python
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ Makefile.am configure.ac

2007-06-26 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:   26-Jun-2007 21:21:13
  Branch: HEAD Handle: 2007062620211300

  Modified files:
rpm Makefile.am configure.ac

  Log:
there is no need for an internal Neon (no modifications necessary) and
RPM should be able to (hopefully) build without zlib, too. BeeCrypt is
external already external only, so remove glue code

  Summary:
RevisionChanges Path
2.178   +0  -2  rpm/Makefile.am
2.142   +7  -12 rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.177 -r2.178 Makefile.am
  --- rpm/Makefile.am   26 Jun 2007 18:19:08 -  2.177
  +++ rpm/Makefile.am   26 Jun 2007 19:21:13 -  2.178
  @@ -25,8 +25,6 @@
@WITH_ZLIB_SUBDIR@ \
@WITH_LUA_SUBDIR@ \
@WITH_FILE_SUBDIR@ \
  - @WITH_NEON_SUBDIR@ \
  - @WITH_BEECRYPT_SUBDIR@ \
rpmio \
rpmdb \
lib \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.141 -r2.142 configure.ac
  --- rpm/configure.ac  26 Jun 2007 18:47:21 -  2.141
  +++ rpm/configure.ac  26 Jun 2007 19:21:13 -  2.142
  @@ -688,7 +688,7 @@
   RPM_CHECK_LIB(
   [ZLib], [zlib],
   [z gz], [gzread], [zlib.h],
  -[yes,internal], [zlib],
  +[yes,internal:none], [zlib],
   [ AC_CHECK_FUNC(gzseek)
 if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
 AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have ])
  @@ -713,18 +713,13 @@
   RPM_CHECK_LIB(
   [Neon], [neon],
   [neon], [ne_session_create], [ne_session.h],
  -[yes,external:internal], [neon:src:src],
  -[ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
  +[yes,external], [],
  +[ AC_CHECK_LIB(neon, ne_get_response_header, [
 AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1,
  -[Define to 1 if you have ne_get_response_header() in 
libneon.])
  -  else
  -  AC_CHECK_LIB(neon, ne_get_response_header, [
  -  AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1,
  -[Define to 1 if you have ne_get_response_header() in 
libneon.]) ])
  -  AC_CHECK_LIB(neon, ne_send_request_chunk, [
  -  AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1,
  -[Define to 1 if you have ne_send_request_chunk() in 
libneon.]) ])
  -  fi
  +[Define to 1 if you have ne_get_response_header() in 
libneon.]) ])
  +  AC_CHECK_LIB(neon, ne_send_request_chunk, [
  +  AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1,
  +[Define to 1 if you have ne_send_request_chunk() in 
libneon.]) ])
   ], [ AC_ERROR([mandatory Neon library not found]) ])
   
   dnl # File (magic)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ Makefile.am configure.ac

2010-11-02 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   02-Nov-2010 16:57:11
  Branch: HEAD Handle: 2010110215571000

  Modified files:
rpm Makefile.am configure.ac

  Log:
- ruby: stub-out WITH_RUBY_CPPFLAGS and WITH_RUBY_VENDORARCHDIR for now.
- autofu: sync with rpm-5_3.

  Summary:
RevisionChanges Path
2.261   +10 -37 rpm/Makefile.am
2.470   +17 -26 rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.260 -r2.261 Makefile.am
  --- rpm/Makefile.am   18 Oct 2010 04:21:17 -  2.260
  +++ rpm/Makefile.am   2 Nov 2010 15:57:10 -   2.261
  @@ -1,47 +1,22 @@
   # Top level Makefile for rpm
   
   AUTOMAKE_OPTIONS = 1.4 foreign
  +ACLOCAL_AMFLAGS = -I m4
   
   LINT = splint
   MCCABE = pmccabe
   
  -# xar xz
  -# 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*
  -#
   EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL INSTALL.developer 
cpuinfo.yaml \
  - autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
  - pcre syck js \
  - lua/[A-Z]* lua/*.[ch] lua/local/l* \
  - ruby/*.[ch] ruby/Makefile.in ruby/Makefile.am \
  - macros/*.in \
  - perl/typemap \
  - perl/Makefile.PL.in \
  - perl/t/00.pod.t perl/t/00.pod.coverage.t \
  - perl/rpmxs.c perl/rpmxs.h \
  - perl/RPM.xs perl/RPM.pm perl/t/01.rpm.t \
  - perl/RPM/Constant.pm perl/RPM_Constant.xs perl/t/02.rpmconstant.t \
  - perl/RPM_Header.xs perl/RPM/Header.pm perl/t/03.header.t \
  - perl/RPM_Transaction.xs perl/RPM/Transaction.pm perl/t/04.transaction.t 
\
  - perl/RPM_PackageIterator.xs perl/RPM/PackageIterator.pm 
perl/t/05.packageiterator.t \
  - perl/RPM_Problems.xs perl/RPM/Problems.pm perl/t/06.problems.t \
  - perl/RPM_Files.xs perl/RPM/Files.pm perl/t/07.files.t \
  - perl/RPM_Dependencies.xs perl/RPM/Dependencies.pm 
perl/t/08.dependencies.t \
  - perl/RPM_Spec.xs perl/RPM/Spec.pm perl/t/09.spec.t \
  - perl/hdlist-test.hdr perl/test-rpm-1.0-1.noarch.rpm 
perl/test-rpm-1.0-1.src.rpm perl/test-rpm.spec \
  - perl/META.yml perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in \
  - perl/README \
  + autodeps autogen.sh \
  + syck js \
  + lua \
  + ruby \
  + macros \
  + perl \
pubkeys/JBJ-GPG-KEY \
  - po/*.in po/*.po po/rpm.pot \
rpm.magic rpmqv.c \
  - python/mpw/Makefile.am python/mpw/test/* python/test/resources/* 
python/test/dscmp \
  - python/test/psTest.py python/test/testhdr python/test/testit 
python/test/testmi \
  - python/test/testrollback.py python/test/dsMerge.py 
python/test/test_rpm.py \
  - python/rpm/__init__.py python/[a-z]* python/Makefile.in 
python/Makefile.am \
  - rpmio/auto/*.in \
  - rpmdb/auto/*.in \
  - lib/auto/*.in \
  - build/auto/*.in \
  + python \
  + tests/arbitrarytag-1.0-1.src.rpm \
tests/cudf-test-1-0.src.rpm \
tests/devtool-sanity-1.0-1.src.rpm \
tests/edos-test-1-0.src.rpm \
  @@ -61,9 +36,9 @@
   endif
   SUBDIRS += \
@WITH_DB_SUBDIR@ \
  - @WITH_POPT_SUBDIR@ \
@WITH_ZLIB_SUBDIR@ \
@WITH_PCRE_SUBDIR@ \
  + @WITH_POPT_SUBDIR@ \
@WITH_LUA_SUBDIR@ \
@WITH_BEECRYPT_SUBDIR@ \
@WITH_NEON_SUBDIR@ \
  @@ -308,5 +283,3 @@
cscope -b -R
   
   cref: ctags cscope
  -
  -ACLOCAL_AMFLAGS = -I m4
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.469 -r2.470 configure.ac
  --- rpm/configure.ac  27 Oct 2010 00:58:01 -  2.469
  +++ rpm/configure.ac  2 Nov 2010 15:57:10 -   2.470
  @@ -8,8 +8,8 @@
   
   AC_PREREQ(2.63)
   m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
  -AC_INIT([rpm],[5.4.DEVEL],[PACKAGE_BUGREPORT_DEFAULT])
  -PACKAGE_TIMESTAMP="2009" dnl # [-MM[-DD[ HH[:MM
  +AC_INIT([rpm],[5.5.DEVEL],[PACKAGE_BUGREPORT_DEFAULT])
  +PACKAGE_TIMESTAMP="2010-09-18" dnl # [-MM[-DD[ HH[:MM
   AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
   
   AC_MSG_HEADER([INITIALIZATION])
  @@ -96,7 +96,6 @@
   AC_SUBST([RPM_TIMESTAMP])
   AC_SUBST([RPM_VENDOR])
   
  -
   dnl ##
   dnl ##  TOOL-CHAIN CHECKS 
   dnl ##
  @@ -156,7 +155,7 @@
   if test ".$enableval" = .yes; then
   if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
   dn

[CVS] RPM: rpm/ Makefile.am configure.ac

2010-12-01 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   01-Dec-2010 16:00:46
  Branch: HEAD Handle: 2010120115003802

  Modified files:
rpm Makefile.am configure.ac

  Log:
- typo in version, don't add arbitrarytag*.src.rpm yet.

  Summary:
RevisionChanges Path
2.262   +0  -1  rpm/Makefile.am
2.471   +1  -1  rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.261 -r2.262 Makefile.am
  --- rpm/Makefile.am   2 Nov 2010 15:57:10 -   2.261
  +++ rpm/Makefile.am   1 Dec 2010 15:00:40 -   2.262
  @@ -16,7 +16,6 @@
pubkeys/JBJ-GPG-KEY \
rpm.magic rpmqv.c \
python \
  - tests/arbitrarytag-1.0-1.src.rpm \
tests/cudf-test-1-0.src.rpm \
tests/devtool-sanity-1.0-1.src.rpm \
tests/edos-test-1-0.src.rpm \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.470 -r2.471 configure.ac
  --- rpm/configure.ac  2 Nov 2010 15:57:10 -   2.470
  +++ rpm/configure.ac  1 Dec 2010 15:00:38 -   2.471
  @@ -8,7 +8,7 @@
   
   AC_PREREQ(2.63)
   m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
  -AC_INIT([rpm],[5.5.DEVEL],[PACKAGE_BUGREPORT_DEFAULT])
  +AC_INIT([rpm],[5.4.DEVEL],[PACKAGE_BUGREPORT_DEFAULT])
   PACKAGE_TIMESTAMP="2010-09-18" dnl # [-MM[-DD[ HH[:MM
   AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ Makefile.am configure.ac rpm/doc/ Makefile.am

2007-07-04 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:   04-Jul-2007 19:31:16
  Branch: HEAD Handle: 2007070418311600

  Modified files:
rpm Makefile.am configure.ac
rpm/doc Makefile.am

  Log:
simplify the NLS Autoconf processing by leveraging Automake features
and use this functionality also in the doc/ subdir

  Summary:
RevisionChanges Path
2.185   +6  -2  rpm/Makefile.am
2.162   +1  -3  rpm/configure.ac
1.13+4  -1  rpm/doc/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.184 -r2.185 Makefile.am
  --- rpm/Makefile.am   4 Jul 2007 16:32:44 -   2.184
  +++ rpm/Makefile.am   4 Jul 2007 17:31:16 -   2.185
  @@ -18,8 +18,12 @@
po/*.in po/*.po po/rpm.pot \
rpm.magic rpmqv.c rpm.c
   
  -SUBDIRS = \
  - @ENABLE_NLS_SUBDIR@ \
  +SUBDIRS =
  +if USE_NLS
  +SUBDIRS += \
  + po
  +endif
  +SUBDIRS += \
@WITH_DB_SUBDIR@ \
@WITH_ZLIB_SUBDIR@ \
@WITH_LUA_SUBDIR@ \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.161 -r2.162 configure.ac
  --- rpm/configure.ac  4 Jul 2007 16:32:44 -   2.161
  +++ rpm/configure.ac  4 Jul 2007 17:31:16 -   2.162
  @@ -406,9 +406,7 @@
   AC_CHECK_HEADERS(locale.h)
   AM_GNU_GETTEXT_VERSION(0.16)
   AM_GNU_GETTEXT([external])
  -ENABLE_NLS_SUBDIR=""
  -test ".$USE_NLS" = .yes && ENABLE_NLS_SUBDIR="po"
  -AC_SUBST([ENABLE_NLS_SUBDIR])
  +AM_CONDITIONAL(USE_NLS, [ test ".$USE_NLS" = .yes ])
   
   dnl # specific features
   AC_SYS_LARGEFILE
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/doc/Makefile.am
  
  $ cvs diff -u -r1.12 -r1.13 Makefile.am
  --- rpm/doc/Makefile.am   24 Oct 2002 21:36:15 -  1.12
  +++ rpm/doc/Makefile.am   4 Jul 2007 17:31:16 -   1.13
  @@ -1,6 +1,9 @@
   ## Process this file with automake to produce Makefile.in
   
  -SUBDIRS  = manual fr ja ko pl ru sk
  +SUBDIRS  = manual
  +if USE_NLS
  +SUBDIRS  += fr ja ko pl ru sk
  +endif
   
   man_MANS = gendiff.1 rpm.8 rpmbuild.8 rpmcache.8 rpmdeps.8 rpmgraph.8 
rpm2cpio.8
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ Makefile.am configure.ac rpm/perl/ .cvsignore rpm/ rpm...

2007-06-10 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:   11-Jun-2007 03:42:11
  Branch: HEAD Handle: 2007061102421001

  Modified files:
rpm Makefile.am configure.ac rpm.spec.in
rpm/perl.cvsignore
rpm/rpmdb   .cvsignore Makefile.am

  Log:
add version stamp to macros.
rename Berkeley DB utilities back to original name.

  Summary:
RevisionChanges Path
2.164   +7  -6  rpm/Makefile.am
2.75+1  -1  rpm/configure.ac
1.3 +3  -2  rpm/perl/.cvsignore
2.435   +36 -35 rpm/rpm.spec.in
1.10+12 -12 rpm/rpmdb/.cvsignore
1.54+27 -27 rpm/rpmdb/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.163 -r2.164 Makefile.am
  --- rpm/Makefile.am   10 Jun 2007 23:29:04 -  2.163
  +++ rpm/Makefile.am   11 Jun 2007 01:42:10 -  2.164
  @@ -8,7 +8,7 @@
autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
config.site db db3/configure gendiff installplatform platform* \
perl/* \
  - wdj/JBJ-GPG-KEY wdj/Makefile.in wnh/Makefile.in \
  + pubkeys/JBJ-GPG-KEY \
po/*.in po/*.po po/rpm.pot \
rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
   
  @@ -44,20 +44,21 @@
   
   pkglibdir =  @USRLIBRPM@
   pkglib_PROGRAMS =rpmb
  -pkglib_DATA =rpmpopt-$(VERSION) macros
  +pkglib_DATA =rpmpopt-$(VERSION) macros-$(VERSION)
   
   rpmpopt-$(VERSION): rpmpopt
cp rpmpopt $@
   
  +macros-$(VERSION): macros
  + cp macros $@
  +
   noinst_HEADERS = build.h debug.h system.h
   
  -rpm_SOURCES =
  +rpm_SOURCES =$(top_srcdir)/build.c
   rpm_LDFLAGS =$(myLDFLAGS) $(staticLDFLAGS)
   rpm_LDADD =  rpm.o $(top_builddir)/build/.libs/librpmbuild.a 
$(myLDADD)
  -#rpm_LDFLAGS =   $(myLDFLAGS)
  -#rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a 
$(myLDADD)
   rpm.o:   $(top_srcdir)/rpmqv.c
  - $(COMPILE) -fpie -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ 
-c $<
  + $(COMPILE) -fpie -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK 
-DIAM_RPMQV -o $@ -c $<
   
   rpmb_SOURCES =   $(top_srcdir)/build.c
   rpmb_LDFLAGS =   $(myLDFLAGS) $(staticLDFLAGS)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.74 -r2.75 configure.ac
  --- rpm/configure.ac  10 Jun 2007 23:29:04 -  2.74
  +++ rpm/configure.ac  11 Jun 2007 01:42:10 -  2.75
  @@ -1468,7 +1468,7 @@
[Full path to rpm system configuration directory (usually /etc/rpm)])
   AC_SUBST(SYSCONFIGDIR)
   
  
-MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros"
  
+MACROFILES="${USRLIBRPM}/macros-${VERSION}:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros"
   AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES",
[Colon separated paths of macro files to read.])
   AC_SUBST(MACROFILES)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/perl/.cvsignore
  
  $ cvs diff -u -r1.2 -r1.3 .cvsignore
  --- rpm/perl/.cvsignore   16 Jul 1999 08:46:16 -  1.2
  +++ rpm/perl/.cvsignore   11 Jun 2007 01:42:11 -  1.3
  @@ -1,5 +1,6 @@
  -rpm.bs
  -rpm.c
  +RPM-*
  +RPM.bs
  +RPM.c
   pm_to_blib
   Makefile
   blib
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpm.spec.in
  
  $ cvs diff -u -r2.434 -r2.435 rpm.spec.in
  --- rpm/rpm.spec.in   10 Jun 2007 23:29:04 -  2.434
  +++ rpm/rpm.spec.in   11 Jun 2007 01:42:10 -  2.435
  @@ -4,6 +4,9 @@
   %define  with_bzip2  @[EMAIL PROTECTED]
   %define  with_apidocs@[EMAIL PROTECTED]
   
  +# XXX ignore unpackaged files for now
  +%define _unpackaged_files_terminate_build  0
  +
   %{!?_usrlibrpm:%global _usrlibrpm @[EMAIL PROTECTED]
   
   %define  __prefix%{?_prefix}%{!?_prefix:/usr}
  @@ -262,16 +265,14 @@
   %endif
   
   %files -f rpm.lang
  -%doc CHANGES GROUPS doc/manual/[a-z]*
  -# XXX add to EXTRAS
  -#%pubkey pubkeys/JBJ-GPG-KEY
  +#XXX %doc CHANGES GROUPS doc/manual/[a-z]*
  +%pubkey pubkeys/JBJ-GP