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

2009-08-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-Aug-2009 17:53:09
  Branch: HEAD Handle: 2009082015530900

  Modified files:
rpm/rpmio   macro.c

  Log:
- remove a dangling curly under an #ifdef.

  Summary:
RevisionChanges Path
2.236   +1  -1  rpm/rpmio/macro.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/macro.c
  
  $ cvs diff -u -r2.235 -r2.236 macro.c
  --- rpm/rpmio/macro.c 4 Jul 2009 15:54:28 -   2.235
  +++ rpm/rpmio/macro.c 20 Aug 2009 15:53:09 -  2.236
  @@ -2821,7 +2821,7 @@
   else
   #endif
   #if defined(RPM_VENDOR_OPENSUSE)
  -if (magic[0] == 0135  magic[1] == 0  magic[2] == 0) {
/* lzma */
  +if (magic[0] == 0135  magic[1] == 0  magic[2] == 0)  /* lzma 
*/
*compressed = COMPRESSED_LZMA;
   else
   #endif
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2009-08-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-Aug-2009 17:54:09
  Branch: HEAD Handle: 2009082015540900

  Modified files:
rpm/rpmdb   db3.c

  Log:
- balance curly brckets wrto #ifdef's.

  Summary:
RevisionChanges Path
1.95+3  -2  rpm/rpmdb/db3.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/db3.c
  
  $ cvs diff -u -r1.94 -r1.95 db3.c
  --- rpm/rpmdb/db3.c   23 May 2009 15:48:44 -  1.94
  +++ rpm/rpmdb/db3.c   20 Aug 2009 15:54:09 -  1.95
  @@ -1242,10 +1242,11 @@
long size = -1;
if (stat(dbf, sb) == 0)
size = (long)sb.st_size;
  - if (access(dbf, F_OK) == -1 || size == 0) {
  + if (access(dbf, F_OK) == -1 || size == 0)
   #else
  - if (access(dbf, F_OK) == -1) {
  + if (access(dbf, F_OK) == -1)
   #endif
  + {
/* ... non-existent (or unwritable) DBENV, will create ... */
dbi-dbi_oeflags |= DB_CREATE;
dbi-dbi_eflags = ~DB_JOINENV;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: pcre/ pcreposix.h

2009-08-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: pcre Date:   20-Aug-2009 17:54:30
  Branch: HEAD Handle: 2009082015543000

  Modified files:
pcrepcreposix.h

  Log:
- typo.

  Summary:
RevisionChanges Path
1.4 +1  -2  pcre/pcreposix.h
  

  patch -p0 '@@ .'
  Index: pcre/pcreposix.h
  
  $ cvs diff -u -r1.3 -r1.4 pcreposix.h
  --- pcre/pcreposix.h  18 Aug 2009 21:41:02 -  1.3
  +++ pcre/pcreposix.h  20 Aug 2009 15:54:30 -  1.4
  @@ -135,14 +135,13 @@
   PCREPOSIX_EXP_DECL int pcre_regexec(const regex_t *, const char *, size_t,
regmatch_t *, int);
   PCREPOSIX_EXP_DECL size_t pcre_regerror(int, const regex_t *, char *, 
size_t);
  -PCREPOSIX_EXP_DECL void rpcre_egfree(regex_t *);
  +PCREPOSIX_EXP_DECL void pcre_regfree(regex_t *);
   
   #define regcomp pcreposix_regcomp
   #define regexec pcreposix_regexec
   #define regerror pcreposix_regerror
   #define regfree pcreposix_regfree
   
  -
   #ifdef __cplusplus
   }   /* extern C */
   #endif
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2009-08-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-Aug-2009 17:56:00
  Branch: HEAD Handle: 200908201900

  Modified files:
rpm/rpmio   rpmsquirrel.c

  Log:
- squirrel: needs #include stdarg.h on F11.

  Summary:
RevisionChanges Path
2.4 +1  -0  rpm/rpmio/rpmsquirrel.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmsquirrel.c
  
  $ cvs diff -u -r2.3 -r2.4 rpmsquirrel.c
  --- rpm/rpmio/rpmsquirrel.c   3 Jul 2009 16:10:06 -   2.3
  +++ rpm/rpmio/rpmsquirrel.c   20 Aug 2009 15:55:59 -  2.4
  @@ -1,4 +1,5 @@
   #include system.h
  +#include stdarg.h
   
   #include argv.h
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ macros.in

2009-08-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-Aug-2009 18:16:15
  Branch: HEAD Handle: 2009082016161500

  Modified files:
rpm macros.in

  Log:
- rpm.org: Add %make_install macro that does the right thing.

  Summary:
RevisionChanges Path
1.290   +7  -2  rpm/macros.in
  

  patch -p0 '@@ .'
  Index: rpm/macros.in
  
  $ cvs diff -u -r1.289 -r1.290 macros.in
  --- rpm/macros.in 20 Aug 2009 16:14:08 -  1.289
  +++ rpm/macros.in 20 Aug 2009 16:16:15 -  1.290
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.289 2009/08/20 16:14:08 jbj Exp $
  +# $Id: macros.in,v 1.290 2009/08/20 16:16:15 jbj Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -1491,7 +1491,12 @@
--infodir=%{_infodir}
   
   
#--
  -# The make install analogue of %configure:
  +# The make install analogue of %configure for modern autotools:
  +%make_install make install DESTDIR=%{?buildroot}
  +
  
+#--
  +# Former make install analogue, kept for compatibility and for old/broken
  +#  packages that don't support DESTDIR properly.
   %makeinstall \
 make \\\
prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2009-08-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-Aug-2009 18:28:22
  Branch: HEAD Handle: 2009082016282200

  Modified files:
rpm/build   files.c

  Log:
- rpm.org: Copy BUGURL to source rpm's too.

  Summary:
RevisionChanges Path
1.360   +1  -0  rpm/build/files.c
  

  patch -p0 '@@ .'
  Index: rpm/build/files.c
  
  $ cvs diff -u -r1.359 -r1.360 files.c
  --- rpm/build/files.c 11 Jul 2009 21:32:34 -  1.359
  +++ rpm/build/files.c 20 Aug 2009 16:28:22 -  1.360
  @@ -2548,6 +2548,7 @@
case RPMTAG_CHANGELOGNAME:
case RPMTAG_CHANGELOGTEXT:
case RPMTAG_URL:
  + case RPMTAG_BUGURL:
case RPMTAG_ICON:
case RPMTAG_GIF:
case RPMTAG_XPM:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/python/ header-py.c

2009-08-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-Aug-2009 18:32:43
  Branch: HEAD Handle: 2009082016324200

  Modified files:
rpm/python  header-py.c

  Log:
- rpm.org: Add isSource() method to python header object (ticket #32).

  Summary:
RevisionChanges Path
1.110   +8  -0  rpm/python/header-py.c
  

  patch -p0 '@@ .'
  Index: rpm/python/header-py.c
  
  $ cvs diff -u -r1.109 -r1.110 header-py.c
  --- rpm/python/header-py.c21 Jul 2009 22:33:25 -  1.109
  +++ rpm/python/header-py.c20 Aug 2009 16:32:42 -  1.110
  @@ -149,6 +149,12 @@
   return 0;
   }
   
  +static PyObject *hdrIsSource(hdrObject *s)
  +{
  +int isSource = !headerIsEntry(s-h, RPMTAG_SOURCERPM);
  +return PyBool_FromLong(isSource);
  +}
  +
   /** \ingroup python
* \name Class: Rpmhdr
*/
  @@ -306,6 +312,8 @@
NULL },
   {sprintf,  (PyCFunction) hdrSprintf,   
METH_VARARGS|METH_KEYWORDS,
NULL },
  +{isSource, (PyCFunction)hdrIsSource,   METH_NOARGS, 
  + NULL },
   
   {dsOfHeader,   (PyCFunction)hdr_dsOfHeader,METH_NOARGS,
NULL},
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2009-08-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-Aug-2009 18:10:20
  Branch: HEAD Handle: 2009082016102000

  Modified files:
rpm/lib rpmrc.c

  Log:
- balance curly brackets in spite of #ifdef's.

  Summary:
RevisionChanges Path
2.288   +5  -6  rpm/lib/rpmrc.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/rpmrc.c
  
  $ cvs diff -u -r2.287 -r2.288 rpmrc.c
  --- rpm/lib/rpmrc.c   15 May 2009 12:28:44 -  2.287
  +++ rpm/lib/rpmrc.c   20 Aug 2009 16:10:20 -  2.288
  @@ -745,10 +745,11 @@
cp = _platform;
if (rpmPlatform(cp) == RPMRC_OK) {
   #elif defined(WITH_CPUINFO)  defined(WITH_SYCK)
  - if (rpmPlatform(_platform) == RPMRC_OK || rpmCpuinfo() == RPMRC_OK) {
  + if (rpmPlatform(_platform) == RPMRC_OK || rpmCpuinfo() == RPMRC_OK)
   #else
  - if (rpmPlatform(_platform) == RPMRC_OK) {
  + if (rpmPlatform(_platform) == RPMRC_OK)
   #endif
  + {
const char * s;
gotDefaults = 1;
s = rpmExpand(%{?_host_cpu}, NULL);
  @@ -886,10 +887,8 @@
   } else {
if (num) *num = 255;
   #if defined(WITH_CPUINFO)
  - if (name)
  - {
  - if(type == ARCH)
  - {
  + if (name) {
  + if(type == ARCH) {
int i, j, n;
ARGV_t archs = NULL;
char *pref = rpmExpand(%{?_prefer_target_cpu}, NULL);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2009-08-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-Aug-2009 18:42:47
  Branch: HEAD Handle: 2009082016424700

  Modified files:
rpm/build   spec.c

  Log:
- rpm.org: Avoid adding Lua sources/patches twice when recursing
(ticket #82).

  Summary:
RevisionChanges Path
2.204   +12 -11 rpm/build/spec.c
  

  patch -p0 '@@ .'
  Index: rpm/build/spec.c
  
  $ cvs diff -u -r2.203 -r2.204 spec.c
  --- rpm/build/spec.c  1 Jun 2009 13:40:28 -   2.203
  +++ rpm/build/spec.c  20 Aug 2009 16:42:47 -  2.204
  @@ -464,19 +464,20 @@
(flag  RPMFILE_PATCH) ? PATCH : SOURCE, num);
addMacro(spec-macros, buf, NULL, p-fullSource, RMIL_SPEC);
   #ifdef WITH_LUA
  -{rpmlua lua = NULL; /* global state */
  - const char * what = (flag  RPMFILE_PATCH) ? patches : sources;
  - rpmluav var = rpmluavNew();
  -
  - rpmluaPushTable(lua, what);
  - rpmluavSetListMode(var, 1);
  - rpmluavSetValue(var, RPMLUAV_STRING, body);
  - rpmluaSetVar(lua, var);
  + if (!spec-recursing) {
  + rpmlua lua = NULL; /* global state */
  + const char * what = (flag  RPMFILE_PATCH) ? patches : sources;
  + rpmluav var = rpmluavNew();
  +
  + rpmluaPushTable(lua, what);
  + rpmluavSetListMode(var, 1);
  + rpmluavSetValue(var, RPMLUAV_STRING, body);
  + rpmluaSetVar(lua, var);
   /*...@-moduncon@*/
  - var = (rpmluav) rpmluavFree(var);
  + var = (rpmluav) rpmluavFree(var);
   /*...@=moduncon@*/
  - rpmluaPop(lua);
  -}
  + rpmluaPop(lua);
  + }
   #endif
body = _free(body);
   }
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/build/ parsePreamble.c rpm/rpmdb/ rpmtag.h

2009-08-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-Aug-2009 18:11:31
  Branch: HEAD Handle: 2009082016113100

  Modified files:
rpm/build   parsePreamble.c
rpm/rpmdb   rpmtag.h

  Log:
- rpm.org: add RPMTAG_BUGURL.

  Summary:
RevisionChanges Path
2.191   +4  -0  rpm/build/parsePreamble.c
1.66+2  -1  rpm/rpmdb/rpmtag.h
  

  patch -p0 '@@ .'
  Index: rpm/build/parsePreamble.c
  
  $ cvs diff -u -r2.190 -r2.191 parsePreamble.c
  --- rpm/build/parsePreamble.c 6 Apr 2009 00:21:21 -   2.190
  +++ rpm/build/parsePreamble.c 20 Aug 2009 16:11:31 -  2.191
  @@ -45,6 +45,7 @@
   RPMTAG_CHANGELOGTEXT,
   RPMTAG_PREFIXES,
   RPMTAG_DISTTAG,
  +RPMTAG_BUGURL,
   RPMTAG_CVSID,
   RPMTAG_VARIANTS,
   RPMTAG_XMAJOR,
  @@ -369,6 +370,7 @@
   { RPMTAG_DISTRIBUTION,   %{distribution} },
   { RPMTAG_DISTTAG,%{disttag} },
   { RPMTAG_DISTURL,%{disturl} },
  +{ RPMTAG_BUGURL, %{bugurl} },
   { 0x,%{class} },
   { -1, NULL }
   };
  @@ -654,6 +656,7 @@
   case RPMTAG_DISTTAG:
   case RPMTAG_REPOTAG:
   case RPMTAG_CVSID:
  +case RPMTAG_BUGURL:
SINGLE_TOKEN_ONLY;
/* These macros are for backward compatibility */
if (tag == RPMTAG_VERSION) {
  @@ -963,6 +966,7 @@
   {RPMTAG_AUTOPROV,0, 0, autoprov},
   {RPMTAG_DOCDIR,  0, 0, docdir},
   {RPMTAG_DISTTAG, 0, 0, disttag},
  +{RPMTAG_BUGURL,  0, 0, bugurl},
   {RPMTAG_CVSID,   0, 0, cvsid},
   {RPMTAG_SVNID,   0, 0, svnid},
   {RPMTAG_SUGGESTSFLAGS,   0, 0, suggests},
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/rpmtag.h
  
  $ cvs diff -u -r1.65 -r1.66 rpmtag.h
  --- rpm/rpmdb/rpmtag.h25 Jul 2009 00:58:16 -  1.65
  +++ rpm/rpmdb/rpmtag.h20 Aug 2009 16:11:31 -  1.66
  @@ -424,7 +424,8 @@
   RPMTAG_DISTEPOCH = 1218, /* s */
   #define  RPMTAG_D RPMTAG_DISTEPOCH   /* s */
   
  -RPMTAG_FILEDIGESTALGO   = 5011, /* i file checksum algorithm */
  +RPMTAG_FILEDIGESTALGO= 5011, /* i file checksum algorithm */
  +RPMTAG_BUGURL= 5012, /* s */
   
   /*...@-enummemuse@*/
   RPMTAG_FIRSTFREE_TAG,/*! internal */
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ Makefile.am rpm/build/ Makefile.am rpm/lib/ Makefile.a...

2009-08-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-Aug-2009 18:51:30
  Branch: HEAD Handle: 2009082016512802

  Modified files:
rpm Makefile.am
rpm/build   Makefile.am
rpm/lib Makefile.am
rpm/rpmdb   Makefile.am
rpm/rpmio   Makefile.am

  Log:
- add a phony mccabe make target to generate McCabe metrics using
pmmccabe.

  Summary:
RevisionChanges Path
2.240   +9  -0  rpm/Makefile.am
2.76+5  -0  rpm/build/Makefile.am
2.192   +6  -1  rpm/lib/Makefile.am
1.109   +5  -0  rpm/rpmdb/Makefile.am
1.255   +5  -0  rpm/rpmio/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.239 -r2.240 Makefile.am
  --- rpm/Makefile.am   6 Aug 2009 00:49:39 -   2.239
  +++ rpm/Makefile.am   20 Aug 2009 16:51:28 -  2.240
  @@ -3,6 +3,7 @@
   AUTOMAKE_OPTIONS = 1.4 foreign
   
   LINT = splint
  +MCCABE = pmccabe
   
   EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL cpuinfo.yaml \
autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
  @@ -150,6 +151,14 @@
`make -s sources -C rpmio` \
`make -s sources -C file/src`
   
  +.PHONY:  mccabe
  +mccabe:
  + @$(MCCABE) rpmqv.c $(rpmbuild_SOURCES) \
  + `make -s sources -C build` \
  + `make -s sources -C lib` \
  + `make -s sources -C rpmdb` \
  + `make -s sources -C rpmio` | sort -nr | head -n 30
  +
   .PHONY: updatepo
   updatepo:
rsync -Lrtvz  translationproject.org::tp/latest/rpm/  po
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/Makefile.am
  
  $ cvs diff -u -r2.75 -r2.76 Makefile.am
  --- rpm/build/Makefile.am 13 Apr 2009 18:31:54 -  2.75
  +++ rpm/build/Makefile.am 20 Aug 2009 16:51:29 -  2.76
  @@ -3,6 +3,7 @@
   AUTOMAKE_OPTIONS = 1.4 foreign
   
   LINT = splint
  +MCCABE = pmccabe
   
   EXTRA_DIST = librpmbuild.vers
   
  @@ -88,6 +89,10 @@
   lint:
$(LINT) ${DEFS} ${INCLUDES} ${librpmbuild_la_SOURCES}
   
  +.PHONY:  mccabe
  +mccabe:
  + $(MCCABE) $(librpmbuild_la_SOURCES) | sort -n -r | head -n 20
  +
   .PHONY:  lcov-reset  # run lcov from scratch, always
   lcov-reset:
make lcov-run
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/Makefile.am
  
  $ cvs diff -u -r2.191 -r2.192 Makefile.am
  --- rpm/lib/Makefile.am   6 Aug 2009 00:52:28 -   2.191
  +++ rpm/lib/Makefile.am   20 Aug 2009 16:51:29 -  2.192
  @@ -3,6 +3,7 @@
   AUTOMAKE_OPTIONS = 1.4 foreign
   
   LINT = splint
  +MCCABE = pmccabe
   
   SUBDIRS = # tests
   
  @@ -38,7 +39,7 @@
   pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX)
   pkginc_HEADERS = \
rpmcli.h rpmversion.h rpmds.h rpmfi.h rpmps.h \
  - rpmrc.h rpmte.h rpmts.h rpm4compat.h rpm46compat
  + rpmrc.h rpmte.h rpmts.h rpm4compat.h rpm46compat.h
   noinst_HEADERS = \
filetriggers.h fs.h fsm.h manifest.h misc.h psm.h rpmal.h \
rpmfc.h rpmgi.h rpmlib.h rpmlock.h rpmluaext.h rpmrollback.h
  @@ -102,6 +103,10 @@
   lint:
$(LINT) $(DEFS) $(INCLUDES) $(librpm_la_SOURCES)
   
  +.PHONY:  mccabe
  +mccabe:
  + $(MCCABE) $(librpm_la_SOURCES) | sort -n -r | head -n 20
  +
   .PHONY:  lcov-reset  # run lcov from scratch, always
   lcov-reset:
make lcov-run
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.108 -r1.109 Makefile.am
  --- rpm/rpmdb/Makefile.am 1 Jun 2009 13:22:37 -   1.108
  +++ rpm/rpmdb/Makefile.am 20 Aug 2009 16:51:29 -  1.109
  @@ -3,6 +3,7 @@
   AUTOMAKE_OPTIONS = 1.4 foreign
   
   LINT = splint
  +MCCABE = pmccabe
   
   SUBDIRS = # tests
   
  @@ -132,6 +133,10 @@
   lint:
$(LINT) $(DEFS) $(INCLUDES) $(librpmdb_la_SOURCES) $(DBLIBSRCS)
   
  +.PHONY:  mccabe
  +mccabe:
  + $(MCCABE) $(librpmdb_la_SOURCES) $(DBLIBSRCS) | sort -n -r | head -n 10
  +
   .PHONY:  lcov-reset  # run lcov from scratch, always
   lcov-reset:
make lcov-run
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/Makefile.am
  
  $ cvs diff -u -r1.254 -r1.255 Makefile.am
  ---

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

2009-08-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-Aug-2009 18:55:54
  Branch: HEAD Handle: 2009082016555300

  Modified files:
rpm/rpmio   rpmrpc.c

  Log:
- hmm, hotwire HAVE_FALLOCATE, fallocate64 seems to be AWOL in F11.

  Summary:
RevisionChanges Path
2.91+1  -0  rpm/rpmio/rpmrpc.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmrpc.c
  
  $ cvs diff -u -r2.90 -r2.91 rpmrpc.c
  --- rpm/rpmio/rpmrpc.c4 Jul 2009 14:35:39 -   2.90
  +++ rpm/rpmio/rpmrpc.c20 Aug 2009 16:55:53 -  2.91
  @@ -1442,6 +1442,7 @@
   return fstat(Fileno(fd), st);
   }
   
  +#undef   HAVE_FALLOCATE  /* XXX hmmm, fallocate64 is AWOL in F11. */
   int Fallocate(FD_t fd, off_t offset, off_t len)
   {
   const char * path = fdGetOPath(fd);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2009-08-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:   21-Aug-2009 05:18:38
  Branch: HEAD Handle: 2009082103183602

  Modified files:
rpm Makefile.am
rpm/macros  macros.in perl.in php.in python.in
rpm/perlRPM.xs
rpm/rpmio   librpmio.vers macro.c rpmlua.c rpmmacro.h
  Removed files:
rpm macros.in

  Log:
- macros: refactor perl/php/python peculier config into separate file.
- macros: expand %{load:...} immediiately/recursively when loading.

  Summary:
RevisionChanges Path
2.242   +7  -2  rpm/Makefile.am
1.291   +0  -1765   rpm/macros.in
1.2 +7  -50 rpm/macros/macros.in
1.2 +31 -7  rpm/macros/perl.in
1.2 +3  -5  rpm/macros/php.in
1.2 +24 -9  rpm/macros/python.in
1.32+1  -1  rpm/perl/RPM.xs
2.136   +1  -0  rpm/rpmio/librpmio.vers
2.237   +48 -12 rpm/rpmio/macro.c
2.75+2  -1  rpm/rpmio/rpmlua.c
2.54+2  -1  rpm/rpmio/rpmmacro.h
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.241 -r2.242 Makefile.am
  --- rpm/Makefile.am   21 Aug 2009 00:11:23 -  2.241
  +++ rpm/Makefile.am   21 Aug 2009 03:18:36 -  2.242
  @@ -116,8 +116,13 @@
   endif
   
   pkglibdir =  @USRLIBRPM@
  -pkglib_DATA =rpmpopt macros/macros cpuinfo.yaml
  -pkglib_SCRIPTS = install-sh mkinstalldirs
  +pkglib_DATA = rpmpopt macros/macros cpuinfo.yaml
  +
  +pkgbindir =  $(pkglibdir)/bin
  +pkgbin_SCRIPTS = install-sh mkinstalldirs
  +
  +pkgcfgdir =  $(pkglibdir)/macros.d
  +pkgcfg_DATA = macros/perl macros/php macros/python
   
   noinst_HEADERS = build.h debug.h system.h
   
  @@ .
  rm -f rpm/macros.in '@@ .'
  Index: rpm/macros.in
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.1 -r1.2 macros.in
  --- rpm/macros/macros.in  21 Aug 2009 00:11:24 -  1.1
  +++ rpm/macros/macros.in  21 Aug 2009 03:18:37 -  1.2
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.1 2009/08/21 00:11:24 jbj Exp $
  +# $Id: macros.in,v 1.2 2009/08/21 03:18:37 jbj Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -77,10 +77,7 @@
   %__mv@__MV@
   %__patch @__PATCH@
   %__pax   @__PAX@
  -%__perl  @__PERL@
   %__pgp   @__PGP@
  -%__php   @__PHP@
  -%__python@__PYTHON@
   %__rm@__RM@
   %__rsh   @__RSH@
   %__sed   @__SED@
  @@ -1616,6 +1613,8 @@
   #
   %find_lang   %{_rpmhome}/find-lang.sh %{buildroot}
   
  +%requires_eq()   %(echo '%*' | LC_ALL=C xargs -r rpm -q --qf 
'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 
0:/ /' | grep -v is not)
  +
   #
   # lua macros
   #
  @@ -1640,38 +1639,7 @@
   %__perl_provides %{_rpmhome}/perl.prov
   %__perl_requires %{_rpmhome}/perl.req
   
  -# Useful macros for building *.rpm perl packages.
  -#(from Artur Frysiak wi...@t17.ds.pwr.wroc.pl)
  -#
  -# For example, these can be used as (from ImageMagick.spec from PLD site)
  -#[...]
  -#BuildPrereq: perl
  -#[...]
  -#%package perl
  -#Summary: libraries and modules for access to ImageMagick from perl
  -#Group: Development/Languages/Perl
  -#Requires: %{name} = %{version}
  -#%requires_eqperl
  -#[...]
  -#%install
  -#rm -fr $RPM_BUILD_ROOT
  -#install -d $RPM_BUILD_ROOT/%{perl_sitearch}
  -#[...]
  -#%files perl
  -#%defattr(644,root,root,755)
  -#%{perl_sitearch}/Image
  -#%dir %{perl_sitearch}/auto/Image
  -#
  -
  -%requires_eq()   %(echo '%*' | LC_ALL=C xargs -r rpm -q --qf 
'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 
0:/ /' | grep -v is not)
  -
  -%perl_sitearch   %(eval `%{__perl} -V:installsitearch`; echo 
$installsitearch)