date:20080520

[CVS] RPM: rpm-5_1: rpm/tools/ debugedit.c

2008-05-20 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:   21-May-2008 01:37:39
  Branch: rpm-5_1  Handle: 2008052023373800

  Modified files:   (Branch: rpm-5_1)
rpm/tools   debugedit.c

  Log:
- jbj: add cast, identical to HEAD.

  Summary:
RevisionChanges Path
2.16.4.2+1  -1  rpm/tools/debugedit.c
  

  patch -p0 <<'@@ .'
  Index: rpm/tools/debugedit.c
  
  $ cvs diff -u -r2.16.4.1 -r2.16.4.2 debugedit.c
  --- rpm/tools/debugedit.c 27 Apr 2008 11:47:10 -  2.16.4.1
  +++ rpm/tools/debugedit.c 20 May 2008 23:37:38 -  2.16.4.2
  @@ -1471,7 +1471,7 @@
   char hex[build_id_size * 2 + 1];
   int n = snprintf (hex, 3, "%02" PRIx8, id[0]);
   assert (n == 2);
  -for (i = 1; i < build_id_size; ++i)
  +for (i = 1; i < (int)build_id_size; ++i)
 {
n = snprintf (&hex[i * 2], 3, "%02" PRIx8, id[i]);
assert (n == 2);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 19:54:55
  Branch: HEAD Handle: 2008052017545500

  Modified files:
rpm devtool.conf

  Log:
check for magic existance, to work with file-4.24

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.221 -r2.222 devtool.conf
  --- rpm/devtool.conf  20 May 2008 17:33:01 -  2.221
  +++ rpm/devtool.conf  20 May 2008 17:54:55 -  2.222
  @@ -995,7 +995,9 @@
   make install
   # install required runtime files for uninstalled third-party library 
"file" (libmagic)
   install -d -m 755 $prefix/share/file
  +if [ -f $base3rd/bin/$platform/file-${v_file}/magic/magic ]; then
   install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic 
$prefix/share/file/
  +fi
   install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic.mgc 
$prefix/share/file/
   }
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_1: rpm/ CHANGES devtool.conf

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 19:52:52
  Branch: rpm-5_1  Handle: 2008052017525200

  Modified files:   (Branch: rpm-5_1)
rpm CHANGES devtool.conf

  Log:
standalone: backport magic install fix

  Summary:
RevisionChanges Path
1.2288.2.29 +1  -0  rpm/CHANGES
2.205.2.7   +4  -2  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2288.2.28 -r1.2288.2.29 CHANGES
  --- rpm/CHANGES   20 May 2008 16:40:56 -  1.2288.2.28
  +++ rpm/CHANGES   20 May 2008 17:52:52 -  1.2288.2.29
  @@ -1,4 +1,5 @@
   5.1.1 -> 5.1.2:
  +- afb: standalone: file "magic" was installed in wrong directory
   - jbj: add toplevel lcov-foo Makefile targets. Current coverage at
http://wraptastic.org/pub/jbj/rpm-5.1.DEVEL-lcov
   - jbj: add --enable-build-gcov for CFLAGS -fprofile-arcs -ftest-coverage.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.205.2.6 -r2.205.2.7 devtool.conf
  --- rpm/devtool.conf  16 Apr 2008 17:49:41 -  2.205.2.6
  +++ rpm/devtool.conf  20 May 2008 17:52:52 -  2.205.2.7
  @@ -960,8 +960,10 @@
   standalone_install () {
   rm -rf $prefix
   make install
  -install -d -m 755 $prefix/share/file/magic
  -install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic.mgc 
$prefix/share/file/magic/
  +# install required runtime files for uninstalled third-party library 
"file" (libmagic)
  +install -d -m 755 $prefix/share/file
  +install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic 
$prefix/share/file/
  +install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic.mgc 
$prefix/share/file/
   }
   
   #   test RPM (trivially only)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ Makefile.am

2008-05-20 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:   20-May-2008 19:46:24
  Branch: HEAD Handle: 2008052017462400

  Modified files:
rpm Makefile.am

  Log:
- jbj: add lazy mkdir & version to lcov-upload target.

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

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.218 -r2.219 Makefile.am
  --- rpm/Makefile.am   20 May 2008 09:17:41 -  2.218
  +++ rpm/Makefile.am   20 May 2008 17:46:24 -  2.219
  @@ -57,9 +57,9 @@
rpmconstant \
@WITH_PYTHON_SUBDIR@ \
@WITH_PERL_SUBDIR@ \
  - tests \
tools \
scripts \
  + tests \
doc \
.
   
  @@ -253,7 +253,8 @@
   
   .PHONY:  lcov-upload
   lcov-upload: lcov
  - tar -C lcov -cf - . | (cd /var/ftp/pub/jbj/rpm-lcov; tar xf -)
  + mkdir -p /var/ftp/pub/jbj/rpm-$(VERSION)-lcov
  + tar -C lcov -cf - . | (cd /var/ftp/pub/jbj/rpm-$(VERSION)-lcov; tar xf 
-)
   #rsync -rvz -e ssh --delete lcov/* ???
   
   cscope:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 19:35:58
  Branch: HEAD Handle: 2008052017355700

  Modified files:
rpm CHANGES

  Log:
update changelog for magic

  Summary:
RevisionChanges Path
1.2357  +1  -0  rpm/CHANGES
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2356 -r1.2357 CHANGES
  --- rpm/CHANGES   20 May 2008 12:52:01 -  1.2356
  +++ rpm/CHANGES   20 May 2008 17:35:57 -  1.2357
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +- afb: standalone: file "magic" was installed in wrong directory
   - afb: fix VPATH builds finding rpmversion.h (in perl, with MakeMaker)
   - afb: fix VPATH builds finding rpmversion.h (in python)
   - afb: internal liblzma was not properly in autoconf/automake
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_0: xar/lib/ lzmaxar.c

2008-05-20 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: xar  Date:   20-May-2008 19:35:49
  Branch: rpm-5_0  Handle: 2008052017354900

  Modified files:   (Branch: rpm-5_0)
xar/lib lzmaxar.c

  Log:
- jbj: hotwire a fix for building against latest libzma external.

  Summary:
