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

2012-04-26 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:   26-Apr-2012 14:57:30
  Branch: rpm-5_4  Handle: 2012042612573000

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

  Log:
- tests: drop perl-URPM internal until --nosignatires et al is
refeactored.

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

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.57 -r2.365.2.58 devtool.conf
  --- rpm/devtool.conf  25 Apr 2012 20:34:47 -  2.365.2.57
  +++ rpm/devtool.conf  26 Apr 2012 12:57:30 -  2.365.2.58
  @@ -454,7 +454,7 @@
   --with-python \
   --without-pythonembed \
   --with-perl \
  ---with-perl-urpm \
  +--without-perl-urpm \
   --without-perlembed \
   --with-ruby \
   --with-selinux \
  @@ -605,7 +605,7 @@
   --with-python \
   --with-pythonembed=/usr/lib:/usr/include/python2.6 \
   --with-perl \
  ---with-perl-urpm \
  +--without-perl-urpm \
   --with-perlembed=/usr/lib/perl5/CORE/:/usr/lib/perl5/CORE \
   --with-ruby=/usr/lib:/usr/lib/ruby/1.8 \
   --with-selinux \
  @@ -681,7 +681,7 @@
   --with-python \
   --with-pythonembed=/usr/lib:/usr/include/python2.7 \
   --with-perl \
  ---with-perl-urpm \
  +--without-perl-urpm \
   --with-perlembed=/usr/lib64/perl5/CORE/:/usr/lib64/perl5/CORE \
   --with-ruby=/usr/lib64:/usr/lib64/ruby/1.8 \
   --with-selinux \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ CHANGES build.c rpm/lib/ poptALL.c query.c rp...

2012-04-26 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:   26-Apr-2012 19:46:51
  Branch: rpm-5_4  Handle: 2012042617464902

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES build.c rpmqv.c system.h
rpm/lib poptALL.c query.c rpminstall.c rpmrollback.c tgi.c
transaction.c verify.c
rpm/tools   dbconvert.c rpm2cpio.c rpmcache.c rpmrepo.c

  Log:
- rpmts: hide bit test/set/clr methods behind some macros.
- crypto: unhook --nosignatures/--nodigests from a rpmts.

  Summary:
RevisionChanges Path
1.3501.2.250+2  -0  rpm/CHANGES
2.124.4.5   +2  -0  rpm/build.c
2.144.2.5   +6  -0  rpm/lib/poptALL.c
2.216.2.5   +2  -0  rpm/lib/query.c
1.229.2.6   +4  -0  rpm/lib/rpminstall.c
1.44.4.5+2  -0  rpm/lib/rpmrollback.c
2.28.4.3+2  -0  rpm/lib/tgi.c
1.429.2.10  +82 -50 rpm/lib/transaction.c
2.201.4.9   +2  -0  rpm/lib/verify.c
1.167.4.6   +2  -0  rpm/rpmqv.c
2.129.2.4   +5  -0  rpm/system.h
2.1.2.14+2  -0  rpm/tools/dbconvert.c
2.11.2.2+2  -0  rpm/tools/rpm2cpio.c
2.41.4.2+3  -0  rpm/tools/rpmcache.c
2.32.2.3+3  -1  rpm/tools/rpmrepo.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.249 -r1.3501.2.250 CHANGES
  --- rpm/CHANGES   26 Apr 2012 17:21:44 -  1.3501.2.249
  +++ rpm/CHANGES   26 Apr 2012 17:46:49 -  1.3501.2.250
  @@ -1,4 +1,6 @@
   5.4.8 - 5.4.9:
  +- jbj: rpmts: hide bit test/set/clr methods behind some macros.
  +- jbj: crypto: unhook --nosignatures/--nodigests from a rpmts.
   - jbj: python: fix: scrub out _RPMVSF_FOO setup in __init__.py.
   - jbj: crypto: eliminate _RPMVSF_{NOHEADER,NOPAYLOAD}.
   - jbj: crypto: refactor/eliminate _RPMVSF_{NOSIGNATURES,NODIGESTS}.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build.c
  
  $ cvs diff -u -r2.124.4.4 -r2.124.4.5 build.c
  --- rpm/build.c   25 Apr 2012 20:34:47 -  2.124.4.4
  +++ rpm/build.c   26 Apr 2012 17:46:49 -  2.124.4.5
  @@ -291,6 +291,7 @@
   
   vsflags = (rpmVSFlags) rpmExpandNumeric(%{?_vsflags_build});
   vsflags = (rpmVSFlags) 0;/* XXX FIXME: ignore default disablers. 
*/
  +#if defined(SUPPORT_NOSIGNATURES)
   if (!QVA_ISSET(ba-qva_flags, DIGEST)) {
VSF_SET(vsflags, NOSHA1HEADER);
VSF_SET(vsflags, NOMD5HEADER);
  @@ -307,6 +308,7 @@
VSF_SET(vsflags, NOHDRCHK);
   }
   VSF_CLR(vsflags, NEEDPAYLOAD);   /* XXX needed? */
  +#endif
   ovsflags = rpmtsSetVSFlags(ts, vsflags);
   
   if (targets == NULL) {
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/poptALL.c
  
  $ cvs diff -u -r2.144.2.4 -r2.144.2.5 poptALL.c
  --- rpm/lib/poptALL.c 25 Apr 2012 20:34:48 -  2.144.2.4
  +++ rpm/lib/poptALL.c 26 Apr 2012 17:46:50 -  2.144.2.5
  @@ -331,26 +331,32 @@
/*@notreached@*/ break;
   case RPMCLI_POPT_NODIGEST:
rpmcliQueryFlags = (rpmQueryFlags)(rpmcliQueryFlags | VERIFY_DIGEST);
  +#if defined(SUPPORT_NOSIGNATURES)
VSF_SET(pgpDigVSFlags, NOSHA1HEADER);
VSF_SET(pgpDigVSFlags, NOMD5HEADER);
VSF_SET(pgpDigVSFlags, NOSHA1);
VSF_SET(pgpDigVSFlags, NOMD5);
VSF_CLR(pgpDigVSFlags, NEEDPAYLOAD);/* XXX needed? */
  +#endif
break;
   
   case RPMCLI_POPT_NOSIGNATURE:
rpmcliQueryFlags = (rpmQueryFlags)(rpmcliQueryFlags | VERIFY_SIGNATURE);
  +#if defined(SUPPORT_NOSIGNATURES)
VSF_SET(pgpDigVSFlags, NODSAHEADER);
VSF_SET(pgpDigVSFlags, NORSAHEADER);
VSF_SET(pgpDigVSFlags, NODSA);
VSF_SET(pgpDigVSFlags, NORSA);
VSF_CLR(pgpDigVSFlags, NEEDPAYLOAD);/* XXX needed? */
  +#endif
break;
   
   case RPMCLI_POPT_NOHDRCHK:
rpmcliQueryFlags = (rpmQueryFlags) (rpmcliQueryFlags | VERIFY_HDRCHK);
  +#if defined(SUPPORT_NOSIGNATURES)
VSF_SET(pgpDigVSFlags, NOHDRCHK);
VSF_CLR(pgpDigVSFlags, NEEDPAYLOAD);/* XXX needed? */
  +#endif
break;
   
   case RPMCLI_POPT_TARGETPLATFORM:
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/query.c
  
  $ cvs diff -u -r2.216.2.4 -r2.216.2.5 query.c
  --- rpm/lib/query.c   25 Apr 2012 18:28:19 -  2.216.2.4
  

[CVS] RPM: rpm-5_4: rpm/lib/ Makefile.am query.c transaction.c

2012-04-26 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:   26-Apr-2012 20:36:19
  Branch: rpm-5_4  Handle: 2012042618361900

  Modified files:   (Branch: rpm-5_4)
rpm/lib Makefile.am query.c transaction.c

  Log:
- c++: WIP.

  Summary:
RevisionChanges Path
2.203.2.6   +3  -1  rpm/lib/Makefile.am
2.216.2.6   +2  -2  rpm/lib/query.c
1.429.2.11  +116 -75rpm/lib/transaction.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/Makefile.am
  
  $ cvs diff -u -r2.203.2.5 -r2.203.2.6 Makefile.am
  --- rpm/lib/Makefile.am   19 Apr 2012 17:26:06 -  2.203.2.5
  +++ rpm/lib/Makefile.am   26 Apr 2012 18:36:19 -  2.203.2.6
  @@ -69,7 +69,7 @@
   usrlibdir = $(libdir)
   usrlib_LTLIBRARIES = librpm.la
   librpm_la_SOURCES = \
  - formats.c fsm.c order.c poptI.c psm.c query.c transaction.c \
  + formats.c fsm.c order.c poptI.c psm.c \
depends.c \
filetriggers.c \
fs.c \
  @@ -77,6 +77,7 @@
misc.c \
poptALL.c \
poptQV.c \
  + query.c \
rpmal.c \
rpmchecksig.c \
rpmds.c \
  @@ -92,6 +93,7 @@
rpmte.c \
rpmts.c \
rpmversion.c \
  + transaction.c \
verify.c
   
   librpm_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/query.c
  
  $ cvs diff -u -r2.216.2.5 -r2.216.2.6 query.c
  --- rpm/lib/query.c   26 Apr 2012 17:46:50 -  2.216.2.5
  +++ rpm/lib/query.c   26 Apr 2012 18:36:19 -  2.216.2.6
  @@ -872,7 +872,7 @@
 if (giFlags  RPMGI_TSADD) {
qva-qva_gi = rpmgiNew(ts, RPMTAG_NVRA, NULL, 0);
qva-qva_rc = rpmgiSetArgs(qva-qva_gi, argv, rpmioFtsOpts,
  - (giFlags | (RPMGI_NOGLOB   )));
  + (rpmgiFlags) (giFlags | (RPMGI_NOGLOB   )));
if (rpmgiGetFlags(qva-qva_gi)  RPMGI_TSADD)   /* Load the ts with 
headers. */
while ((rpmrc = rpmgiNext(qva-qva_gi)) == RPMRC_OK)
{};
  @@ -886,7 +886,7 @@
 } else {
qva-qva_gi = rpmgiNew(ts, RPMDBI_ARGLIST, NULL, 0);
qva-qva_rc = rpmgiSetArgs(qva-qva_gi, argv, rpmioFtsOpts,
  - (giFlags | (RPMGI_NOGLOB|RPMGI_NOHEADER)));
  + (rpmgiFlags) (giFlags | (RPMGI_NOGLOB|RPMGI_NOHEADER)));
