[CVS] RPM: rpm-5_4: rpm/ Makefile.am autogen.sh configure.ac devtool.c...

2017-07-16 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:   16-Jul-2017 20:15:42
  Branch: rpm-5_4  Handle: 2017071618154100

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am autogen.sh configure.ac devtool.conf

  Log:
- configuration for --with-zstd=internal etc.

  Summary:
RevisionChanges Path
2.263.2.48  +9  -4  rpm/Makefile.am
2.110.2.19  +22 -7  rpm/autogen.sh
2.472.2.179 +47 -1  rpm/configure.ac
2.365.2.114 +31 -3  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.47 -r2.263.2.48 Makefile.am
  --- rpm/Makefile.am   12 Jun 2017 06:46:18 -  2.263.2.47
  +++ rpm/Makefile.am   16 Jul 2017 18:15:41 -  2.263.2.48
  @@ -8,12 +8,17 @@
--prefix=/usr \
   --libdir=/usr/lib64 \
   --enable-shared \
  - --with-db \
  + --with-db=/usr/lib64:/usr/include/db62 \
--with-dbsql \
  - --without-db-tools-intergrated \
  + --without-db-tools-integrated \
--with-zlib \
--with-bzip2 \
--with-xz \
  + --with-zstd=no \
  + --with-snappy=no \
  + --with-lz4=no \
  + --with-brotli=no \
  + --with-lzfse=no \
   --with-file \
   --with-path-magic=/usr/share/file/magic \
   --with-lua \
  @@ -182,10 +187,10 @@
@WITH_DB_SUBDIR@ \
@WITH_ZLIB_SUBDIR@ \
@WITH_ZSTD_SUBDIR@ \
  - @WITH_BROTLI_SUBDIR@ \
  + @WITH_LZ4_SUBDIR@ \
@WITH_SNAPPY_SUBDIR@ \
  + @WITH_BROTLI_SUBDIR@ \
@WITH_LZFSE_SUBDIR@ \
  - @WITH_LZ4_SUBDIR@ \