RevisionChanges Path
1.4.2.1 +9  -0  xar/lib/lzmaxar.c
  

  patch -p0 <<'@@ .'
  Index: xar/lib/lzmaxar.c
  
  $ cvs diff -u -r1.4 -r1.4.2.1 lzmaxar.c
  --- xar/lib/lzmaxar.c 9 Dec 2007 21:24:37 -   1.4
  +++ xar/lib/lzmaxar.c 20 May 2008 17:35:49 -  1.4.2.1
  @@ -46,6 +46,7 @@
   #include 
   #include 
   #ifdef HAVE_LIBLZMA
  +#include 
   #include 
   #endif
   #include "xar.h"
  @@ -53,6 +54,14 @@
   #include "io.h"
   
   #ifdef HAVE_LIBLZMA
  +#define  HAVE_LZMA_MEMLIMIT
  +#if defined(HAVE_LZMA_MEMLIMIT)
  +#define  lzma_memory_limitterlzma_memlimit
  +#define  lzma_memory_limitter_create(_l) lzma_memlimit_create(_l)
  +#define  lzma_memory_alloc   lzma_memlimit_alloc
  +#define  lzma_memory_freelzma_memlimit_free
  +#define  lzma_memory_limitter_end(_m, _i) lzma_memlimit_end((_m), (_i))
  +#endif
   
   struct _lzma_context{
uint8_t lzmacompressed;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_0: rpm/ CHANGES Makefile.am configure.ac rpm/tests/ M...

2008-05-20 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:   20-May-2008 19:33:12
  Branch: rpm-5_0  Handle: 2008052017331101

  Added files:  (Branch: rpm-5_0)
rpm/tests   devtool-sanity-1.0-1.src.rpm
  Modified files:   (Branch: rpm-5_0)
rpm CHANGES Makefile.am configure.ac
rpm/tests   Makefile.am macros.in

  Log:
- jbj: add toplevel lcov-foo Makefile targets. Current coverage at
http://wraptastic.org/pub/jbj/rpm-5.0.DEVEL-lcov
- jbj: add --enable-build-gcov for CFLAGS -fprofile-arcs -ftest-coverage.
- jbj: hot-wire a top level "make check". noisy sanity check atm, todo++.
- jbj: backport top level tests/* for "make check". No tests in Makefile
SUBDIRS targets yet ...

  Summary:
RevisionChanges Path
1.2054.2.63 +6  -0  rpm/CHANGES
2.213.2.1   +32 -0  rpm/Makefile.am
2.269.2.9   +10 -1  rpm/configure.ac
1.9.2.1 +55 -14 rpm/tests/Makefile.am
1.1.4.2 BLOBrpm/tests/devtool-sanity-1.0-1.src.rpm
1.15.22.1   +13 -185rpm/tests/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2054.2.62 -r1.2054.2.63 CHANGES
  --- rpm/CHANGES   18 May 2008 15:28:19 -  1.2054.2.62
  +++ rpm/CHANGES   20 May 2008 17:33:11 -  1.2054.2.63
  @@ -1,4 +1,10 @@
   5.0.3 -> 5.0.4:
  +- jbj: add toplevel lcov-foo Makefile targets. Current coverage at
  + http://wraptastic.org/pub/jbj/rpm-5.0.DEVEL-lcov
  +- jbj: add --enable-build-gcov for CFLAGS -fprofile-arcs -ftest-coverage.
  +- jbj: hot-wire a top level "make check". noisy sanity check atm, todo++.
  +- jbj: backport top level tests/* for "make check". No tests in Makefile
  + SUBDIRS targets yet ...
   - jbj: disable loop unraveling error msgs for now. better needs to be 
done.
   - jbj: fix: rpm-python h['filenames'] needs tagName(0x54aafb71) to
return "Filenames" in order to find the filepathsTag extension.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.213 -r2.213.2.1 Makefile.am
  --- rpm/Makefile.am   17 Dec 2007 15:45:47 -  2.213
  +++ rpm/Makefile.am   20 May 2008 17:33:11 -  2.213.2.1
  @@ -58,6 +58,7 @@
@WITH_PERL_SUBDIR@ \
tools \
scripts \
  + tests \
doc \
.
   
  @@ -242,6 +243,37 @@
mkdir -p $@
- [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@
   
  +.PHONY:  lcov-reset  # run lcov from scratch, always
  +lcov-reset:
  + make lcov-run
  + make lcov-report
  +
  +# run lcov from scratch if the dir is not there
  +lcov:
  + make lcov-reset
  +
  +.PHONY:  lcov-run# reset run coverage tests
  +lcov-run:
  + @-rm -rf lcov
  + find . -name "*.gcda" -exec rm {} \;
  + make check
  +
  +.PHONY:  lcov-report # generate report based on current coverage data
  +lcov-report:
  + mkdir lcov
  + -lcov -d rpmio -d rpmdb -d lib -d build -d tools -d . --capture 
--output-file lcov/lcov.info
  + lcov -l lcov/lcov.info | grep -v "`cd $(top_srcdir) && pwd`" | cut -d: 
-f1 > lcov/remove
  + lcov -r lcov/lcov.info `cat lcov/remove` > lcov/lcov.cleaned.info
  + rm lcov/remove
  + mv lcov/lcov.cleaned.info lcov/lcov.info
  + genhtml -t "$(PACKAGE_STRING)" -o lcov lcov/lcov.info
  +
  +#.PHONY: lcov-upload
  +#lcov-upload: lcov
  +#mkdir -p /var/ftp/pub/jbj/rpm-$(VERSION)-lcov
  +#tar -C lcov -cf - . | (cd /var/ftp/pub/jbj/rpm-$(VERSION)-lcov; tar xf 
-)
  +#rsync -rvz -e ssh --delete lcov/* ???
  +
   cscope:
cscope -b -R
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.269.2.8 -r2.269.2.9 configure.ac
  --- rpm/configure.ac  31 Jan 2008 17:17:19 -  2.269.2.8
  +++ rpm/configure.ac  20 May 2008 17:33:11 -  2.269.2.9
  @@ -184,6 +184,15 @@
   fi
   fi
   ])
  +AC_ARG_ENABLE(build-gcov,
  +AS_HELP_STRING([--enable-build-gcov], [build RPM instrumented for 
gcov]), [dnl
  +if test ".$enableval" = .yes; then
  +if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
  +dnl # GNU GCC (usually "gcc")
  +CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
  +fi
  +fi
  +])
   
   dnl # RPM tries hard to use adaptive "feature tests" instead of

[CVS] RPM: rpm/ devtool.conf

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 19:33:02
  Branch: HEAD Handle: 2008052017330100

  Modified files:
rpm devtool.conf

  Log:
standalone: magic installation broken, couldn't build packages

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.220 -r2.221 devtool.conf
  --- rpm/devtool.conf  20 May 2008 13:57:48 -  2.220
  +++ rpm/devtool.conf  20 May 2008 17:33:01 -  2.221
  @@ -993,8 +993,10 @@
   standalone_install () {
   rm -rf $prefix
   make install
  -install -d -m 755 $prefix/share/file/magic
  -install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic.mgc 
$prefix/share/file/magic/
  +# install required runtime files for uninstalled third-party library 
"file" (libmagic)
  +install -d -m 755 $prefix/share/file
  +install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic 
$prefix/share/file/
  +install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic.mgc 
$prefix/share/file/
   }
   
   #   test RPM (trivially only)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2008-05-20 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:   20-May-2008 19:30:01
  Branch: rpm-5_1  Handle: 2008052017300100

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

  Log:
- jbj: correct typo

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

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.215.2.3 -r2.215.2.4 Makefile.am
  --- rpm/Makefile.am   20 May 2008 16:40:57 -  2.215.2.3
  +++ rpm/Makefile.am   20 May 2008 17:30:01 -  2.215.2.4
  @@ -249,7 +249,7 @@
   
   #.PHONY: lcov-upload
   #lcov-upload: lcov
  -#mkdir -p /var/ftp/pub/jbj/rpm-$(VERSION)
  +#mkdir -p /var/ftp/pub/jbj/rpm-$(VERSION)-lcov
   #tar -C lcov -cf - . | (cd /var/ftp/pub/jbj/rpm-$(VERSION)-lcov; tar xf 
-)
   #rsync -rvz -e ssh --delete lcov/* ???
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_1: xar/lib/ lzmaxar.c

2008-05-20 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: xar  Date:   20-May-2008 18:49:11
  Branch: rpm-5_1  Handle: 2008052016491100

  Modified files:   (Branch: rpm-5_1)
xar/lib lzmaxar.c

  Log:
- jbj: hotwire a fix for building against latest libzma external.

  Summary:
RevisionChanges Path
1.4.4.1 +9  -0  xar/lib/lzmaxar.c
  

  patch -p0 <<'@@ .'
  Index: xar/lib/lzmaxar.c
  
  $ cvs diff -u -r1.4 -r1.4.4.1 lzmaxar.c
  --- xar/lib/lzmaxar.c 9 Dec 2007 21:24:37 -   1.4
  +++ xar/lib/lzmaxar.c 20 May 2008 16:49:11 -  1.4.4.1
  @@ -46,6 +46,7 @@
   #include 
   #include 
   #ifdef HAVE_LIBLZMA
  +#include 
   #include 
   #endif
   #include "xar.h"
  @@ -53,6 +54,14 @@
   #include "io.h"
   
   #ifdef HAVE_LIBLZMA
  +#define  HAVE_LZMA_MEMLIMIT
  +#if defined(HAVE_LZMA_MEMLIMIT)
  +#define  lzma_memory_limitterlzma_memlimit
  +#define  lzma_memory_limitter_create(_l) lzma_memlimit_create(_l)
  +#define  lzma_memory_alloc   lzma_memlimit_alloc
  +#define  lzma_memory_freelzma_memlimit_free
  +#define  lzma_memory_limitter_end(_m, _i) lzma_memlimit_end((_m), (_i))
  +#endif
   
   struct _lzma_context{
uint8_t lzmacompressed;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2008-05-20 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:   20-May-2008 18:40:57
  Branch: rpm-5_1  Handle: 2008052016405601

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

  Log:
- jbj: add toplevel lcov-foo Makefile targets. Current coverage at
http://wraptastic.org/pub/jbj/rpm-5.1.DEVEL-lcov

  Summary:
RevisionChanges Path
1.2288.2.28 +2  -0  rpm/CHANGES
2.215.2.3   +31 -0  rpm/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2288.2.27 -r1.2288.2.28 CHANGES
  --- rpm/CHANGES   20 May 2008 15:09:43 -  1.2288.2.27
  +++ rpm/CHANGES   20 May 2008 16:40:56 -  1.2288.2.28
  @@ -1,4 +1,6 @@
   5.1.1 -> 5.1.2:
  +- jbj: add toplevel lcov-foo Makefile targets. Current coverage at
  + http://wraptastic.org/pub/jbj/rpm-5.1.DEVEL-lcov
   - jbj: add --enable-build-gcov for CFLAGS -fprofile-arcs -ftest-coverage.
   - jbj: hot-wire a top level "make check". noisy sanity check atm, todo++.
   - jbj: backport top level tests/* for "make check". No tests in Makefile
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.215.2.2 -r2.215.2.3 Makefile.am
  --- rpm/Makefile.am   20 May 2008 15:09:43 -  2.215.2.2
  +++ rpm/Makefile.am   20 May 2008 16:40:57 -  2.215.2.3
  @@ -222,6 +222,37 @@
mkdir -p $@
- [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@
   
  +.PHONY:  lcov-reset  # run lcov from scratch, always
  +lcov-reset:
  + make lcov-run
  + make lcov-report
  +
  +# run lcov from scratch if the dir is not there
  +lcov:
  + make lcov-reset
  +
  +.PHONY:  lcov-run# reset run coverage tests
  +lcov-run:
  + @-rm -rf lcov
  + find . -name "*.gcda" -exec rm {} \;
  + make check
  +
  +.PHONY:  lcov-report # generate report based on current coverage data
  +lcov-report:
  + mkdir lcov
  + -lcov -d rpmio -d rpmdb -d lib -d build -d tools -d . --capture 
--output-file lcov/lcov.info
  + lcov -l lcov/lcov.info | grep -v "`cd $(top_srcdir) && pwd`" | cut -d: 
-f1 > lcov/remove
  + lcov -r lcov/lcov.info `cat lcov/remove` > lcov/lcov.cleaned.info
  + rm lcov/remove
  + mv lcov/lcov.cleaned.info lcov/lcov.info
  + genhtml -t "$(PACKAGE_STRING)" -o lcov lcov/lcov.info
  +
  +#.PHONY: lcov-upload
  +#lcov-upload: lcov
  +#mkdir -p /var/ftp/pub/jbj/rpm-$(VERSION)
  +#tar -C lcov -cf - . | (cd /var/ftp/pub/jbj/rpm-$(VERSION)-lcov; tar xf 
-)
  +#rsync -rvz -e ssh --delete lcov/* ???
  +
   cscope:
cscope -b -R
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_1: rpm/ CHANGES Makefile.am configure.ac rpm/tests/ M...

2008-05-20 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:   20-May-2008 17:09:44
  Branch: rpm-5_1  Handle: 2008052015094301

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

  Log:
- jbj: add --enable-build-gcov for CFLAGS -fprofile-arcs -ftest-coverage.
- jbj: hot-wire a top level "make check". noisy sanity check atm, todo++.

  Summary:
RevisionChanges Path
1.2288.2.27 +2  -0  rpm/CHANGES
2.215.2.2   +1  -0  rpm/Makefile.am
2.289.2.2   +10 -1  rpm/configure.ac
1.9.4.2 +36 -36 rpm/tests/Makefile.am
1.15.24.1   +13 -185rpm/tests/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2288.2.26 -r1.2288.2.27 CHANGES
  --- rpm/CHANGES   20 May 2008 14:31:49 -  1.2288.2.26
  +++ rpm/CHANGES   20 May 2008 15:09:43 -  1.2288.2.27
  @@ -1,4 +1,6 @@
   5.1.1 -> 5.1.2:
  +- jbj: add --enable-build-gcov for CFLAGS -fprofile-arcs -ftest-coverage.
  +- jbj: hot-wire a top level "make check". noisy sanity check atm, todo++.
   - jbj: backport top level tests/* for "make check". No tests in Makefile
SUBDIRS targets yet ...
   - jbj: rpmrepo: add doxygen markup throughout, adjust splint annotations.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.215.2.1 -r2.215.2.2 Makefile.am
  --- rpm/Makefile.am   16 Apr 2008 17:58:24 -  2.215.2.1
  +++ rpm/Makefile.am   20 May 2008 15:09:43 -  2.215.2.2
  @@ -58,6 +58,7 @@
@WITH_PERL_SUBDIR@ \
tools \
scripts \
  + tests \
doc \
.
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.289.2.1 -r2.289.2.2 configure.ac
  --- rpm/configure.ac  11 Apr 2008 20:27:19 -  2.289.2.1
  +++ rpm/configure.ac  20 May 2008 15:09:43 -  2.289.2.2
  @@ -183,6 +183,15 @@
   fi
   fi
   ])
  +AC_ARG_ENABLE(build-gcov,
  +AS_HELP_STRING([--enable-build-gcov], [build RPM instrumented for 
gcov]), [dnl
  +if test ".$enableval" = .yes; then
  +if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
  +dnl # GNU GCC (usually "gcc")
  +CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
  +fi
  +fi
  +])
   
   dnl # RPM tries hard to use adaptive "feature tests" instead of
   dnl # problematic "platform tests". Nevertheless for some extremely
  @@ -1544,7 +1553,7 @@
   doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
   doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile
   python/rpm/Makefile scripts/rpm.pc lib/rpmversion.h
  -rpmconstant/Makefile
  +rpmconstant/Makefile tests/Makefile tests/macros
   ])
   
   dnl # final step: generate output
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.9.4.1 -r1.9.4.2 Makefile.am
  --- rpm/tests/Makefile.am 20 May 2008 14:31:49 -  1.9.4.1
  +++ rpm/tests/Makefile.am 20 May 2008 15:09:44 -  1.9.4.2
  @@ -23,42 +23,42 @@
(cd $@ && ${rpm} -q --specfile [EMAIL PROTECTED] && ${rpm} -q 
--specsrpm [EMAIL PROTECTED] && ${rpm} -q --specfile --specedit [EMAIL 
PROTECTED] && ${rpm} -bb --nodeps [EMAIL PROTECTED]) > /dev/null
   
   check-local: $(BUILD_DIRS)
  - @${rpm} -v --version > /dev/null
  - @${rpm} -v --showrc > /dev/null
  - @-rm -rf rpm
  - @${rpm} --initdb
  - @${rpm} --import $(top_srcdir)/pubkeys/JBJ-GPG-KEY
  - @${rpm} -qW . > /dev/null 2>&1
  - @${rpm} -Kv *.src.rpm */*.rpm > /dev/null
  - @${rpm} -Kv --usecrypto beecrypt *.src.rpm */*.rpm > /dev/null
  - @-${rpm} -U --justdb */*.rpm > /dev/null 2>&1
  - @${rpm} -Uvh --justdb --nodeps */*.rpm > /dev/null
  - @-${rpm} -i --justdb --nodeps */*.rpm > /dev/null 2>&1
  - @${rpm} -qa > /dev/null
  - @${rpm} -qa 'arch=noarch' > /dev/null
  - @${rpm} -qa 'arch=!noarch' > /dev/null
  - @${rpm} -qa -c > /dev/null
  - @${rpm} -qa -d > /dev/null
  - @${rpm} -qa -s > /dev/null
  - @${rpm} -qa --dump > /dev/null
  - @${rpm} -q --querybynumber 1 > /dev/null
  - @${rpm} -qal > /dev/null
  - @${rpm} -qa --qf '[%{FSNAMES}: %{FSSIZES}\n]' > /dev/nul

[CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/tests/ Makefile.am devtool-sanity...

2008-05-20 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:   20-May-2008 16:31:49
  Branch: rpm-5_1  Handle: 2008052014314900

  Added files:  (Branch: rpm-5_1)
rpm/tests   devtool-sanity-1.0-1.src.rpm
  Modified files:   (Branch: rpm-5_1)
rpm CHANGES
rpm/tests   Makefile.am

  Log:
- jbj: backport top level tests/* for "make check". No tests in Makefile
SUBDIRS targets yet ...

  Summary:
RevisionChanges Path
1.2288.2.26 +2  -0  rpm/CHANGES
1.9.4.1 +55 -14 rpm/tests/Makefile.am
1.1.2.2 BLOBrpm/tests/devtool-sanity-1.0-1.src.rpm
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2288.2.25 -r1.2288.2.26 CHANGES
  --- rpm/CHANGES   19 May 2008 20:57:21 -  1.2288.2.25
  +++ rpm/CHANGES   20 May 2008 14:31:49 -  1.2288.2.26
  @@ -1,4 +1,6 @@
   5.1.1 -> 5.1.2:
  +- jbj: backport top level tests/* for "make check". No tests in Makefile
  + SUBDIRS targets yet ...
   - jbj: rpmrepo: add doxygen markup throughout, adjust splint annotations.
   - jbj: update i18n from Translation Project.
   - jbj: update po/POTFILES.in
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.9 -r1.9.4.1 Makefile.am
  --- rpm/tests/Makefile.am 16 Jul 2007 09:22:48 -  1.9
  +++ rpm/tests/Makefile.am 20 May 2008 14:31:49 -  1.9.4.1
  @@ -2,22 +2,63 @@
   
   AUTOMAKE_OPTIONS = 1.4 foreign
   
  -pkglibdir = @USRLIBRPM@
  -
   EXTRA_DIST =
  -SUBDIRS = hello-test
  +SUBDIRS =
  +
  +macros = $(abs_top_builddir)/macros:@testdir@/macros
  +rpm =$(abs_top_builddir)/rpm --macros $(macros)
  +rpm2cpio =   $(abs_top_builddir)/tools/rpm2cpio
  +cpio =   cpio
  +
  +%.spec: $(wildcard %-*.src.rpm)
  + @${rpm2cpio} $(wildcard $*-*.src.rpm) | ${cpio} -i --quiet $@
  +
  +%.src.rpm: $(wildcard *.spec)
  + @${rpm} -bs --nodeps $^
  +
  +BUILD_DIRS = $(shell ${rpm} -qp --qf '%{NAME} ' --nosignature $(wildcard 
*.src.rpm))
   
  -check-recursive: ./usr/ ./bin ./var
  +$(BUILD_DIRS): $(wildcard %-*.src.rpm)
  + ${rpm} -i --nosignature --nodeps [EMAIL PROTECTED]
  + (cd $@ && ${rpm} -q --specfile [EMAIL PROTECTED] && ${rpm} -q 
--specsrpm [EMAIL PROTECTED] && ${rpm} -q --specfile --specedit [EMAIL 
PROTECTED] && ${rpm} -bb --nodeps [EMAIL PROTECTED]) > /dev/null
   
  -./usr ./bin ./var: ../rpm
  - ${MAKE} -C .. DESTDIR=`pwd` install
  - cp macros ./$(pkglibdir)
  - rm -f ./@GZIPBIN@
  - if [ ! -d ./`dirname @[EMAIL PROTECTED] ] ; then mkdir -p ./`dirname 
@[EMAIL PROTECTED] ; fi
  - ln -s @GZIPBIN@ ./@GZIPBIN@
  - rm -f ./@BZIP2BIN@
  - if [ ! -d ./`dirname @[EMAIL PROTECTED] ] ; then mkdir -p ./`dirname 
@[EMAIL PROTECTED] ; fi
  - ln -s @BZIP2BIN@ ./@BZIP2BIN@
  +check-local: $(BUILD_DIRS)
  + @${rpm} -v --version > /dev/null
  + @${rpm} -v --showrc > /dev/null
  + @-rm -rf rpm
  + @${rpm} --initdb
  + @${rpm} --import $(top_srcdir)/pubkeys/JBJ-GPG-KEY
  + @${rpm} -qW . > /dev/null 2>&1
  + @${rpm} -Kv *.src.rpm */*.rpm > /dev/null
  + @${rpm} -Kv --usecrypto beecrypt *.src.rpm */*.rpm > /dev/null
  + @-${rpm} -U --justdb */*.rpm > /dev/null 2>&1
  + @${rpm} -Uvh --justdb --nodeps */*.rpm > /dev/null
  + @-${rpm} -i --justdb --nodeps */*.rpm > /dev/null 2>&1
  + @${rpm} -qa > /dev/null
  + @${rpm} -qa 'arch=noarch' > /dev/null
  + @${rpm} -qa 'arch=!noarch' > /dev/null
  + @${rpm} -qa -c > /dev/null
  + @${rpm} -qa -d > /dev/null
  + @${rpm} -qa -s > /dev/null
  + @${rpm} -qa --dump > /dev/null
  + @${rpm} -q --querybynumber 1 > /dev/null
  + @${rpm} -qal > /dev/null
  + @${rpm} -qa --qf '[%{FSNAMES}: %{FSSIZES}\n]' > /dev/null
  + @${rpm} -qa --qf '[%{FILENAMES}: %{FILECLASS}\n]' > /dev/null
  + @${rpm} -qa --qf '[%{FILENAMES}: %{FILECONTEXTS}\n]' > /dev/null
  + @${rpm} -qa --qf '[%{FILENAMES}: %{FSCONTEXTS}\n]' > /dev/null
  + @${rpm} -qa --qf '[%{FILENAMES}: %{RECONTEXTS}\n]' > /dev/null
  + @${rpm} -qa --qf '[%{FILENAMES}: %{FILEPROVIDE}\n]' > /dev/null
  + @${rpm} -qa --qf '[%{FILENAMES}: %{FILEREQUIRE}\n]' > /dev/null
  + @${rpm} -qa --qf '[%{MISSINGOK}\n]' > /dev/null
  + @@${rpm} -qa --qf '[%{*:xml}\n]' > /dev/null
  + @${rpm} --rebuilddb
  + @${rpm} -qa --qf '[%{*:yaml}\n]' > /dev/null

[CVS] RPM: rpm/ TODO devtool.conf xar/include/ config.h.in

2008-05-20 Thread Russ P. Herrold

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Russ P. Herrold
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: xar rpm  Date:   20-May-2008 15:57:49
  Branch: HEAD Handle: 2008052013574801

  Modified files:
rpm TODO devtool.conf
xar/include config.h.in

  Log:
*** empty log message ***

  Summary:
RevisionChanges Path
1.126   +8  -0  rpm/TODO
2.220   +8  -8  rpm/devtool.conf
1.6 +4  -8  xar/include/config.h.in
  

  patch -p0 <<'@@ .'
  Index: rpm/TODO
  
  $ cvs diff -u -r1.125 -r1.126 TODO
  --- rpm/TODO  31 Jan 2008 15:35:09 -  1.125
  +++ rpm/TODO  20 May 2008 13:57:48 -  1.126
  @@ -152,4 +152,12 @@
   
 RPM 5.2 ROADMAP ISSUES
 --
  +- jbj: drill in "+foo" ports-like find the real store by prefixing 
  +secret sauce path.  Its wired into --install/--upggrade only to 
  +minimize risk. a small refactoring moves same to rpmgi ... 
  +where it becomes available for --query, so rpm -qT --aid +bash 
  +has a prayer of constructing the minimal transaction to install bash.
  +- jbj: ever better would be to add "=bash" token to construct (and
  +loop check) the minimal transaction to install bash using headers
  +from rpmdb.  -- added as a aide to memory per IRC thread
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.219 -r2.220 devtool.conf
  --- rpm/devtool.conf  20 May 2008 12:49:44 -  2.219
  +++ rpm/devtool.conf  20 May 2008 13:57:48 -  2.220
  @@ -17,19 +17,19 @@
   release=`eval echo \\$${release}`
   if [ ".${release}" = . ]; then
   if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then
  -echo "===> ${name} (cvs up HEAD)"
  -( cd ${DEVTOOL_SRCDIR}/${name} && cvs -q up -A -P -d )
  +echo "===> ${name} (cvs -d :pserver:[EMAIL PROTECTED]:/cvs 
up HEAD)"
  +( cd ${DEVTOOL_SRCDIR}/${name} && cvs -d :pserver:[EMAIL 
PROTECTED]:/cvs -q up -A -P -d )
   else
  -echo "===> ${name} (cvs co HEAD)"
  -( cd ${DEVTOOL_SRCDIR} && cvs co -A -d ${name} ${name} )
  +echo "===> ${name} (cvs -d :pserver:[EMAIL PROTECTED]:/cvs 
co HEAD)"
  +( cd ${DEVTOOL_SRCDIR} && cvs -d :pserver:[EMAIL 
PROTECTED]:/cvs co -A -d ${name} ${name} )
   fi
   else
   if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then
  -echo "===> ${name} (cvs up ${release})"
  -( cd ${DEVTOOL_SRCDIR}/${name} && cvs -q up -P -d 
-r${release} )
  +echo "===> ${name} (cvs -d :pserver:[EMAIL PROTECTED]:/cvs 