while ((rpmrc = rpmgiNext(qva-qva_gi)) == RPMRC_OK) {
const char * path;
path = rpmgiHdrPath(qva-qva_gi);
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/transaction.c
  
  $ cvs diff -u -r1.429.2.10 -r1.429.2.11 transaction.c
  --- rpm/lib/transaction.c 26 Apr 2012 17:46:50 -  1.429.2.10
  +++ rpm/lib/transaction.c 26 Apr 2012 18:36:19 -  1.429.2.11
  @@ -80,12 +80,21 @@
   #define VSF_CLR(_vsflags, _FLAG) \
(*((unsigned *)(_vsflags)) = ~(RPMVSF_##_FLAG))
   
  -#define TF_ISSET(_tsflags, _FLAG)((_tsflags)  (RPMTRANS_FLAG_##_FLAG))
  -#define TF_SET(_tsflags, _FLAG)  \
  +#define TSF_ISSET(_tsflags, _FLAG)   ((_tsflags)  (RPMTRANS_FLAG_##_FLAG))
  +#define TSF_SET(_tsflags, _FLAG) \
(*((unsigned *)(_tsflags)) |= (RPMTRANS_FLAG_##_FLAG))
  -#define TF_CLR(_tsflags, _FLAG)  \
  +#define TSF_CLR(_tsflags, _FLAG) \
(*((unsigned *)(_tsflags)) = ~(RPMTRANS_FLAG_##_FLAG))
   
  +#define IIF_ISSET(_iflags, _FLAG)((_iflags)  (INSTALL_##_FLAG))
  +#define IIF_SET(_iflags, _FLAG)  \
  + (*((unsigned *)(_iflags)) |= (INSTALL_##_FLAG))
  +#define IIF_CLR(_iflags, _FLAG)  \
  + (*((unsigned *)(_iflags)) = ~(INSTALL_##_FLAG))
  +
  +GENfree(int *)
  +GENfree(struct fingerPrint_s *)
  +
   #else/* __cplusplus */
   
   #define FF_ISSET(_fflags, _FLAG) ((_fflags)  (RPMFILE_##_FLAG))
  @@ -96,9 +105,13 @@
   #define VSF_SET(_vsflags, _FLAG) (_vsflags) |=  (RPMVSF_##_FLAG)
   #define VSF_CLR(_vsflags, _FLAG) (_vsflags) = ~(RPMVSF_##_FLAG)
   
  -#define TF_ISSET(_tsflags, _FLAG)((_tsflags)   (RPMTRANS_FLAG_##_FLAG))
  -#define TF_SET(_tsflags, _FLAG)  (_tsflags) |=  
(RPMTRANS_FLAG_##_FLAG)
  -#define TF_CLR(_tsflags, _FLAG)  (_tsflags) = 
~(RPMTRANS_FLAG_##_FLAG)
  +#define TSF_ISSET(_tsflags, _FLAG)   ((_tsflags)   (RPMTRANS_FLAG_##_FLAG))
  +#define TSF_SET(_tsflags, _FLAG) (_tsflags) |=  
(RPMTRANS_FLAG_##_FLAG)
  +#define TSF_CLR(_tsflags, _FLAG) (_tsflags) = 

[CVS] RPM: rpm-5_4: rpm/tests/ref/ hkp

2012-04-26 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:   26-Apr-2012 20:44:31
  Branch: rpm-5_4  Handle: 2012042618443100

  Modified files:   (Branch: rpm-5_4)
rpm/tests/ref   hkp

  Log:
- tests: catch up with reality.

  Summary:
RevisionChanges Path
1.4.2.2 +6  -0  rpm/tests/ref/hkp
  

  patch -p0 '@@ .'
  Index: rpm/tests/ref/hkp
  
  $ cvs diff -u -r1.4.2.1 -r1.4.2.2 hkp
  --- rpm/tests/ref/hkp 5 Sep 2011 12:56:08 -   1.4.2.1
  +++ rpm/tests/ref/hkp 26 Apr 2012 18:44:31 -  1.4.2.2
  @@ -31,6 +31,12 @@
   OK   0xfdb36b03
   OK   0x97a1071f
   OK   0x069c8460
  +OK   0xA82BA4B7
  +OK   0x10D90A9E
  +OK   0x1ACA3465
  +OK   0xF8DF67E6
  +OK   0x22B3B81A
  +OK   0x34E166FA
   OK   0x0608b895
   OK   0x217521f6
   OK   0x1edca302
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/tests/ref/ manifest

2012-04-26 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:   26-Apr-2012 20:44:57
  Branch: rpm-5_4  Handle: 2012042618445600

  Modified files:   (Branch: rpm-5_4)
rpm/tests/ref   manifest

  Log:
- tests: catch up with reality.

  Summary:
RevisionChanges Path
1.17.2.4+19 -0  rpm/tests/ref/manifest
  

  patch -p0 '@@ .'
  Index: rpm/tests/ref/manifest
  
  $ cvs diff -u -r1.17.2.3 -r1.17.2.4 manifest
  --- rpm/tests/ref/manifest13 Sep 2011 01:12:53 -  1.17.2.3
  +++ rpm/tests/ref/manifest26 Apr 2012 18:44:56 -  1.17.2.4
  @@ -1,4 +1,5 @@
   arbitrarytag/arbitrarytag-1.0-1.noarch.rpm
  +augtool-test/augtool-test-1.0-1.src.rpm
   cAos2-stub/cAos2-stub-1-0.noarch.rpm
   config-test/config-test-1.2-0.1.noarch.rpm
   cudf-test/battery-3-0.noarch.rpm
  @@ -22,6 +23,16 @@
   cudf-test/window-2-0.noarch.rpm
   cudf-test/window-3-0.noarch.rpm
   devtool-sanity/devtool-sanity-1.0-1.noarch.rpm
  +dir2symlink/dir2symlink-lua-1-1.noarch.rpm
  +dir2symlink/dir2symlink-lua-2-1.noarch.rpm
  +dir2symlink/dir2symlink-perl-1-1.noarch.rpm
  +dir2symlink/dir2symlink-perl-2-1.noarch.rpm
  +dir2symlink/dir2symlink-python-1-1.noarch.rpm
  +dir2symlink/dir2symlink-python-2-1.noarch.rpm
  +dir2symlink/dir2symlink-ruby-1-1.noarch.rpm
  +dir2symlink/dir2symlink-ruby-2-1.noarch.rpm
  +dir2symlink/dir2symlink-tcl-1-1.noarch.rpm
  +dir2symlink/dir2symlink-tcl-2-1.noarch.rpm
   edos-test/car-1-0.noarch.rpm
   edos-test/door-1-0.noarch.rpm
   edos-test/door-2-0.noarch.rpm
  @@ -38,11 +49,18 @@
   edos-test/window-1-0.noarch.rpm
   edos-test/window-2-0.noarch.rpm
   lua-test/lua-test-1.2-3.noarch.rpm
  +millionfile-insanity/millionfile-insanity-1.0-1.src.rpm
   order-test/orderA-1.2-0.1.noarch.rpm
   order-test/orderB-1.2-0.1.noarch.rpm
   popt/popt-1.14-1.x86_64.rpm
   probes-test/probes-1-0.noarch.rpm
   probes-test/probes-2-0.noarch.rpm
  +rpm-arg-max-doc/rpm-arg-max-doc-1.0-1.src.rpm
  +rpm-size-limit/rpm-size-limit-1.0-1.src.rpm
  +sql-test/sql-test-1.0-1.noarch.rpm
  +test-change-dir-to-symlink/test-change-dir-to-symlink-1-1.src.rpm
  +test-change-dir-to-symlink/test-change-dir-to-symlink-1-2.src.rpm
  +test-excludeunpackagefile/test-excludeunpackagefile-1.0-1.src.rpm
   triggers-DP/triggers-DP-a-1.0-1.noarch.rpm
   triggers-DP/triggers-DP-b-1.0-1.x86_64.rpm
   triggers-D/triggers-D-a-1.0-1.noarch.rpm
  @@ -51,6 +69,7 @@
   triggers-FP/triggers-FP-b-1.0-1.x86_64.rpm
   triggers-F/triggers-F-a-1.0-1.noarch.rpm
   triggers-F/triggers-F-b-1.0-1.x86_64.rpm
  +triggers-multiple/triggers-multiple-1-1.src.rpm
   triggers-NA/triggers-NA-a-1.0-1.noarch.rpm
   triggers-NA/triggers-NA-b-1.0-1.x86_64.rpm
   triggers-N/triggers-N-a-1.0-1.noarch.rpm
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/tests/ref/ querytags

2012-04-26 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:   26-Apr-2012 20:45:20
  Branch: rpm-5_4  Handle: 2012042618452000

  Modified files:   (Branch: rpm-5_4)
rpm/tests/ref   querytags

  Log:
- tests: catch up with reality.

  Summary:
RevisionChanges Path
1.5.4.1 +3  -3  rpm/tests/ref/querytags
  

  patch -p0 '@@ .'
  Index: rpm/tests/ref/querytags
  
  $ cvs diff -u -r1.5 -r1.5.4.1 querytags
  --- rpm/tests/ref/querytags   25 Dec 2009 16:57:03 -  1.5
  +++ rpm/tests/ref/querytags   26 Apr 2012 18:45:20 -  1.5.4.1
  @@ -44,7 +44,7 @@
   DBINSTANCE 1195 uint32
   DEPATTRSDICT   1188 argv array
   DEPENDSDICT1145 uint32 array
  -DESCRIPTION1005 i18nstring
  +DESCRIPTION1005 string
   DIRINDEXES 1116 uint32 array
   DIRNAMES   1118 argv array
   DISTEPOCH  1218 string
  @@ -92,7 +92,7 @@
   FLINKPKGID 1167 argv array
   FSCONTEXTS 1148 argv array
   GIF1012 octets
  -GROUP  1016 i18nstring
  +GROUP  1016 string
   HDRID   269 string
   HEADERENDOFF   1212 uint64
   HEADERI18NTABLE 100 argv array
  @@ -203,7 +203,7 @@
   SUGGESTSFLAGS  1158 uint32 array
   SUGGESTSNAME   1156 argv array
   SUGGESTSVERSION1157 argv array
  -SUMMARY1004 i18nstring
  +SUMMARY1004 string
   SVNID  1163 string
   TRIGGERFLAGS   1068 uint32 array
   TRIGGERINDEX   1069 uint32 array
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/tests/ref/ version

2012-04-26 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:   26-Apr-2012 20:46:14
  Branch: rpm-5_4  Handle: 2012042618461300

  Modified files:   (Branch: rpm-5_4)
rpm/tests/ref   version

  Log:
- tests: catch up with reality.

  Summary:
RevisionChanges Path
1.5.2.6 +2  -2  rpm/tests/ref/version
  

  patch -p0 '@@ .'
  Index: rpm/tests/ref/version
  
  $ cvs diff -u -r1.5.2.5 -r1.5.2.6 version
  --- rpm/tests/ref/version 22 Feb 2012 23:30:16 -  1.5.2.5
  +++ rpm/tests/ref/version 26 Apr 2012 18:46:13 -  1.5.2.6
  @@ -1,2 +1,2 @@
  -lt-rpm (RPM) 5.4.7
  -rpmlib 0x28901c00,0x7dc30800,0x52504d35
  +lt-rpm (RPM) 5.4.9
  +rpmlib 0x28902400,0x7dc41000,0x52504d35
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/tests/ macros.in

2012-04-26 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:   26-Apr-2012 20:47:09
  Branch: rpm-5_4  Handle: 2012042618470900

  Modified files:   (Branch: rpm-5_4)
rpm/tests   macros.in

  Log:
- tests: abandon attempts to load perl-URPM (until URPM is fixed).

  Summary:
RevisionChanges Path
1.34.2.5+5  -0  rpm/tests/macros.in
  

  patch -p0 '@@ .'
  Index: rpm/tests/macros.in
  
  $ cvs diff -u -r1.34.2.4 -r1.34.2.5 macros.in
  --- rpm/tests/macros.in   22 Mar 2012 19:32:04 -  1.34.2.4
  +++ rpm/tests/macros.in   26 Apr 2012 18:47:09 -  1.34.2.5
  @@ -78,6 +78,11 @@
   use RPM;\
   %{nil}
   
  +#use lib @abs_top_builddir@/perl-URPM/blib/lib;\
  +#use lib @abs_top_builddir@/perl-URPM/blib/arch;\
  +#use URPM;\
  +#
  +
   %_rubyI_init %{nil}
   
   %_pythonI_init   \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


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

2012-04-26 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:   26-Apr-2012 21:10:30
  Branch: rpm-5_4  Handle: 2012042619103000

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

  Log:
- yocto: clone harwich - yocto for new slaves.

  Summary:
RevisionChanges Path
2.365.2.59  +77 -0  rpm/devtool.conf
  

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.58 -r2.365.2.59 devtool.conf
  --- rpm/devtool.conf  26 Apr 2012 12:57:30 -  2.365.2.58
  +++ rpm/devtool.conf  26 Apr 2012 19:10:30 -  2.365.2.59
  @@ -1770,6 +1770,83 @@
   --disable-rpath \
   --without-lua
   
  +# YOCTO 2012
  +#  
--with-perlembed=/usr/lib64/perl5/5.10.0/x86_64-linux-thread-multi/CORE/:/usr/lib64/perl5/CORE
 \
  +%yocto
  +%autogen
  +%configure \
  +--verbose \
  +--prefix=/usr \
  +--enable-shared \
  +--with-db \
  +--with-dbsql \
  +--without-db-tools-integrated \
  +--with-zlib \
  +--with-bzip2 \
  +--with-xz \
  +--with-file \
  +--with-path-magic=/usr/share/file/magic \
  +--with-lua=internal \
  +--with-tcl \
  +--without-sqlite \
  +--with-syck=internal \
  +--with-readline \
  +--with-augeas \
  +--with-beecrypt=internal \
  +--without-java \
  +--with-openssl \
  +--with-nss \
  +--with-gcrypt \
  +--with-tomcrypt \
  +--without-tpm \
  +--with-libtasn1 \
  +--with-pakchois \
  +--with-gnutls \
  +--with-neon=internal \
  +--without-libproxy \
  +--with-expat \
  +--with-pcre=internal \
  +--enable-utf \
  +--with-uuid=system \
  +--with-attr \
  +--with-acl \
  +--without-xar \
  +--with-popt=internal \
  +--with-keyutils \
  +--with-pthreads \
  +--with-libelf \
  +--without-cudf \
  +--without-ficl \
  +--without-aterm \
  +--without-nix \
  +--without-bash \
  +--with-rc \
  +--without-js \
  +--without-gpsee \
  +--with-python \
  +--with-pythonembed=/usr/lib:/usr/include/python2.6 \
  +--with-perl \
  +--without-perl-urpm \
  +--with-perlembed=/usr/lib64/perl5/CORE/:/usr/lib64/perl5/CORE \
  +--with-ruby=/usr/lib64:/usr/lib64/ruby/1.8 \
  +--with-selinux \
  +--with-sepol \
  +--with-semanage \
  +--with-libgit2=internal \
  +--with-apr \
  +--with-subversion \
  +--with-unixodbc \
  +--without-squirrel \
  +--with-build-extlibdep \
  +--with-build-maxextlibdep \
  +--with-valgrind \
  +--enable-openmp \
  +--enable-build-pic \
  +--enable-build-versionscript \
  +--enable-build-warnings \
  +--enable-build-debug \
  +--enable-maintainer-mode
  +
   %fray-cross
   %checkout
   %autogen
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org