@WITH_PCRE_SUBDIR@ \
@WITH_POPT_SUBDIR@ \
@WITH_LUA_SUBDIR@ \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/autogen.sh
  
  $ cvs diff -u -r2.110.2.18 -r2.110.2.19 autogen.sh
  --- rpm/autogen.sh12 Jun 2017 06:46:46 -  2.110.2.18
  +++ rpm/autogen.sh16 Jul 2017 18:15:41 -  2.110.2.19
  @@ -1376,20 +1376,35 @@
   ( cd $dir && cmake . && 
echo "check: test" >> Makefile &&
echo "distclean: clean" >> Makefile
  - cp *.la lib/
  - mkdir lib/.libs
  - ln -sf ../libflatccrt.a lib/.libs/libflatccrt.a
  + #cp *.la lib/
  + #mkdir -p lib/.libs
  + #ln -sf ../libflatccrt.a lib/.libs/libflatccrt.a
   )
   ;;
  -  brotli)
  -;;
  -  lzfse)
  +  zstd)
   ;;
 lz4)
   ;;
 snappy)
  +( cd $dir && sh ./autogen.sh )
   ;;
  -  zstd)
  +  brotli)
  +( cd $dir && ./configure-cmake --prefix=/usr --libdir=/usr/lib64 &&
  + echo "check: test" >> ../Makefile &&
  + echo "distclean: clean" >> ../Makefile
  +)
  +;;
  +  lzfse)
  +( cd $dir
  +cmake . \
  +-DLZFSE_BUNDLE_MODE:BOOL=OFF \
  +-DBUILD_SHARED_LIBS:BOOL=ON \
  +-DCMAKE_INSTALL_BINDIR:PATH=/usr/bin \
  +-DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib64 \
  +-DCMAKE_INSTALL_INCLUDEDIR:PATH=/usr/include
  + echo "check: test" >> Makefile
  + echo "distclean: clean"
  +)
   ;;
 libgit2)
   ( cd $dir && cmake . && 
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.178 -r2.472.2.179 configure.ac
  --- rpm/configure.ac  16 Jul 2017 04:20:02 -  2.472.2.178
  +++ rpm/configure.ac  16 Jul 2017 18:15:41 -  2.472.2.179
  @@ -2403,9 +2403,36 @@
   dnl # Google Brotli
   RPM_CHECK_LIB(
   [Google Brotli], [brotli],
  -[brotli], [XXX], [version.h],
  +[brotlienc], [BrotliGetDictionary], [brotli/types.h],
   [no,internal:external:none], [brotli:c/include],
   [
  +AC_CHECK_FUNCS(BrotliGetDictionary)
  +AC_CHECK_FUNCS(BrotliSetDictionaryData)
  +AC_CHECK_FUNCS(BrotliEncoderCompress)
  +AC_CHECK_FUNCS(BrotliEncoderCompressStream)
  +AC_CHECK_FUNCS(BrotliEncoderCreateInstance)
  +AC_CHECK_FUNCS(BrotliEncoderDestroyInstance)
  +AC_CHECK_FUNCS(BrotliEncoderHasMoreOutput)
  +AC_CHECK_FUNCS(BrotliEncoderIsFinished)
  +AC_CHECK_FUNCS(BrotliEncoderMaxCompressedSize)
  +AC_CHECK_FUNCS(BrotliEncoderSetCustomDictionary)
  +AC_CHECK_FUNCS(BrotliEncoderSetParameter)
  +AC_CHECK_FUNCS(BrotliEncoderTakeOutput)
  +AC_CHECK_FUNCS(BrotliEncoderVersion)
  +LIBS="-lbrotlidec $LIBS"
  +

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2017-06-12 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:   12-Jun-2017 08:46:18
  Branch: rpm-5_4  Handle: 2017061206461800

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
- orphan.

  Summary:
RevisionChanges Path
2.263.2.47  +5  -0  rpm/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.46 -r2.263.2.47 Makefile.am
  --- rpm/Makefile.am   16 Jan 2017 18:58:06 -  2.263.2.46
  +++ rpm/Makefile.am   12 Jun 2017 06:46:18 -  2.263.2.47
  @@ -181,6 +181,11 @@
@WITH_FLATCC_SUBDIR@ \
@WITH_DB_SUBDIR@ \
@WITH_ZLIB_SUBDIR@ \
  + @WITH_ZSTD_SUBDIR@ \
  + @WITH_BROTLI_SUBDIR@ \
  + @WITH_SNAPPY_SUBDIR@ \
  + @WITH_LZFSE_SUBDIR@ \
  + @WITH_LZ4_SUBDIR@ \
@WITH_PCRE_SUBDIR@ \
@WITH_POPT_SUBDIR@ \
@WITH_LUA_SUBDIR@ \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am autogen.sh configure.ac system.h

2016-12-23 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:   23-Dec-2016 17:51:37
  Branch: rpm-5_4  Handle: 2016122316513700

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am autogen.sh configure.ac system.h

  Log:
- sanity.

  Summary:
RevisionChanges Path
2.263.2.45  +14 -15 rpm/Makefile.am
2.110.2.16  +2  -0  rpm/autogen.sh
2.472.2.154 +12 -0  rpm/configure.ac
2.129.2.21  +0  -46 rpm/system.h
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.44 -r2.263.2.45 Makefile.am
  --- rpm/Makefile.am   22 Jun 2016 22:58:28 -  2.263.2.44
  +++ rpm/Makefile.am   23 Dec 2016 16:51:37 -  2.263.2.45
  @@ -477,12 +477,13 @@
   lcov-run:
@rm -rf lcov
@__LCOV@ -d . --zerocounters
  - $(MAKE) check
  - $(MAKE) -C popt check
  - $(MAKE) -C pcre check
  - $(MAKE) -C beecrypt check
  - $(MAKE) -C tests clean test
  - $(MAKE) -C tests check-repo
  + -$(MAKE) -k -j8 check
  +#-$(MAKE) -k -C popt check
  +#-$(MAKE) -k -C pcre check
  +#-$(MAKE) -k -C neon check
  +#-$(MAKE) -k -C beecrypt check
  + -$(MAKE) -k -C tests test
  + -$(MAKE) -k -C tests check-repo
   
   .PHONY:  lcov-report # generate report based on current coverage data
   lcov-report:
  @@ -491,24 +492,22 @@
@find rpmdb/auto -name '*.gcda' -exec rm -f {} \;
@find lib/auto -name '*.gcda' -exec rm -f {} \;
@find build/auto -name '*.gcda' -exec rm -f {} \;
  + @rm -f gnulib/tests/test-verify.gcda
  + @rm -f rpmio/duktape.gcda
  + @rm -f tests/mongoc/mock_server/*.gcda
@__LCOV@ -q --no-external \
  +   -d gnulib/tests \
  +   -d tests/bson \
  +   -d tests/mongoc \
  -d popt \
  -d beecrypt \
  -d lua/local \
  -d lua \
  -   -d misc \
  -d neon \
  -   -d pcre \
  -   -d syck \
  +   -d misc \
  -d rpmio \
  -d rpmdb \
  -d lib \
  -   -d build \
  -   -d tools \
  -   -d tests/bson \
  -   -d tests/mongoc \
  -   -d tests/yajl \
  -   -d tests \
  -d . \
  --capture --output-file lcov/lcov.info
genhtml -q -t "${PACKAGE_STRING}" -o lcov lcov/lcov.info
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/autogen.sh
  
  $ cvs diff -u -r2.110.2.15 -r2.110.2.16 autogen.sh
  --- rpm/autogen.sh24 Jun 2016 18:55:37 -  2.110.2.15
  +++ rpm/autogen.sh23 Dec 2016 16:51:37 -  2.110.2.16
  @@ -1368,6 +1368,8 @@
 --avoid closedir  \
 --avoid opendir   \
 --avoid readdir   \
  +  --avoid fclose\
  +  --avoid fflush\
 --import $gnulib_modules
   ;;
 libgit2)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.153 -r2.472.2.154 configure.ac
  --- rpm/configure.ac  11 Jul 2016 20:26:53 -  2.472.2.153
  +++ rpm/configure.ac  23 Dec 2016 16:51:37 -  2.472.2.154
  @@ -673,6 +673,7 @@
   fi
   if test \( ".`$CC --version 2>&1 | grep 'clang'`" != . \); then
   rpm_CPPFLAGS_ADD([--coverage], [CPPFLAGS])
  +rpm_LDFLAGS_ADD([--coverage], [LDFLAGS])
   fi
   fi
   ])
  @@ -691,6 +692,7 @@
   fi
   if test \( ".`$CC --version 2>&1 | grep 'clang'`" != . \); then
   rpm_CPPFLAGS_ADD([-fsanitize=address], [CPPFLAGS])
  +rpm_LDFLAGS_ADD([-fsanitize=address], [LDFLAGS])
   fi
   fi
   ])
  @@ -706,6 +708,7 @@
   if test \( ".`$CC --version 2>&1 | grep 'clang'`" != . \); then
   rpm_CPPFLAGS_ADD([-fsanitize=memory], [CPPFLAGS])
   rpm_CPPFLAGS_ADD([-fsanitize=memory 
-fsanitize-memory-track-origins=2 -fno-omit-frame-pointer], [CPPFLAGS])
  +rpm_LDFLAGS_ADD([-fsanitize=memory], [LDFLAGS])
   fi
   fi
   ])
  @@ -720,6 +723,7 @@
   fi
   if test \( ".`$CC --version 2>&1 | grep 'clang'`" != . \); then
   rpm_CPPFLAGS_ADD([-fsanitize=thread], [CPPFLAGS])
  +rpm_LDFLAGS_ADD([-fsanitize=thread], [LDFLAGS])
   fi
   fi
   ])
  @@ -734,6 +738,7 @@
   fi
   if test \( ".`$CC --version 2>&1 | grep 'clang'`" != . \); then

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2016-04-20 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:   20-Apr-2016 11:44:29
  Branch: rpm-5_4  Handle: 2016042009442900

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
- adjust "make distcheck" build options slightly.

  Summary:
RevisionChanges Path
2.263.2.41  +11 -4  rpm/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.40 -r2.263.2.41 Makefile.am
  --- rpm/Makefile.am   14 Mar 2016 06:28:16 -  2.263.2.40
  +++ rpm/Makefile.am   20 Apr 2016 09:44:29 -  2.263.2.41
  @@ -6,6 +6,8 @@
   AM_DISTCHECK_CONFIGURE_FLAGS = \
   --verbose \
--prefix=/usr \
  +--libdir=/usr/lib64 \
  +--enable-shared \
--with-db \
--with-dbsql \
--without-db-tools-intergrated \
  @@ -17,7 +19,7 @@
   --with-lua \
   --with-tcl \
   --without-sqlite \
  ---with-syck \
  +--with-syck=internal \
   --with-readline \
   --without-augeas \
   --with-beecrypt=internal \
  @@ -31,9 +33,11 @@
   --without-pakchois \
   --without-gnutls \
   --with-neon=internal \
  +--enable-threadsafe-ssl \
  +--with-ssl=openssl \
   --without-libproxy \
   --with-expat \
  ---with-pcre \
  +--with-pcre=internal \
   --enable-utf \
   --with-uuid=system \
   --with-attr \
  @@ -473,7 +477,7 @@
   lcov-run:
@rm -rf lcov
@__LCOV@ -d . --zerocounters
  -#$(MAKE) check
  + $(MAKE) check
$(MAKE) -C popt check
$(MAKE) -C pcre check
$(MAKE) -C beecrypt check
  @@ -490,10 +494,12 @@
@__LCOV@ -q --no-external \
  -d popt \
  -d beecrypt \
  -   -d neon \
  -d lua/local \
  -d lua \
  -d misc \
  +   -d neon \
  +   -d pcre \
  +   -d syck \
  -d rpmio \
  -d rpmdb \
  -d lib \
  @@ -501,6 +507,7 @@
  -d tools \
  -d tests/bson \
  -d tests/mongoc \
  +   -d tests/yajl \
  -d tests \
  -d . \
  --capture --output-file lcov/lcov.info
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am rpm/build/ .cppcheck.supp Makefil...

2015-05-11 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:   11-May-2015 23:10:20
  Branch: rpm-5_4  Handle: 2015051121101603

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am
rpm/build   .cppcheck.supp Makefile.am expression.c files.c
pack.c parsePrep.c
rpm/lib .cppcheck.supp Makefile.am psm.c query.c rpmds.c
rpmps.c rpmrc.c transaction.c
rpm/misc.cppcheck.supp Makefile.am
rpm/rpmdb   .cppcheck.supp Makefile.am fprint.c header.c
package.c pkgio.c rpmdb.c rpmrepo.c
rpm/rpmio   .cppcheck.supp Makefile.am blake2b.c blake2s.c
bson.c fnmatch_loop.c groestl.c lane.c lookup3.c
macro.c md6.c mongoc.c rpmdav.c rpmdir.c rpmgit.c
rpmhkp.c rpmnix.h rpmodbc.c rpmrpc.c rpmsed.c
rpmsql.c rpmssl.c
rpm/tools   .cppcheck.supp Makefile.am roto.c rpmcache.c
rpmfind.c rpmspecdump.c

  Log:
- cppcheck: remove warnings.

  Summary:
RevisionChanges Path
2.263.2.38  +0  -2  rpm/Makefile.am
1.1.2.2 +0  -2  rpm/build/.cppcheck.supp
2.80.2.7+2  -4  rpm/build/Makefile.am
2.35.6.8+1  -0  rpm/build/expression.c
1.369.2.10  +1  -0  rpm/build/files.c
2.324.2.14  +1  -1  rpm/build/pack.c
2.132.2.10  +3  -3  rpm/build/parsePrep.c
1.1.2.2 +0  -4  rpm/lib/.cppcheck.supp
2.203.2.12  +17 -19 rpm/lib/Makefile.am
2.399.2.20  +2  -2  rpm/lib/psm.c
2.216.2.14  +2  -2  rpm/lib/query.c
2.170.2.31  +5  -4  rpm/lib/rpmds.c
2.35.4.2+1  -1  rpm/lib/rpmps.c
2.289.4.7   +1  -1  rpm/lib/rpmrc.c
1.429.2.16  +1  -1  rpm/lib/transaction.c
1.1.2.2 +1  -0  rpm/misc/.cppcheck.supp
1.56.2.11   +2  -5  rpm/misc/Makefile.am
1.1.2.2 +0  -7  rpm/rpmdb/.cppcheck.supp
1.134.2.14  +2  -2  rpm/rpmdb/Makefile.am
1.40.4.5+1  -1  rpm/rpmdb/fprint.c
1.198.2.17  +1  -0  rpm/rpmdb/header.c
1.2.2.9 +1  -0  rpm/rpmdb/package.c
1.121.2.16  +1  -1  rpm/rpmdb/pkgio.c
1.392.2.29  +3  -2  rpm/rpmdb/rpmdb.c
1.4.2.5 +1  -1  rpm/rpmdb/rpmrepo.c
1.1.2.2 +0  -14 rpm/rpmio/.cppcheck.supp
1.293.2.50  +4  -4  rpm/rpmio/Makefile.am
1.1.2.5 +1  -0  rpm/rpmio/blake2b.c
1.1.2.5 +1  -0  rpm/rpmio/blake2s.c
2.4.4.12+2  -2  rpm/rpmio/bson.c
2.2.8.1 +8  -8  rpm/rpmio/fnmatch_loop.c
2.2.4.2 +1  -1  rpm/rpmio/groestl.c
2.7.2.1 +1  -1  rpm/rpmio/lane.c
1.6.6.7 +3  -3  rpm/rpmio/lookup3.c
2.249.2.28  +1  -1  rpm/rpmio/macro.c
1.3.4.6 +1  -0  rpm/rpmio/md6.c
1.1.2.5 +1  -1  rpm/rpmio/mongoc.c
2.119.2.18  +7  -0  rpm/rpmio/rpmdav.c
2.12.2.10   +4  -4  rpm/rpmio/rpmdir.c
2.1.2.54+4  -7  rpm/rpmio/rpmgit.c
2.20.2.11   +6  -6  rpm/rpmio/rpmhkp.c
1.20.2.1+1  -0  rpm/rpmio/rpmnix.h
1.1.2.18+4  -0  rpm/rpmio/rpmodbc.c
2.99.2.5+2  -2  rpm/rpmio/rpmrpc.c
1.1.2.5 +1  -1  rpm/rpmio/rpmsed.c
2.59.2.15   +2  -2  rpm/rpmio/rpmsql.c
2.42.2.16   +2  -1  rpm/rpmio/rpmssl.c
1.1.2.2 +0  -5  rpm/tools/.cppcheck.supp
2.170.2.15  +2  -4  rpm/tools/Makefile.am
1.1.2.8 +5  -4  rpm/tools/roto.c
2.41.4.3+1  -0  rpm/tools/rpmcache.c
2.15.2.6+5  -5  rpm/tools/rpmfind.c
2.7.8.1 +2  -2  rpm/tools/rpmspecdump.c
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.37 -r2.263.2.38 Makefile.am
  --- rpm/Makefile.am   11 May 2015 17:53:26 -  2.263.2.37
  +++ rpm/Makefile.am   11 May 2015 21:10:16 -  2.263.2.38
  @@ -219,9 +219,7 @@
   syntastic: .syntastic_c_config
for SYNDIR in $(SYNDIRS); do make -C $$SYNDIR $ ; done
   
  -#--std=posix
   #--template={file},{line},{severity},{id},{message}
  -#--suppress=obsoleteFunctionsalloca
   #--template=gcc
   CPPCHECK = @__CPPCHECK@ -q --force --inline-suppr -j 8 \
--template={file},{line},{severity},{id},{message} \
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/.cppcheck.supp
  
  $ cvs diff -u -r1.1.2.1 -r1.1.2.2

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

2015-04-19 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:   19-Apr-2015 20:44:53
  Branch: rpm-5_4  Handle: 2015041918445300

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am configure.ac

  Log:
- distcheck: hack out lua/tests/{,libs/}Makefile

  Summary:
RevisionChanges Path
2.263.2.34  +3  -2  rpm/Makefile.am
2.472.2.129 +8  -0  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.33 -r2.263.2.34 Makefile.am
  --- rpm/Makefile.am   23 Feb 2015 15:23:35 -  2.263.2.33
  +++ rpm/Makefile.am   19 Apr 2015 18:44:53 -  2.263.2.34
  @@ -304,11 +304,12 @@
   
   check-local:
   
  -# XXX W2DO: refactor to {js,ruby,python}/Makefile.am
  +# XXX W2DO: refactor to {js,lua,python,ruby}/Makefile.am
   distclean-local:
[ -d js ]  rm -rf js/Makefile js/.deps
  - [ -d ruby ]  rm -rf ruby/Makefile ruby/.deps
  + [ -d lua ]  rm -f lua/tests/Makefile lua/tests/libs/Makefile
[ -d python ]  rm -rf python/Makefile python/.deps
  + [ -d ruby ]  rm -rf ruby/Makefile ruby/.deps
   
   # XXX MacOSX: -I$(distdir)/_inst/include/db60 in flags w make distcheck
   distcheck-hook:
  @@ .
  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.128 -r2.472.2.129 configure.ac
  --- rpm/configure.ac  3 Mar 2015 20:50:38 -   2.472.2.128
  +++ rpm/configure.ac  19 Apr 2015 18:44:53 -  2.472.2.129
  @@ -1148,6 +1148,13 @@
   ])
   fi
   
  +dnl # cpuid.h API
  +AC_CHECK_HEADERS(cpuid.h)
  +
  +dnl # sys/getauxv.h API
  +AC_CHECK_HEADERS(sys/getauxv.h)
  +AC_CHECK_FUNC(getauxv)
  +
   dnl # beecrypt/api.h tries to retrofit an assert(x) macro
   AC_CHECK_HEADERS(assert.h)
   
  @@ -3105,6 +3112,7 @@
   macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool
   macros/mandriva macros/suse macros/fedora macros/mono macros/perl 
macros/pkgconfig macros/php
   macros/python macros/ruby macros/selinux macros/tcl
  +lua/tests/Makefile lua/tests/libs/Makefile
   doc/Makefile
   doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
   doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2015-02-23 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:   23-Feb-2015 16:23:36
  Branch: rpm-5_4  Handle: 2015022315233500

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
- create rpmqv.cc symlink automagically.

  Summary:
RevisionChanges Path
2.263.2.33  +5  -3  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.32 -r2.263.2.33 Makefile.am
  --- rpm/Makefile.am   9 Oct 2014 02:52:56 -   2.263.2.32
  +++ rpm/Makefile.am   23 Feb 2015 15:23:35 -  2.263.2.33
  @@ -201,13 +201,15 @@
   rpm_LDFLAGS =@LDFLAGS_STATIC@ $(LDFLAGS)
   rpm_LDADD =  rpm.o $(myLDADD)
   rpm.o:   $(top_srcdir)/rpmqv.c
  - $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV 
-o $@ -c $(top_srcdir)/rpmqv.cc
  + ln -sf $ rpmqv.cc
  + $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV 
-o $@ -c rpmqv.cc
   
   rpmbuild_SOURCES =   build.c
   rpmbuild_LDFLAGS =   @LDFLAGS_STATIC@ $(LDFLAGS)
   rpmbuild_LDADD = rpmbuild.o $(myLDADD)
  -rpmbuild.o: $(top_srcdir)/rpmqv.c
  - $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.cc
  +rpmbuild.o:  $(top_srcdir)/rpmqv.c
  + ln -sf $ rpmqv.cc
  + $(COMPILE) -DIAM_RPMBT -o $@ -c rpmqv.cc
   
   .PHONY:  splint
   splint:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am configure.ac rpm/rpmio/ bcon.h bs...

2014-10-06 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:   06-Oct-2014 21:44:03
  Branch: rpm-5_4  Handle: 2014100619435309

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am configure.ac
rpm/rpmio   bcon.h bson.c bson.h mongoc.c mongoc.h pcrs.c
rpmgfs.h rpmsq.h
rpm/rubyrpmte-rb.c
rpm/tools   rpmmtree.c

  Log:
- clang: warning removal.

  Summary:
RevisionChanges Path
2.263.2.31  +1  -0  rpm/Makefile.am
2.472.2.122 +3  -3  rpm/configure.ac
1.1.2.3 +9  -0  rpm/rpmio/bcon.h
2.4.4.11+10 -1  rpm/rpmio/bson.c
2.3.4.12+9  -0  rpm/rpmio/bson.h
1.1.2.4 +14 -5  rpm/rpmio/mongoc.c
1.1.2.4 +9  -0  rpm/rpmio/mongoc.h
1.1.2.6 +3  -0  rpm/rpmio/pcrs.c
1.1.2.4 +1  -1  rpm/rpmio/rpmgfs.h
1.14.6.6+2  -4  rpm/rpmio/rpmsq.h
1.3.2.1 +3  -1  rpm/ruby/rpmte-rb.c
2.17.2.5+1  -1  rpm/tools/rpmmtree.c
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.30 -r2.263.2.31 Makefile.am
  --- rpm/Makefile.am   18 Sep 2014 05:07:00 -  2.263.2.30
  +++ rpm/Makefile.am   6 Oct 2014 19:43:53 -   2.263.2.31
  @@ -403,6 +403,7 @@
  -d lib \
  -d build \
  -d tools \
  +   -d tests/bson \
  -d tests/mongo \
  -d tests \
  -d . \
  @@ .
  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.121 -r2.472.2.122 configure.ac
  --- rpm/configure.ac  30 Sep 2014 22:05:20 -  2.472.2.121
  +++ rpm/configure.ac  6 Oct 2014 19:43:55 -   2.472.2.122
  @@ -207,7 +207,7 @@
 rpm_CFLAGS_ADD([-Wno-strict-aliasing],[RPM_CFLAGS])
   
   dnl # --- implied by gcc -Wunused
  -dnl #  rpm_CFLAGS_ADD([-Wno-unused-function],[RPM_CFLAGS])
  +  rpm_CFLAGS_ADD([-Wno-unused-function],[RPM_CFLAGS])
   rpm_CFLAGS_ADD([-Wno-unused-parameter], [RPM_CFLAGS])
   dnl # XXX not gcc-4.4.7
   dnl #  rpm_CFLAGS_ADD([-Wunused-result],[RPM_CFLAGS])
  @@ -284,7 +284,6 @@
   dnl #MAX_STACK_SIZE=32768
   dnl #  rpm_CFLAGS_ADD([-Wframe-larger-than=$MAX_STACK_SIZE],[RPM_CFLAGS])
   dnl #  rpm_CFLAGS_ADD([-Wlogical-op],[RPM_CFLAGS])
  -  rpm_CFLAGS_ADD([-Wmaybe-uninitialized],[RPM_CFLAGS])
 rpm_CFLAGS_ADD([-Wno-missing-field-initializers],[RPM_CFLAGS])
   dnl #  rpm_CFLAGS_ADD([-Wmissing-include-dirs],[RPM_CFLAGS])
   dnl #  rpm_CFLAGS_ADD([-Woverflow],[RPM_CFLAGS])
  @@ -292,6 +291,7 @@
   dnl #  rpm_CFLAGS_ADD([-Wstrict-overflow],[RPM_CFLAGS])
   dnl #   rpm_CFLAGS_ADD([-Wstrict-prototypes],[RPM_CFLAGS])
 if test \( .`$CC --version 21 | grep 'GCC'` != . \); then
  +  rpm_CFLAGS_ADD([-Wmaybe-uninitialized],[RPM_CFLAGS])
 rpm_CFLAGS_ADD([-Wsuggest-attribute=const],[RPM_CFLAGS])
 rpm_CFLAGS_ADD([-Wsuggest-attribute=noreturn],[RPM_CFLAGS])
 rpm_CFLAGS_ADD([-Wsuggest-attribute=pure],[RPM_CFLAGS])
  @@ -486,7 +486,7 @@
   ])
   
   dnl # FIXME: all of -fsanitize={address,memory,thread} are mutually exclusive
  -dnl # Add -fsanitize=address (clang only, gcc-4.8.2 has not)
  +dnl # Add -fsanitize=address (clang only, RHEL6 gcc-4.4.7 has not)
   AC_ARG_ENABLE(build-sanitize-address,
   AS_HELP_STRING([--enable-build-sanitize-address], [build RPM 
instrumented for with AddressSanitizer]), [dnl
   if test .$enableval = .yes; then
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/bcon.h
  
  $ cvs diff -u -r1.1.2.2 -r1.1.2.3 bcon.h
  --- rpm/rpmio/bcon.h  6 Oct 2014 17:23:59 -   1.1.2.2
  +++ rpm/rpmio/bcon.h  6 Oct 2014 19:43:57 -   1.1.2.3
  @@ -23,6 +23,11 @@
   
   #include bson.h
   
  +#if defined(__clang__)
  +#pragma clang diagnostic push
  +#pragma clang diagnostic ignored -Wdocumentation
  +#endif
  +
   #define BCON_STACK_MAX 100
   
   #define BCON_ENSURE_DECLARE(fun, type) \
  @@ -277,4 +282,8 @@
   const char *bson_bcon_magic  (void) BSON_GNUC_CONST BSON_GNUC_PURE;
   const char *bson_bcone_magic (void) BSON_GNUC_CONST BSON_GNUC_PURE;
   
  +#if defined(__clang__)
  +#pragma clang diagnostic pop
   #endif
  +
  +#endif   /* BCON_H_ */
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/bson.c
  
  $ cvs diff -u -r2.4.4.10 -r2.4.4.11 bson.c
  --- rpm/rpmio/bson.c  6 Oct 2014 17:23:59

[CVS] RPM: rpm-5_4: rpm/ Makefile.am configure.ac rpm/macros/ macros.i...

2014-09-08 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:   08-Sep-2014 22:55:53
  Branch: rpm-5_4  Handle: 2014090820555102

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am configure.ac
rpm/macros  macros.in

  Log:
- autofu: add cachedir and versioned repackagedir.

  Summary:
RevisionChanges Path
2.263.2.29  +7  -8  rpm/Makefile.am
2.472.2.114 +53 -1  rpm/configure.ac
1.39.2.42   +8  -8  rpm/macros/macros.in
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.28 -r2.263.2.29 Makefile.am
  --- rpm/Makefile.am   27 Aug 2014 20:56:20 -  2.263.2.28
  +++ rpm/Makefile.am   8 Sep 2014 20:55:51 -   2.263.2.29
  @@ -244,19 +244,18 @@
   
   CVSTAG = r$(subst .,-,$(VERSION))
   
  -pkgsrcdir = @PKGSRCDIR@
   
   DBPATH = @DBPATH@
   
  -if WITH_PATH_VERSIONED
  -varspoolrepackage=$(varprefix)/spool/repackage-$(VERSION)
  -else
  -varspoolrepackage=$(varprefix)/spool/repackage
  -endif
  +pkgsrcdir = @PKGSRCDIR@
  +cachedir = @CACHEDIR@
  +repackagedir = @REPACKAGEDIR@
   
   install-data-local:
@$(mkdir_p) $(DESTDIR)$(DBPATH)
  - @$(mkdir_p) $(DESTDIR)$(varspoolrepackage)
  + @$(mkdir_p) $(DESTDIR)$(pkgsrcdir)
  + @$(mkdir_p) $(DESTDIR)$(cachedir)
  + @$(mkdir_p) $(DESTDIR)$(repackagedir)
@for dir in BUILD RPMS SOURCES SPECS SRPMS; do\
$(mkdir_p) $(DESTDIR)$(pkgsrcdir)/$$dir;\
done
  @@ -308,7 +307,7 @@
   # XXX MacOSX: -I$(distdir)/_inst/include/db60 in flags w make distcheck
   distcheck-hook:
$(mkdir_p) $(distdir)/_inst/include # XXX -- HACK ALERT
  - $(LN_S) $(prefix)/include/db60 $(distdir)/_inst/include/db60
  + $(LN_S) $(prefix)/include/@DBXY@ $(distdir)/_inst/include/@DBXY@
   
   # --- scan.coverity.com manual submission in $(PACKAGE).tgz
   COVDIR = cov-int
  @@ .
  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.113 -r2.472.2.114 configure.ac
  --- rpm/configure.ac  18 Aug 2014 18:30:56 -  2.472.2.113
  +++ rpm/configure.ac  8 Sep 2014 20:55:51 -   2.472.2.114
  @@ -206,6 +206,8 @@
CFLAGS=$my_save_cflags $my_cflags
done
   fi
  +
  +dnl # Add -fprofile-arcs -ftest-coverage (gcc)
   AC_ARG_ENABLE(build-gcov,
   AS_HELP_STRING([--enable-build-gcov], [build RPM instrumented for 
gcov]), [dnl
   if test .$enableval = .yes; then
  @@ -216,6 +218,16 @@
   fi
   ])
   
  +dnl # Add -fsanitize=address (clang)
  +AC_ARG_ENABLE(build-sanitize-address,
  +AS_HELP_STRING([--enable-build-sanitize-address], [build RPM 
instrumented for with AddressSanitizer]), [dnl
  +if test .$enableval = .yes; then
  +if test .`$CC --version 21 | grep 'clang'` != .; then
  +CFLAGS=$CFLAGS -fsanitize=address
  +fi
  +fi
  +])
  +
   dnl # optional valgrind/cachegrind support
   AC_ARG_WITH(valgrind, AS_HELP_STRING([--with-valgrind], [build RPM 
insturmented for valgrind tools]), [
   if test .$withval = .yes; then
  @@ -2373,7 +2385,7 @@
   fi
   AC_ARG_WITH(
   [path-sources],
  -AS_HELP_STRING([--with-path-sources=ARG], [build with RPM package sourcs 
directory path]),
  +AS_HELP_STRING([--with-path-sources=ARG], [build with RPM package 
sources directory path]),
   [PKGSRCDIR=$withval]
   )
   AC_DEFINE_UNQUOTED(
  @@ -2385,6 +2397,46 @@
   PKGSRCDIR_MACRO=`echo $PKGSRCDIR | sed -e s;^${varprefix}/;%{_var}/; -e 
s;^${usrprefix}/;%{_usr}/;`
   AC_SUBST(PKGSRCDIR_MACRO)
   
  +dnl # determine RPM cache directory path
  +AC_MSG_CHECKING([for RPM cache directory])
  +CACHEDIR=`echo ${varprefix}/cache/rpm`
  +if test .$WITH_PATH_VERSIONED = .yes; then
  +CACHEDIR=${CACHEDIR}-${VERSION}
  +fi
  +AC_ARG_WITH(
  +[path-cache],
  +AS_HELP_STRING([--with-path-cache=ARG], [build with RPM cache directory 
path]),
  +[CACHEDIR=$withval]
  +)
  +AC_DEFINE_UNQUOTED(
  +[CACHEDIR], [$CACHEDIR],
  +[Full path to RPM cache directory]
  +)
  +AC_SUBST(CACHEDIR)
  +AC_MSG_RESULT([$CACHEDIR])
  +CACHEDIR_MACRO=`echo $CACHEDIR | sed -e s;^${varprefix}/;%{_var}/; -e 
s;^${usrprefix}/;%{_usr}/;`
  +AC_SUBST(CACHEDIR_MACRO)
  +
  +dnl # determine RPM repackage directory path
  +AC_MSG_CHECKING([for RPM repackage directory])
  +REPACKAGEDIR=`echo ${varprefix}/spool/repackage`
  +if test .$WITH_PATH_VERSIONED = .yes; then
  +REPACKAGEDIR=${REPACKAGEDIR}-${VERSION}
  +fi
  +AC_ARG_WITH(
  +

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2014-08-17 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:   17-Aug-2014 18:51:43
  Branch: rpm-5_4  Handle: 2014081716514300

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
- distcheck: add make dist build options.

  Summary:
RevisionChanges Path
2.263.2.27  +69 -0  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.26 -r2.263.2.27 Makefile.am
  --- rpm/Makefile.am   2 Aug 2014 17:19:20 -   2.263.2.26
  +++ rpm/Makefile.am   17 Aug 2014 16:51:43 -  2.263.2.27
  @@ -3,6 +3,75 @@
   AUTOMAKE_OPTIONS = 1.4 foreign
   ACLOCAL_AMFLAGS = -I m4
   
  +AM_DISTCHECK_CONFIGURE_FLAGS = \
  +--verbose \
  + --prefix=/usr \
  + --with-db \
  + --with-dbsql \
  + --without-db-tools-intergrated \
  + --with-zlib \
  + --with-bzip2 \
  + --with-xz \
  +--with-file \
  +--with-path-magic=/usr/share/file/magic \
  +--without-lua \
  +--with-tcl \
  +--without-sqlite \
  +--without-syck \
  +--with-readline \
  +--without-augeas \
  +--with-beecrypt=internal \
  +--with-java \
  +--with-openssl \
  +--with-nss \
  +--with-gcrypt \
  +--with-tomcrypt \
  +--without-libtpm \
  +--without-libtasn1 \
  +--without-pakchois \
  +--without-gnutls \
  +--with-neon=internal \
  +--without-libproxy \
  +--with-expat \
  +--with-pcre \
  +--enable-utf \
  +--with-uuid=system \
  +--with-attr \
  +--with-acl \
  +--without-xar \
  +--with-popt=external \
  +--with-keyutils \
  +--with-pthreads \
  +--with-libelf \
  +--without-cudf \
  +--without-ficl \
  +--without-aterm \
  +--without-nix \
  +--without-bash \
  +--without-rc \
  +--without-js \
  +--without-gpsee \
  +--without-python \
  +--without-pythonembed \
  +--without-perl \
  +--without-perlembed \
  +--without-ruby \
  +--with-mruby \
  +--with-jvm \
  +--without-selinux \
  +--without-sepol \
  +--without-semanage \
  +--with-libgit2 \
  +--with-squirrel \
  +--with-build-extlibdep \
  +--with-build-maxextlibdep \
  +--with-valgrind \
  +--enable-build-pic \
  +--enable-build-versionscript \
  +--enable-build-warnings \
  +--enable-build-debug \
  +--enable-maintainer-mode
  +
   LINT = splint
   MCCABE = pmccabe
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2013-08-04 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:   04-Aug-2013 23:17:11
  Branch: rpm-5_4  Handle: 2013080421171100

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
- parallel build for coverity scan

  Summary:
RevisionChanges Path
2.263.2.21  +1  -1  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.20 -r2.263.2.21 Makefile.am
  --- rpm/Makefile.am   19 Jul 2013 00:58:54 -  2.263.2.20
  +++ rpm/Makefile.am   4 Aug 2013 21:17:11 -   2.263.2.21
  @@ -235,7 +235,7 @@
   covscan:
rm -rf $(COVDIR) $(PACKAGE).tgz
make clean
  - $(COVBUILD) make
  + $(COVBUILD) make -j4
tar czf $(COVFILE) $(COVDIR)
curl --form project=$(PACKAGE) \
 --form token=9FhGnFpviyNVjN5kBmAqSQ \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2013-07-18 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:   19-Jul-2013 02:58:55
  Branch: rpm-5_4  Handle: 2013071900585400

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
- sanity.

  Summary:
RevisionChanges Path
2.263.2.20  +3  -0  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.19 -r2.263.2.20 Makefile.am
  --- rpm/Makefile.am   18 Jul 2013 20:22:14 -  2.263.2.19
  +++ rpm/Makefile.am   19 Jul 2013 00:58:54 -  2.263.2.20
  @@ -303,6 +303,9 @@
   lcov-report:
@${mkdir_p} lcov
@find rpmio/auto -name '*.gcda' -exec rm -f {} \;
  + @find rpmdb/auto -name '*.gcda' -exec rm -f {} \;
  + @find lib/auto -name '*.gcda' -exec rm -f {} \;
  + @find build/auto -name '*.gcda' -exec rm -f {} \;
lcov -q --no-external \
  -d popt \
  -d lua/local \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2013-07-12 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:   13-Jul-2013 00:19:28
  Branch: rpm-5_4  Handle: 2013071222192800

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
- db60: uplift to db60 on MacOSX.

  Summary:
RevisionChanges Path
2.263.2.18  +2  -2  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.17 -r2.263.2.18 Makefile.am
  --- rpm/Makefile.am   8 Jul 2013 04:33:14 -   2.263.2.17
  +++ rpm/Makefile.am   12 Jul 2013 22:19:28 -  2.263.2.18
  @@ -222,10 +222,10 @@
[ -d ruby ]  rm -rf ruby/Makefile ruby/.deps
[ -d python ]  rm -rf python/Makefile python/.deps
   
  -# XXX MacOSX: -I$(distdir)/_inst/include/db53 in flags w make distcheck
  +# XXX MacOSX: -I$(distdir)/_inst/include/db60 in flags w make distcheck
   distcheck-hook:
$(mkdir_p) $(distdir)/_inst/include # XXX -- HACK ALERT
  - $(LN_S) $(prefix)/include/db53 $(distdir)/_inst/include/db53
  + $(LN_S) $(prefix)/include/db60 $(distdir)/_inst/include/db60
   
   # --- scan.coverity.com manual submission in $(PACKAGE).tgz
   COVDIR = cov-int
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2013-07-07 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:   08-Jul-2013 06:33:15
  Branch: rpm-5_4  Handle: 2013070804331400

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
- fix: automake-1.14 hiccups on $(top_srcdir) prefix.
- fix: automake-1.14 whines if not MKDIR_p - mkrip.
- default to make V=0 silent builds to get rid of the endless spewage.
- colorized tests *shrug*

  Summary:
RevisionChanges Path
2.263.2.17  +47 -41 rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.16 -r2.263.2.17 Makefile.am
  --- rpm/Makefile.am   4 Jul 2013 00:15:09 -   2.263.2.16
  +++ rpm/Makefile.am   8 Jul 2013 04:33:14 -   2.263.2.17
  @@ -122,13 +122,13 @@
   
   noinst_HEADERS = build.h debug.h system.h
   
  -rpm_SOURCES =$(top_srcdir)/build.c
  +rpm_SOURCES =build.c
   rpm_LDFLAGS =@LDFLAGS_STATIC@ $(LDFLAGS)
   rpm_LDADD =  rpm.o $(myLDADD)
   rpm.o:   $(top_srcdir)/rpmqv.c
$(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV 
-o $@ -c $(top_srcdir)/rpmqv.c
   
  -rpmbuild_SOURCES =   $(top_srcdir)/build.c
  +rpmbuild_SOURCES =   build.c
   rpmbuild_LDFLAGS =   @LDFLAGS_STATIC@ $(LDFLAGS)
   rpmbuild_LDADD = rpmbuild.o $(myLDADD)
   rpmbuild.o: $(top_srcdir)/rpmqv.c
  @@ -172,54 +172,60 @@
   DBPATH = @DBPATH@
   
   install-data-local:
  - @$(MKDIR_P) $(DESTDIR)$(DBPATH)
  - @$(MKDIR_P) $(DESTDIR)$(varprefix)/spool/repackage
  + @$(mkdir_p) $(DESTDIR)$(DBPATH)
  + @$(mkdir_p) $(DESTDIR)$(varprefix)/spool/repackage
@for dir in BUILD RPMS SOURCES SPECS SRPMS; do\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/$$dir;\
  + $(mkdir_p) $(DESTDIR)$(pkgsrcdir)/$$dir;\
done
@case @host_cpu@ in \
  - *86)$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/i386 ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/i486 ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/i586 ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/i686 ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/athlon ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium3 ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium4 ;;\
  - armv3l) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv3l ;;\
  - armv4b) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv4b ;;\
  - armv4l) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv3l ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv4l ;;\
  - armv5teb) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv4b ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv5teb ;;\
  - armv5tel) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv3l ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv4l ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/armv5tel ;;\
  - alpha*) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/alpha ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/alphaev6 ;;\
  - sparc*) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/sparc ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/sparcv8 ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/sparcv9 ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/sparc64 ;;\
  - ia64*)  $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ia64 ;;\
  - s390*)  $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/s390 ;;\
  - mipsel*) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/mipsel ;;\
  - mips*)  $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/mips ;;\
  - powerpc*) $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ppciseries ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ppcpseries ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64 ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64iseries ;\
  - $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64pseries ;;\
  - *)  $(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/RPMS/@host_cpu@ ;;\
  + *86)$(mkdir_p) $(DESTDIR)$(pkgsrcdir)/RPMS/i386 ;\
  + $(mkdir_p) $(DESTDIR)$(pkgsrcdir)/RPMS/i486 ;\
  + $(mkdir_p) $(DESTDIR)$(pkgsrcdir)/RPMS/i586 ;\
  + $(mkdir_p) $(DESTDIR)$(pkgsrcdir)/RPMS/i686 ;\
  + $(mkdir_p) $(DESTDIR)$(pkgsrcdir)/RPMS/athlon ;\
  + $(mkdir_p) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium3 ;\
  + $(mkdir_p) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium4 ;;\
  + armv3l) $(mkdir_p)

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2013-07-03 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:   04-Jul-2013 02:15:10
  Branch: rpm-5_4  Handle: 2013070400150900

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
- jbj: distcheck: on MacOSX, -I$(distdir)/_inst/include/db53 is appearing
in build flags. Create a symlink so that make distcheck build
succeeds.

  Summary:
RevisionChanges Path
2.263.2.16  +6  -1  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.15 -r2.263.2.16 Makefile.am
  --- rpm/Makefile.am   27 Jun 2013 12:35:28 -  2.263.2.15
  +++ rpm/Makefile.am   4 Jul 2013 00:15:09 -   2.263.2.16
  @@ -216,12 +216,17 @@
   
   check-local:
   
  +# XXX MacOSX: -I$(distdir)/_inst/include/db53 in flags w make distcheck
  +distcheck-hook:
  + mkdir -p $(distdir)/_inst/include
  + ln -s $(prefix)/include/db53 $(distdir)/_inst/include/db53
  +
   # --- scan.coverity.com manual submission in $(PACKAGE).tgz
   COVDIR = cov-int
   COVBUILD =   cov-build --dir $(COVDIR)
   COVDESC =$(shell date -u +%Y%m%d.%H%M%S)
   COVFILE =$(PACKAGE)-scan.tgz
  -covscan::
  +covscan:
rm -rf $(COVDIR) $(PACKAGE).tgz
make clean
$(COVBUILD) make
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2013-06-27 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:   27-Jun-2013 14:35:28
  Branch: rpm-5_4  Handle: 2013062712352800

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
- micro++.

  Summary:
RevisionChanges Path
2.263.2.15  +10 -1  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.14 -r2.263.2.15 Makefile.am
  --- rpm/Makefile.am   25 Jun 2013 18:51:23 -  2.263.2.14
  +++ rpm/Makefile.am   27 Jun 2013 12:35:28 -  2.263.2.15
  @@ -219,11 +219,20 @@
   # --- scan.coverity.com manual submission in $(PACKAGE).tgz
   COVDIR = cov-int
   COVBUILD =   cov-build --dir $(COVDIR)
  +COVDESC =$(shell date -u +%Y%m%d.%H%M%S)
  +COVFILE =$(PACKAGE)-scan.tgz
   covscan::