up ${release})"
  +( cd ${DEVTOOL_SRCDIR}/${name} && cvs -d :pserver:[EMAIL 
PROTECTED]:/cvs -q up -P -d -r${release} )
   else
  -echo "===> ${name} (cvs co ${release})"
  -( cd ${DEVTOOL_SRCDIR} && cvs co -r${release} -d ${name} 
${name} )
  +echo "===> ${name} (cvs -d :pserver:[EMAIL PROTECTED]:/cvs 
co ${release})"
  +( cd ${DEVTOOL_SRCDIR} && cvs -d :pserver:[EMAIL 
PROTECTED]:/cvs co -r${release} -d ${name} ${name} )
   fi
   fi
   echo "<=== ${name}"
  @@ .
  patch -p0 <<'@@ .'
  Index: xar/include/config.h.in
  
  $ cvs diff -u -r1.5 -r1.6 config.h.in
  --- xar/include/config.h.in   11 Mar 2008 19:31:22 -  1.5
  +++ xar/include/config.h.in   20 May 2008 13:57:49 -  1.6
  @@ -150,10 +150,6 @@
   /* Define format for ino_t */
   #undef INO_STRING
   
  -/* Define to the sub-directory in which libtool stores uninstalled libraries.
  -   */
  -#undef LT_OBJDIR
  -
   /* Name of package */
   #undef PACKAGE
   
  @@ -172,16 +168,16 @@
   /* Define to the version of this package. */
   #undef PACKAGE_VERSION
   
  -/* The size of `dev_t', as computed by sizeof. */
  +/* The size of a `dev_t', as computed by sizeof. */
   #undef SIZEOF_DEV_T
   
  -/* The size of `gid_t', as computed by sizeof. */
  +/* The size of a `gid_t', as computed by sizeof. */
   #undef SIZEOF_GID_T
   
  -/* The size of `ino_t', as computed by sizeof. */
  +/* The size of a `ino_t', as computed by sizeof. */
   #undef SIZEOF_INO_T
   
  -/* The size of `uid_t', as computed by sizeof. */
  +/* The size of a `uid_t', as computed by sizeof. */
   #undef SI