rm -rf $(COVDIR) $(PACKAGE).tgz
make clean
$(COVBUILD) make
  - tar czf $(PACKAGE).tgz $(COVDIR)
  + tar czf $(COVFILE) $(COVDIR)
  + curl --form project=$(PACKAGE) \
  +  --form token=9FhGnFpviyNVjN5kBmAqSQ \
  +  --form email=n3...@mac.com \
  +  --form file=@$(COVFILE) \
  +  --form version=$(PACKAGE_VERSION) \
  +  --form description=$(COVDESC) \
  +  http://scan5.coverity.com/cgi-bin/upload.py
   
   .PHONY: tar
   tar:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2013-06-25 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:   25-Jun-2013 20:51:23
  Branch: rpm-5_4  Handle: 2013062518512300

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
- stub-in a covscan target.

  Summary:
RevisionChanges Path
2.263.2.14  +9  -0  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.13 -r2.263.2.14 Makefile.am
  --- rpm/Makefile.am   17 Mar 2012 00:24:19 -  2.263.2.13
  +++ rpm/Makefile.am   25 Jun 2013 18:51:23 -  2.263.2.14
  @@ -216,6 +216,15 @@
   
   check-local:
   
  +# --- scan.coverity.com manual submission in $(PACKAGE).tgz
  +COVDIR = cov-int
  +COVBUILD =   cov-build --dir $(COVDIR)
  +covscan::
  + rm -rf $(COVDIR) $(PACKAGE).tgz
  + make clean
  + $(COVBUILD) make
  + tar czf $(PACKAGE).tgz $(COVDIR)
  +
   .PHONY: tar
   tar:
rm -rf /tmp/rpm-$(VERSION)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2012-03-04 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:   04-Mar-2012 18:57:43
  Branch: rpm-5_4  Handle: 2012030417574300

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
- fix: libgit2 builds in a ./build sub-directory.

  Summary:
RevisionChanges Path
2.263.2.9   +1  -1  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.8 -r2.263.2.9 Makefile.am
  --- rpm/Makefile.am   4 Mar 2012 17:02:19 -   2.263.2.8
  +++ rpm/Makefile.am   4 Mar 2012 17:57:43 -   2.263.2.9
  @@ -44,7 +44,7 @@
@WITH_BEECRYPT_SUBDIR@ \
@WITH_NEON_SUBDIR@ \
@WITH_SPIDERMONKEY_SUBDIR@ \
  - @WITH_LIBGIT2_SUBDIR@ \
  + @WITH_LIBGIT2_SUBDIR@/build \
@WITH_FILE_SUBDIR@ \
@WITH_BASH_SUBDIR@ \
@WITH_RC_SUBDIR@ \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am autogen.sh configure.ac

2012-03-04 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:   04-Mar-2012 19:17:17
  Branch: rpm-5_4  Handle: 2012030418171700

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am autogen.sh configure.ac

  Log:
- libgit2: fix: KISS Plan B don't bother with build subdir AutoFu.

  Summary:
RevisionChanges Path
2.263.2.10  +1  -1  rpm/Makefile.am
2.110.2.2   +1  -1  rpm/autogen.sh
2.472.2.48  +1  -1  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.9 -r2.263.2.10 Makefile.am
  --- rpm/Makefile.am   4 Mar 2012 17:57:43 -   2.263.2.9
  +++ rpm/Makefile.am   4 Mar 2012 18:17:17 -   2.263.2.10
  @@ -44,7 +44,7 @@
@WITH_BEECRYPT_SUBDIR@ \
@WITH_NEON_SUBDIR@ \
@WITH_SPIDERMONKEY_SUBDIR@ \
  - @WITH_LIBGIT2_SUBDIR@/build \
  + @WITH_LIBGIT2_SUBDIR@ \
@WITH_FILE_SUBDIR@ \
@WITH_BASH_SUBDIR@ \
@WITH_RC_SUBDIR@ \
  @@ .
  patch -p0 '@@ .'
  Index: rpm/autogen.sh
  
  $ cvs diff -u -r2.110.2.1 -r2.110.2.2 autogen.sh
  --- rpm/autogen.sh4 Mar 2012 17:02:19 -   2.110.2.1
  +++ rpm/autogen.sh4 Mar 2012 18:17:17 -   2.110.2.2
  @@ -46,7 +46,7 @@
 echo === $dir
 case $dir in
 libgit2)
  -( mkdir -p $dir/build  cd $dir/build  cmake .. )
  +( cd $dir  cmake . )
   ;;
 *)
   ( cd $dir  sh ./autogen.sh --noconfigure $@ )
  @@ .
  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.47 -r2.472.2.48 configure.ac
  --- rpm/configure.ac  4 Mar 2012 17:48:38 -   2.472.2.47
  +++ rpm/configure.ac  4 Mar 2012 18:17:17 -   2.472.2.48
  @@ -1489,7 +1489,7 @@
   RPM_CHECK_LIB(
   [Libgit2], [libgit2],
   [git2], [git_repository_open], [git2.h],
  -[no,internal:external:none], [libgit2:include:build],
  +[no,internal:external:none], [libgit2:include],
   [ AC_DEFINE(WITH_LIBGIT2, 1, [Define if building with Libgit2])
 if test .$RPM_CHECK_LIB_LOCATION = .internal; then
 AC_DEFINE(HAVE_GIT2_H, 1, [Define to 1 if you have git2.h])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ Makefile.am

2011-01-25 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   25-Jan-2011 15:42:46
  Branch: rpm-5_4  Handle: 2011012514424500

  Modified files:   (Branch: rpm-5_4)
rpm Makefile.am

  Log:
add missing file required by test suite to generated tarball

  Summary:
RevisionChanges Path
2.263.2.1   +1  -0  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263 -r2.263.2.1 Makefile.am
  --- rpm/Makefile.am   2 Dec 2010 14:11:47 -   2.263
  +++ rpm/Makefile.am   25 Jan 2011 14:42:45 -  2.263.2.1
  @@ -21,6 +21,7 @@
tests/devtool-sanity-1.0-1.src.rpm \
tests/edos-test-1-0.src.rpm \
tests/probes-test-1-0.src.rpm \
  + tests/simplestRPMv3-1.0-2.aix5.3.noarch.rpm \
tests/triggers-D-1.0-1.src.rpm \
tests/triggers-DP-1.0-1.src.rpm \
tests/triggers-F-1.0-1.src.rpm \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org