[CVS] RPM: rpm/tests/ Makefile.am

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 15:20:11
  Branch: HEAD Handle: 2008052013201000

  Modified files:
rpm/tests   Makefile.am

  Log:
wrong path to pubkeys

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

  patch -p0 <<'@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.11 -r1.12 Makefile.am
  --- rpm/tests/Makefile.am 7 May 2008 18:39:17 -   1.11
  +++ rpm/tests/Makefile.am 20 May 2008 13:20:10 -  1.12
  @@ -27,7 +27,7 @@
@${rpm} -v --showrc > /dev/null
@-rm -rf rpm
@${rpm} --initdb
  - @${rpm} --import $(abs_top_builddir)/pubkeys/JBJ-GPG-KEY
  + @${rpm} --import $(top_srcdir)/pubkeys/JBJ-GPG-KEY
@${rpm} -qW . > /dev/null 2>&1
@${rpm} -Kv *.src.rpm */*.rpm > /dev/null
@${rpm} -Kv --usecrypto beecrypt *.src.rpm */*.rpm > /dev/null
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 14:52:02
  Branch: HEAD Handle: 2008052012520100

  Modified files:
rpm CHANGES

  Log:
update changelog for perl

  Summary:
RevisionChanges Path
1.2356  +1  -0  rpm/CHANGES
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2355 -r1.2356 CHANGES
  --- rpm/CHANGES   20 May 2008 09:22:53 -  1.2355
  +++ rpm/CHANGES   20 May 2008 12:52:01 -  1.2356
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +- afb: fix VPATH builds finding rpmversion.h (in perl, with MakeMaker)
   - afb: fix VPATH builds finding rpmversion.h (in python)
   - afb: internal liblzma was not properly in autoconf/automake
   - afb: fix VPATH builds of lua finding "system.h" from popt (not rpm)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 14:49:44
  Branch: HEAD Handle: 2008052012494400

  Modified files:
rpm devtool.conf

  Log:
macosx: use the linking hack for now, make friends with glibtool later

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.218 -r2.219 devtool.conf
  --- rpm/devtool.conf  20 May 2008 07:01:18 -  2.218
  +++ rpm/devtool.conf  20 May 2008 12:49:44 -  2.219
  @@ -1502,6 +1502,8 @@
   CXXFLAGS="-O2 -g $UNIVERSAL_CFLAGS"
   LDFLAGS="$UNIVERSAL_LDFLAGS -Wl,-search_paths_first" # static
   LIBS="$LIBS -lssl -lcrypto" # shameless workaround for Neon
  +LDFLAGS="$LDFLAGS -L`pwd`/xar/lib/.libs" # Xar linking hack
  +LDFLAGS="$LDFLAGS -L`pwd`/lzma/src/liblzma/.libs" # LZMA hack
   export CPP
   export CC
   export CXX
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/perl/ Makefile.PL.in Makefile.am

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 14:47:47
  Branch: HEAD Handle: 2008052012474700

  Modified files:
rpm/perlMakefile.PL.in Makefile.am

  Log:
teach MakeMaker about VPATH

  Summary:
RevisionChanges Path
1.19+28 -2  rpm/perl/Makefile.PL.in
1.18+2  -1  rpm/perl/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/perl/Makefile.PL.in
  
  $ cvs diff -u -r1.18 -r1.19 Makefile.PL.in
  --- rpm/perl/Makefile.PL.in   16 Jan 2008 01:18:38 -  1.18
  +++ rpm/perl/Makefile.PL.in   20 May 2008 12:47:47 -  1.19
  @@ -1,12 +1,21 @@
  +package MY; # so that "SUPER" works right
  +
   use ExtUtils::MakeMaker;
   # See lib/ExtUtils/MakeMaker.pm for details of how to influence
   # the contents of the Makefile that is written.
   
   my @libdir = qw(. build lib popt rpmdb rpmio misc rpmconstant);
   
  -my @ldaddp = map { '[EMAIL PROTECTED]@/' . $_ . '/.libs' } @libdir;
  +my @ldaddp = map { '[EMAIL PROTECTED]@/' . $_ . '/.libs' } @libdir;
   my @ldadd = map { '-l' . $_ } qw(rpmmisc rpmio rpmbuild rpm popt rpmdb 
rpmconstant);
   
  +my @cppflags = qw(
  +[EMAIL PROTECTED]@
  +[EMAIL PROTECTED]@
  +[EMAIL PROTECTED]@/lib
  +[EMAIL PROTECTED]@/lib
  +);
  +
   my @objects = qw(
   rpmxs.o 
   RPM.o 
  @@ -32,6 +41,23 @@
   }
   }
   
  +# teach MakeMaker some VPATH $< manners:
  +sub c_o {
  +my $inherited = shift->SUPER::c_o(@_);
  +$inherited =~ s/(\.\w+\$\(OBJ_EXT\)\:\n\t.*?)\$\*\.\w+/$1\$\SUPER::xs_c(@_);
  +$inherited =~ s/(\.xs\.c\:\n\t.*?)\$\*\.\w+/$1\$\SUPER::xs_o(@_);
  +$inherited =~ s/(\.\w+\$\(OBJ_EXT\)\:\n\t.*?)\$\*\.\w+/$1\$\ 'RPM',
  'OBJECT'  => join(' ', @objects),
  @@ -42,7 +68,7 @@
  'LDFLAGS' => join(' ', @ldflags),
  'dynamic_lib' => { OTHERLDFLAGS => join(' ', @ldflags) },
  'OPTIMIZE'=> '-g',
  -   'INC' => join(' ', map { '[EMAIL PROTECTED]@/'. $_ } @libdir) 
. ' @CPPFLAGS@',
  +   'INC' => join(' ', @cppflags, map { '[EMAIL PROTECTED]@/'. $_ 
} @libdir) . ' @CPPFLAGS@',
  'INSTALLMAN1DIR'  => '@mandir@/man1',
  'INSTALLMAN3DIR'  => '@mandir@/man3',
  @PERL_INSTALLDIRS@
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/perl/Makefile.am
  
  $ cvs diff -u -r1.17 -r1.18 Makefile.am
  --- rpm/perl/Makefile.am  7 Aug 2007 00:09:58 -   1.17
  +++ rpm/perl/Makefile.am  20 May 2008 12:47:47 -  1.18
  @@ -21,7 +21,8 @@
   noinst_DATA = .made_mod
   
   .made_mod: Makefile.perl $(EXTRA_DIST) MANIFEST
  - $(MAKE) -f Makefile.perl || $(MAKE) -f Makefile.perl
  + $(MAKE) -f Makefile.perl VPATH=$(VPATH) || \
  + $(MAKE) -f Makefile.perl VPATH=$(VPATH)
   
   test: .made_mod
$(MAKE) -f Makefile.perl test
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: lzma/src/liblzma/ Makefile.am xar/lib/ Makefile.am

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: xar lzma Date:   20-May-2008 11:25:07
  Branch: HEAD Handle: 2008052009250600

  Modified files:
lzma/src/liblzmaMakefile.am
xar/lib Makefile.am

  Log:
add reminder of change from upstream

  Summary:
RevisionChanges Path
1.3 +1  -0  lzma/src/liblzma/Makefile.am
1.4 +1  -0  xar/lib/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: lzma/src/liblzma/Makefile.am
  
  $ cvs diff -u -r1.2 -r1.3 Makefile.am
  --- lzma/src/liblzma/Makefile.am  20 May 2008 09:15:47 -  1.2
  +++ lzma/src/liblzma/Makefile.am  20 May 2008 09:25:06 -  1.3
  @@ -14,6 +14,7 @@
   
   SUBDIRS = api common check
   
  +# RPM5: don't install internal liblzma
   noinst_LTLIBRARIES = liblzma.la
   liblzma_la_SOURCES =
   liblzma_la_LDFLAGS = -version-info 0:0:0
  @@ .
  patch -p0 <<'@@ .'
  Index: xar/lib/Makefile.am
  
  $ cvs diff -u -r1.3 -r1.4 Makefile.am
  --- xar/lib/Makefile.am   25 Feb 2008 09:42:35 -  1.3
  +++ xar/lib/Makefile.am   20 May 2008 09:25:06 -  1.4
  @@ -15,6 +15,7 @@
hash.h io.h linuxattr.h lzmaxar.h macho.h script.h signature.h \
stat.h strmode.h subdoc.h util.h zxar.h
   
  +# RPM5: don't install internal libxar
   noinst_LTLIBRARIES = libxar.la
   
   libxar_la_SOURCES = \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/python/ Makefile.am

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 11:22:53
  Branch: HEAD Handle: 2008052009225300

  Modified files:
rpm CHANGES
rpm/python  Makefile.am

  Log:
copy rpmversion.h build fix

  Summary:
RevisionChanges Path
1.2355  +1  -0  rpm/CHANGES
1.79+1  -0  rpm/python/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2354 -r1.2355 CHANGES
  --- rpm/CHANGES   20 May 2008 09:21:28 -  1.2354
  +++ rpm/CHANGES   20 May 2008 09:22:53 -  1.2355
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +- afb: fix VPATH builds finding rpmversion.h (in python)
   - afb: internal liblzma was not properly in autoconf/automake
   - afb: fix VPATH builds of lua finding "system.h" from popt (not rpm)
   - afb: fix VPATH builds finding rpmversion.h (in tools)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/Makefile.am
  
  $ cvs diff -u -r1.78 -r1.79 Makefile.am
  --- rpm/python/Makefile.am15 Jan 2008 19:53:58 -  1.78
  +++ rpm/python/Makefile.am20 May 2008 09:22:53 -  1.79
  @@ -15,6 +15,7 @@
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
  + -I$(top_builddir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 11:21:28
  Branch: HEAD Handle: 2008052009212800

  Modified files:
rpm CHANGES

  Log:
update changelog for liblzma

  Summary:
RevisionChanges Path
1.2354  +1  -0  rpm/CHANGES
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2353 -r1.2354 CHANGES
  --- rpm/CHANGES   20 May 2008 07:44:58 -  1.2353
  +++ rpm/CHANGES   20 May 2008 09:21:28 -  1.2354
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +- afb: internal liblzma was not properly in autoconf/automake
   - afb: fix VPATH builds of lua finding "system.h" from popt (not rpm)
   - afb: fix VPATH builds finding rpmversion.h (in tools)
   - jbj: fix: rpm-python h['filenames'] needs tagName(0x54aafb71) to
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ configure.ac

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 11:18:29
  Branch: HEAD Handle: 2008052009182900

  Modified files:
rpm configure.ac

  Log:
fix internal liblzma location (copy/paste bug from libmagic)

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

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.297 -r2.298 configure.ac
  --- rpm/configure.ac  7 May 2008 16:58:24 -   2.297
  +++ rpm/configure.ac  20 May 2008 09:18:29 -  2.298
  @@ -961,7 +961,7 @@
   RPM_CHECK_LIB(
   [LZMA Utils], [lzma],
   [lzma], [lzma_init], [lzma.h],
  -[no,external:internal:none], [lzma:src:src],
  +[no,external:internal:none], [lzma:src/liblzma/api:src/liblzma],
   [ AC_CHECK_FUNC(lzma_init)
 if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
 WITH_LZMA_INTERNAL=true
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ Makefile.am

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 11:17:42
  Branch: HEAD Handle: 2008052009174100

  Modified files:
rpm Makefile.am

  Log:
internal lzma dir/flags were missing

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

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.217 -r2.218 Makefile.am
  --- rpm/Makefile.am   7 May 2008 16:58:24 -   2.217
  +++ rpm/Makefile.am   20 May 2008 09:17:41 -  2.218
  @@ -48,6 +48,7 @@
@WITH_LUA_SUBDIR@ \
@WITH_FILE_SUBDIR@ \
@WITH_XAR_SUBDIR@ \
  + @WITH_LZMA_SUBDIR@ \
misc \
rpmio \
rpmdb \
  @@ -75,7 +76,8 @@
@WITH_ZLIB_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
  - @WITH_XAR_CPPFLAGS@
  + @WITH_XAR_CPPFLAGS@ \
  + @WITH_LZMA_CPPFLAGS@
   
   myLDADD = \
$(top_builddir)/build/librpmbuild.la \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: lzma/src/liblzma/ Makefile.am

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: lzma Date:   20-May-2008 11:15:48
  Branch: HEAD Handle: 2008052009154700

  Modified files:
lzma/src/liblzmaMakefile.am

  Log:
don't try to install (shared) liblzma, use as internal (static)
library only

  Summary:
RevisionChanges Path
1.2 +1  -1  lzma/src/liblzma/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: lzma/src/liblzma/Makefile.am
  
  $ cvs diff -u -r1.1.1.1 -r1.2 Makefile.am
  --- lzma/src/liblzma/Makefile.am  27 Apr 2008 12:09:55 -  1.1.1.1
  +++ lzma/src/liblzma/Makefile.am  20 May 2008 09:15:47 -  1.2
  @@ -14,7 +14,7 @@
   
   SUBDIRS = api common check
   
  -lib_LTLIBRARIES = liblzma.la
  +noinst_LTLIBRARIES = liblzma.la
   liblzma_la_SOURCES =
   liblzma_la_LDFLAGS = -version-info 0:0:0
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: lua/ Makefile.am rpm/ CHANGES

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm lua  Date:   20-May-2008 09:44:59
  Branch: HEAD Handle: 2008052007445801

  Modified files:
lua Makefile.am
rpm CHANGES

  Log:
so that was why glob_t was not defined (wrong system.h)

  Summary:
RevisionChanges Path
1.19+1  -0  lua/Makefile.am
1.2353  +1  -0  rpm/CHANGES
  

  patch -p0 <<'@@ .'
  Index: lua/Makefile.am
  
  $ cvs diff -u -r1.18 -r1.19 Makefile.am
  --- lua/Makefile.am   20 May 2008 07:26:54 -  1.18
  +++ lua/Makefile.am   20 May 2008 07:44:59 -  1.19
  @@ -8,6 +8,7 @@
local/llocal.lua
   
   AM_CPPFLAGS = \
  + -I$(top_srcdir) \
-I$(srcdir)/local \
-I$(builddir)/local \
-I$(srcdir)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2352 -r1.2353 CHANGES
  --- rpm/CHANGES   20 May 2008 06:57:50 -  1.2352
  +++ rpm/CHANGES   20 May 2008 07:44:58 -  1.2353
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +- afb: fix VPATH builds of lua finding "system.h" from popt (not rpm)
   - afb: fix VPATH builds finding rpmversion.h (in tools)
   - jbj: fix: rpm-python h['filenames'] needs tagName(0x54aafb71) to
return "Filenames" in order to find the filepathsTag extension.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: lua/ Makefile.am

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: lua  Date:   20-May-2008 09:26:54
  Branch: HEAD Handle: 2008052007265400

  Modified files:
lua Makefile.am

  Log:
fix VPATH lua builds

  Summary:
RevisionChanges Path
1.18+2  -0  lua/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: lua/Makefile.am
  
  $ cvs diff -u -r1.17 -r1.18 Makefile.am
  --- lua/Makefile.am   12 Jan 2008 12:33:33 -  1.17
  +++ lua/Makefile.am   20 May 2008 07:26:54 -  1.18
  @@ -9,6 +9,7 @@
   
   AM_CPPFLAGS = \
-I$(srcdir)/local \
  + -I$(builddir)/local \
-I$(srcdir)
   
   rpmlua_SOURCES = lua.c
  @@ -95,6 +96,7 @@
   
   $(builddir)/local/llocal.c: $(builddir)/local/llocal_lua.c
   $(builddir)/local/llocal_lua.c: $(builddir)/bin2c $(srcdir)/local/llocal.lua
  + mkdir -p $(builddir)/local
$(builddir)/bin2c $(srcdir)/local/llocal.lua 
>$(builddir)/local/llocal_lua.c
   
   clean-local:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2008-05-20 Thread Anders F. Bjï¿½rklund

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   20-May-2008 09:01:18
  Branch: HEAD Handle: 2008052007011800

  Modified files:
rpm devtool.conf

  Log:
enable lzma for %macosx

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.217 -r2.218 devtool.conf
  --- rpm/devtool.conf  15 May 2008 12:03:54 -  2.217
  +++ rpm/devtool.conf  20 May 2008 07:01:18 -  2.218
  @@ -1095,7 +1095,7 @@
   ##  This also requires --disable-dependency-tracking, since it doesn't
   ##  work with multiple -arch flags (see Apple's Technical Note TN2137)
   ##
  -##  These libraries are being built internally: db, lua, zlib, file, xar
  +##  These libraries are built internally: db, lua, zlib, file, xar, lzma
   ##  These libraries are statically linked: neon, beecrypt, sqlite, popt
   ##  (building popt statically requires that the required popt.h header
   ##  is included within the rpm headers, so that it can be found later)
  @@ -1528,6 +1528,7 @@
   --with-zlib=internal \
   --with-file=internal \
   --with-xar=internal \
  +--with-lzma=internal \
   --with-neon="$basemac/bin/neon-${v_neon}" \
   --with-beecrypt="$basemac/bin/beecrypt-${v_beecrypt}" \
   --with-sqlite="$basemac/bin/sqlite-${v_sqlite}" \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_1: rpm/tools/ debugedit.c

[CVS] RPM: rpm/ devtool.conf

[CVS] RPM: rpm-5_1: rpm/ CHANGES devtool.conf

[CVS] RPM: rpm/ Makefile.am

[CVS] RPM: rpm/ CHANGES

[CVS] RPM: rpm-5_0: xar/lib/ lzmaxar.c

[CVS] RPM: rpm-5_0: rpm/ CHANGES Makefile.am configure.ac rpm/tests/ M...

[CVS] RPM: rpm/ devtool.conf

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

[CVS] RPM: rpm-5_1: xar/lib/ lzmaxar.c

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

[CVS] RPM: rpm-5_1: rpm/ CHANGES Makefile.am configure.ac rpm/tests/ M...

[CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/tests/ Makefile.am devtool-sanity...

[CVS] RPM: rpm/ TODO devtool.conf xar/include/ config.h.in

[CVS] RPM: rpm/tests/ Makefile.am

[CVS] RPM: rpm/ CHANGES

[CVS] RPM: rpm/ devtool.conf

[CVS] RPM: rpm/perl/ Makefile.PL.in Makefile.am

[CVS] RPM: lzma/src/liblzma/ Makefile.am xar/lib/ Makefile.am

[CVS] RPM: rpm/ CHANGES rpm/python/ Makefile.am

[CVS] RPM: rpm/ CHANGES

[CVS] RPM: rpm/ configure.ac

[CVS] RPM: rpm/ Makefile.am

[CVS] RPM: lzma/src/liblzma/ Makefile.am

[CVS] RPM: lua/ Makefile.am rpm/ CHANGES

[CVS] RPM: lua/ Makefile.am

[CVS] RPM: rpm/ devtool.conf

27 matches

Site Navigation

Mail list logo

Footer information