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

2010-10-30 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:   31-Oct-2010 04:37:09
  Branch: rpm-5_3  Handle: 2010103103370900

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

  Log:
- tests: re-add the tests/*.src.rpm to top level EXTRA_DIST.

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

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.247.2.13 -r2.247.2.14 Makefile.am
  --- rpm/Makefile.am   31 Oct 2010 01:12:33 -  2.247.2.13
  +++ rpm/Makefile.am   31 Oct 2010 03:37:09 -  2.247.2.14
  @@ -15,7 +15,19 @@
perl \
pubkeys/JBJ-GPG-KEY \
rpm.magic rpmqv.c \
  - python
  + python \
  + tests/arbitrarytag-1.0-1.src.rpm \
  + tests/cudf-test-1-0.src.rpm \
  + tests/devtool-sanity-1.0-1.src.rpm \
  + tests/edos-test-1-0.src.rpm \
  + tests/probes-test-1-0.src.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 \
  + tests/triggers-FP-1.0-1.src.rpm \
  + tests/triggers-N-1.0-1.src.rpm \
  + tests/triggers-NA-1.0-1.src.rpm \
  + tests/triggers-P-1.0-1.src.rpm
   
   SUBDIRS =
   if USE_NLS
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/tests/ arbitrarytag-1.0-1.src.rpm arbitrarytag...

2010-10-30 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:   31-Oct-2010 04:35:47
  Branch: rpm-5_3  Handle: 2010103103354600

  Added files:  (Branch: rpm-5_3)
rpm/tests   arbitrarytag-1.0-1.src.rpm
  Modified files:   (Branch: rpm-5_3)
rpm/tests   arbitrarytag.spec

  Log:
- tests: add arbitrary usage example.

  Summary:
RevisionChanges Path
1.1.2.1 BLOBrpm/tests/arbitrarytag-1.0-1.src.rpm
1.1.2.1 +42 -44 rpm/tests/arbitrarytag.spec
  

  (cd rpm/tests && \
   uudecode <<'@@ .' && \
   xdelta patch arbitrarytag-1.0-1.src.rpm.xdelta /dev/null 
arbitrarytag-1.0-1.src.rpm && \
   rm -f arbitrarytag-1.0-1.src.rpm.xdelta)
  Index: rpm/tests/arbitrarytag-1.0-1.src.rpm
  
  begin 664 arbitrarytag-1.0-1.src.rpm.xdelta
  M)5A$6C`P-"4(`!$`$`!S:&EE;&$N-S`P-#,N
  M;G5L;'-H:65L82XW,#`T,RYA;&p...@#[9=y?!-5'L"'-H4VI8('
  M'@O(B(;#DOLN1\W5,VW3-DW;E%(GR229-IF93B9)T]H5Y!"%`E8$Y/B`'*N(
  M*`4$10XY%A%1A)5...@7i1z$4*g9a@06Z;Y+74MS/9S_[QW[V+^?3F7G?W_7>
  M[[W?>YE>67?U=#SR/[L2?B^8L_YB']CLAR#Q3X+WA%@;6...@0c2)QDR=Y4`
  M3@'OOK$V`GSC+X(W#]R3(;=#^vd...@.j)_/z=.[...@_ct$b:-?0XIXR,-Q
  MR",)<>9#%S8DQ",CFY`X'A('+/A)`U^;LOLK?UQ_7/^_J]>^%"%(d...@r\ty'HODD:CL3JT07N1&@#;/OP(<"_D*Y#;(%]%HON8MQ1R1\R?MP+R-:CO
  M[N\&U&^&?#,6C[<'\AVH/P'Y+N2+D.]!OAIC'@_&OPF9.X/`T#MD-&=8+[vt8?q_dc...@+p!\b'(+9"_Y;CJ
  MIH('XWW'L0$1E)F=CUHR+:BE1&_.-J"YIG)4;RXPY$;5?!O.!`B*3$.+
  M+'FH4J00&4TVDQD=I<=Q`Q.AV=%\OK\PD]";ZO,4:EV17F>dg...@5'GH62!
  MG'i...@39"ZU-52L;NS2G/\I=DZ73AZGJ[5Y.9$;:5NY211;A#LK`:#QL\ZDA>OKQ([,3E->)P9HG;EJV6ISHT1E>YT\37Y=*%I#>8
  MK7!4EU0;]>4&?ZFD&',&LPN*C53(:C!DV&0&59TSQ\^FDGE.?<27KRNPV?4.
  MB]R0ZRW.M^1EAND<@Y0O)C)DC$M5)#$RLE*BV%"BMMK(5+^E-,>K4.=28:VZ
  MEF5M4E616>6N]3+VW(*\0G-U5G59?EU6GEH3#M6%3-)RM9'O9VQV50XK(1T2
  MCYDF[6&;DDEUF^@:.C]5K],Y3/(`(<'R"XJ4I*D8URE9IY&0*ZUBA3U;8BYU
  MU101YG*Z5%'+]U`%&E_3YW)(ZXY4BPJ%M6YT9$4L*530$&TT3B0K*Z(9...@gwa@*0;5...@mw,"00.7
  M.FB-?&`T",)]F#)>W*<253NJ113CB?[D)OQJ"3I\A!,U4GZ,(,'RAW`?1?MQ
  MDA6;ZC`_[<,#B)=EZ30Q-XM*SE&,^...@r6(?$...@g"F;HWVL=2FT2ERI<6HT
  MJL<92B:12%[H'L$$5(A&IQ<1HAD$$V!1;E59U!%D4
  MF"54*M-H%%J51,']...@y_u/:S]&!%55H8#;!U8M25+G!D.3`%&T2*JX#5'E
  M(c...@*w"?!XJ2=JMY
  M`<2RB3H!`BOJI?PXS,)'.("`LV(QQH.S54XZF$2H-*K[$BJ0%*N^'@g...@w
  MQ?BCW?6X-0KO8RS=WA(JT"AH2*_RD,%>G<%9`5:])BFJCRU+[WR`B%/$\A27
  m...@388?g=2/9G$I@:TN;T#%+!F8NO.A>n...@%yz:H&3]RZ,GLD3<@)$P+63'MC;
  M`I+P`:]GTL$;1&)P'XX%<*[P0K$OC23N;(?7OQU@".*D"0KQU!,THHU]AX^:
  MC""-\Q`$?)\HK=QA"/xpe`4es6...@#c#ae4uw-h6s$/JO/A#(L61P(L[D=%
  M(A$JC3YET:><>_*YC]G8?P!=77=1\!XX;!;\^(]?5N*GSJCZ7RV]7"H1SD9,
  M[9O$"T=(9[RX4%"9S#.$LC_[X(KE0-JIQZMS/QSS8W/"/W[,_/*7#S[K:Y`T
  MSAO=-KUU[ZLLLVC("*)Y]=)AO_1+:EJE6"Z8.Y<=,>WSQC^WE_;[:T;EF#>[
  MAEQBYW_RY1KEF3/ED_97SOKI^^29*Q-%1Q1']_ST];%Q4Y?_L'S7^*\FKQ.,
  msd^...@a;MOQ*5;+,U4K+SENQ)$D>6Y;\]#$#^=OF??LF(_UX=?WYE*N`8MW
  M=H[5K],OV+%;L)[O'_C;I..Y:P]>6YN\^;.AF_L*FQLK:K>V6M"MRE/CZ1&:
  ML\\+=SRRZ=>GJ8K?%,E[-Q[7?G2^<^K6Y3NVGK^[P+WLEN3548V3.R_?.K:X
  M9=U.XJ+E\:78JI),]1C]FB[>NGM3YZ]>6P>
  M;Y2KZ:G!>QZ*NYUAG+7JXKF;Q_HO>O6YQ#-?K!VP2;'L:=-'6ZYGYK_>')I&R/#T1TQKSD>>)(M?6BU;TS;E\.'SK;P1WNG.;_:E'VF9,G;G1H'V
  MT.534X\RUZ8OU,AFO#`XCE5=VB(NG,GD?[QZ9F?-+FV[[N]D2=/M4=NK4NZ$
  M5SYU_?.K7^2)^7L;Q.O3UZ9/
  M>*CR=6O^2>_$);\M_MN`?,-*<5M!=9B=TWRR[9M'?.\[YPZ^]-=5_SL`6?W$YN"MV]
  M]47+G@(TKNWIPH/#ZX0IM2?PIO??';g...@q(RTCJ'2CN/R2:\=E#8<.\%/.8P+
  MA24IGW<<.#V^-"OAB06W6U+?.!C^WM6Y*W*TKNW3*V_,W7/=<>_&3R^U;-K4
  M.7O_C^;"(]GMX+\5_K\`!H`)/_DP4(`
  .``PX)5A$6C`P-"4`
  `
  end
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/arbitrarytag.spec
  
  $ cvs diff -u -r1.1 -r1.1.2.1 arbitrarytag.spec
  --- rpm/tests/arbitrarytag.spec   1 Mar 2010 15:54:06 -   1.1
  +++ rpm/tests/arbitrarytag.spec   31 Oct 2010 03:35:46 -  1.1.2.1
  @@ -1,49 +1,47 @@
  -
  -# My arbitrary tags
  -
  -%global my_arbitrary_tagsRHSA:CVEID:RHBZ
  -
  -# Append my arbitrary tags
  -
  -%global _arbitrary_tags %(printf %%s 
'%{_arbitrary_tags}:%{my_arbitrary_tags}')
  -Name: arbitrarytag
  -Version: 1.0
  -Release: 1
  -License: GPL
  -Group: Development/Tools
  -URL: http://rpm5.org/
  -Summary: %{name}
  -BuildArch: noarch
  -###
  -# Arbitrary tag
  -###
  -#CVEID: CVE-2008-5964 
  -#RHSA: RHSA-2007:1128-6 RHSA-2008:1129-6
  -#RHBZ: 410031 410032
  +# --- Permit RHSA: CVE

[CVS] RPM: rpm-5_3: rpm/ configure.ac

2010-10-30 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:   31-Oct-2010 02:52:24
  Branch: rpm-5_3  Handle: 2010103101522400

  Modified files:   (Branch: rpm-5_3)
rpm configure.ac

  Log:
- i18n: flip the gettext version to 0.18.1.

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

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.432.2.34 -r2.432.2.35 configure.ac
  --- rpm/configure.ac  31 Oct 2010 00:09:34 -  2.432.2.34
  +++ rpm/configure.ac  31 Oct 2010 01:52:24 -  2.432.2.35
  @@ -600,7 +600,7 @@
   
   dnl # GNU gettext support
   AC_CHECK_HEADERS(locale.h)
  -AM_GNU_GETTEXT_VERSION(0.16)
  +AM_GNU_GETTEXT_VERSION(0.18.1)
   AM_GNU_GETTEXT([external])
   AM_CONDITIONAL(USE_NLS, [ test ".$USE_NLS" = .yes ])
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2010-10-30 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:   31-Oct-2010 02:12:34
  Branch: rpm-5_3  Handle: 2010103101123300

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

  Log:
- AutoFu: clean up the top level EXTRA_DIST for distcheck.

  Summary:
RevisionChanges Path
2.247.2.13  +7  -46 rpm/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.247.2.12 -r2.247.2.13 Makefile.am
  --- rpm/Makefile.am   28 Oct 2010 02:03:06 -  2.247.2.12
  +++ rpm/Makefile.am   31 Oct 2010 01:12:33 -  2.247.2.13
  @@ -1,58 +1,21 @@
   # Top level Makefile for rpm
   
   AUTOMAKE_OPTIONS = 1.4 foreign
  +ACLOCAL_AMFLAGS = -I m4
   
   LINT = splint
   MCCABE = pmccabe
   
  -# xar xz
  -# file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]*
  -# file/acinclude.m4 file/aclocal.m4 file/autogen.sh file/config*
  -#
   EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL INSTALL.developer 
cpuinfo.yaml \
  - autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
  + autodeps autogen.sh \
syck js \
  - lua/[A-Z]* lua/*.[ch] lua/local/l* \
  - ruby/*.[ch] ruby/Makefile.in ruby/Makefile.am \
  - macros/*.in \
  - perl/typemap \
  - perl/Makefile.PL.in \
  - perl/t/00.pod.t perl/t/00.pod.coverage.t \
  - perl/rpmxs.c perl/rpmxs.h \
  - perl/RPM.xs perl/RPM.pm perl/t/01.rpm.t \
  - perl/RPM/Constant.pm perl/RPM_Constant.xs perl/t/02.rpmconstant.t \
  - perl/RPM_Header.xs perl/RPM/Header.pm perl/t/03.header.t \
  - perl/RPM_Transaction.xs perl/RPM/Transaction.pm perl/t/04.transaction.t 
\
  - perl/RPM_PackageIterator.xs perl/RPM/PackageIterator.pm 
perl/t/05.packageiterator.t \
  - perl/RPM_Problems.xs perl/RPM/Problems.pm perl/t/06.problems.t \
  - perl/RPM_Files.xs perl/RPM/Files.pm perl/t/07.files.t \
  - perl/RPM_Dependencies.xs perl/RPM/Dependencies.pm 
perl/t/08.dependencies.t \
  - perl/RPM_Spec.xs perl/RPM/Spec.pm perl/t/09.spec.t \
  - perl/hdlist-test.hdr perl/test-rpm-1.0-1.noarch.rpm 
perl/test-rpm-1.0-1.src.rpm perl/test-rpm.spec \
  - perl/META.yml perl/Makefile.PL.in perl/Makefile.am perl/Makefile.in \
  - perl/README \
  + lua \
  + ruby \
  + macros \
  + perl \
pubkeys/JBJ-GPG-KEY \
  - po/*.in po/*.po po/rpm.pot \
rpm.magic rpmqv.c \
  - python/mpw/Makefile.am python/mpw/test/* python/test/resources/* 
python/test/dscmp \
  - python/test/psTest.py python/test/testhdr python/test/testit 
python/test/testmi \
  - python/test/testrollback.py python/test/dsMerge.py 
python/test/test_rpm.py \
  - python/rpm/__init__.py python/[a-z]* python/Makefile.in 
python/Makefile.am \
  - rpmio/auto/*.in \
  - rpmdb/auto/*.in \
  - lib/auto/*.in \
  - build/auto/*.in \
  - tests/cudf-test-1-0.src.rpm \
  - tests/devtool-sanity-1.0-1.src.rpm \
  - tests/edos-test-1-0.src.rpm \
  - tests/probes-test-1-0.src.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 \
  - tests/triggers-FP-1.0-1.src.rpm \
  - tests/triggers-N-1.0-1.src.rpm \
  - tests/triggers-NA-1.0-1.src.rpm \
  - tests/triggers-P-1.0-1.src.rpm
  + python
   
   SUBDIRS =
   if USE_NLS
  @@ -308,5 +271,3 @@
cscope -b -R
   
   cref: ctags cscope
  -
  -ACLOCAL_AMFLAGS = -I m4
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/po/ POTFILES.in

2010-10-30 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:   31-Oct-2010 02:01:58
  Branch: rpm-5_3  Handle: 2010103101015700

  Modified files:   (Branch: rpm-5_3)
rpm/po  POTFILES.in

  Log:
- i18n: don't bother with db_tool.c.

  Summary:
RevisionChanges Path
1.78.2.2+0  -1  rpm/po/POTFILES.in
  

  patch -p0 <<'@@ .'
  Index: rpm/po/POTFILES.in
  
  $ cvs diff -u -r1.78.2.1 -r1.78.2.2 POTFILES.in
  --- rpm/po/POTFILES.in27 Sep 2010 23:34:48 -  1.78.2.1
  +++ rpm/po/POTFILES.in31 Oct 2010 01:01:57 -  1.78.2.2
  @@ -141,7 +141,6 @@
   tools/chroot.c
   tools/cp.c
   tools/cudftool.c
  -tools/db_tool.c
   tools/rpm2cpio.c
   tools/rpmcache.c
   tools/rpmcmp.c
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/build/ Makefile.am rpm/build/auto/ Makefile.am...

2010-10-30 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:   31-Oct-2010 02:25:40
  Branch: rpm-5_3  Handle: 2010103100253802

  Modified files:   (Branch: rpm-5_3)
rpm/build   Makefile.am
rpm/build/auto  Makefile.am
rpm/lib Makefile.am
rpm/lib/autoMakefile.am
rpm/rpmdb   Makefile.am
rpm/rpmdb/auto  Makefile.am
rpm/rpmio   Makefile.am
rpm/rpmio/auto  Makefile.am

  Log:
Enable the ISPRAS tests.

  Summary:
RevisionChanges Path
2.77.2.2+1  -1  rpm/build/Makefile.am
1.1.2.1 +2  -0  rpm/build/auto/Makefile.am
2.195.2.6   +1  -1  rpm/lib/Makefile.am
1.1.2.1 +2  -0  rpm/lib/auto/Makefile.am
1.124.2.9   +1  -1  rpm/rpmdb/Makefile.am
1.1.2.1 +2  -0  rpm/rpmdb/auto/Makefile.am
1.267.2.13  +1  -1  rpm/rpmio/Makefile.am
1.4.2.1 +2  -0  rpm/rpmio/auto/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/build/Makefile.am
  
  $ cvs diff -u -r2.77.2.1 -r2.77.2.2 Makefile.am
  --- rpm/build/Makefile.am 18 Oct 2010 04:22:05 -  2.77.2.1
  +++ rpm/build/Makefile.am 31 Oct 2010 00:25:39 -  2.77.2.2
  @@ -7,7 +7,7 @@
   
   EXTRA_DIST = librpmbuild.vers
   
  -SUBDIRS = # tests
  +SUBDIRS = auto # tests
   
   AM_CPPFLAGS = \
-I$(srcdir) \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/auto/Makefile.am
  
  $ cvs diff -u -r1.1 -r1.1.2.1 Makefile.am
  --- rpm/build/auto/Makefile.am6 Mar 2010 03:29:14 -   1.1
  +++ rpm/build/auto/Makefile.am31 Oct 2010 00:25:40 -  1.1.2.1
  @@ -1,5 +1,7 @@
   AUTOMAKE_OPTIONS = 1.4 foreign
   
  +EXTRA_DIST = types desc
  +
   AUTOTEST =  @abs_top_srcdir@/scripts/api-sanity-autotest.pl
   
   TDIRS =  descriptors_storage header_compile_errors test_results 
tests
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/Makefile.am
  
  $ cvs diff -u -r2.195.2.5 -r2.195.2.6 Makefile.am
  --- rpm/lib/Makefile.am   18 Oct 2010 04:22:05 -  2.195.2.5
  +++ rpm/lib/Makefile.am   31 Oct 2010 00:25:39 -  2.195.2.6
  @@ -5,7 +5,7 @@
   LINT = splint
   MCCABE = pmccabe
   
  -SUBDIRS = # tests
  +SUBDIRS = auto # tests
   
   AM_CPPFLAGS = \
-I$(srcdir) \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/auto/Makefile.am
  
  $ cvs diff -u -r1.1 -r1.1.2.1 Makefile.am
  --- rpm/lib/auto/Makefile.am  5 Mar 2010 20:12:26 -   1.1
  +++ rpm/lib/auto/Makefile.am  31 Oct 2010 00:25:40 -  1.1.2.1
  @@ -1,5 +1,7 @@
   AUTOMAKE_OPTIONS = 1.4 foreign
   
  +EXTRA_DIST = types desc
  +
   AUTOTEST =  @abs_top_srcdir@/scripts/api-sanity-autotest.pl
   
   TDIRS =  descriptors_storage header_compile_errors test_results 
tests
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.124.2.8 -r1.124.2.9 Makefile.am
  --- rpm/rpmdb/Makefile.am 18 Oct 2010 04:22:07 -  1.124.2.8
  +++ rpm/rpmdb/Makefile.am 31 Oct 2010 00:25:38 -  1.124.2.9
  @@ -6,7 +6,7 @@
   MCCABE = pmccabe
   DB_SQL_CODEGEN = ../db3/db_sql_codegen
   
  -SUBDIRS = # tests
  +SUBDIRS = auto # tests
   
   AM_CPPFLAGS = \
-I$(srcdir) \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/auto/Makefile.am
  
  $ cvs diff -u -r1.1 -r1.1.2.1 Makefile.am
  --- rpm/rpmdb/auto/Makefile.am5 Mar 2010 13:18:31 -   1.1
  +++ rpm/rpmdb/auto/Makefile.am31 Oct 2010 00:25:39 -  1.1.2.1
  @@ -1,5 +1,7 @@
   AUTOMAKE_OPTIONS = 1.4 foreign
   
  +EXTRA_DIST = types desc
  +
   AUTOTEST =  @abs_top_srcdir@/scripts/api-sanity-autotest.pl
   
   TDIRS =  descriptors_storage header_compile_errors test_results 
tests
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/Makefile.am
  
  $ cvs diff -u -r1.267.2.12 -r1.267.2.13 Makefile.am
  --- rpm/rpmio/Makefile.am 27 Oct 2010 18:05:13 -  1.267.2.12
  +++ rpm/rpmio/Makefile.am 31 Oct 2010 00:25:38 -  1.267.2.13
  @@ -5,7 +5,7 @@
   LINT = splint
   MCCABE = pmccabe
   
  -SUBDIRS = # tests

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

2010-10-30 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:   31-Oct-2010 02:16:11
  Branch: rpm-5_3  Handle: 2010103100160900

  Modified files:   (Branch: rpm-5_3)
rpm/scripts Makefile.am

  Log:
- distcheck: remove glob's in EXTRA_DIST.

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

  patch -p0 <<'@@ .'
  Index: rpm/scripts/Makefile.am
  
  $ cvs diff -u -r1.65.2.4 -r1.65.2.5 Makefile.am
  --- rpm/scripts/Makefile.am   16 Oct 2010 10:03:51 -  1.65.2.4
  +++ rpm/scripts/Makefile.am   31 Oct 2010 00:16:09 -  1.65.2.5
  @@ -36,7 +36,9 @@
xiu_stdenv \
yum_filelists_sqlite yum_other_sqlite yum_primary_sqlite \
yum_filelists_xml yum_other_xml yum_primary_xml \
  - find-*.php find-php-* ${HELPERS}
  + find-provides.php find-requires.php \
  + find-php-provides find-php-requires \
  + ${HELPERS}
   
   all:
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: beecrypt/ Makefile.am configure.ac beecrypt/python...

2010-10-30 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: beecrypt Date:   31-Oct-2010 02:14:07
  Branch: rpm-5_3  Handle: 2010103100140700

  Modified files:   (Branch: rpm-5_3)
beecryptMakefile.am configure.ac
beecrypt/python Makefile.am

  Log:
- beecrypt: disable the python tests: builddir != srcdir needs fixing.
- beecrypt: add m4/* subdirectory for AutoFu macros.

  Summary:
RevisionChanges Path
1.36.2.1+1  -0  beecrypt/Makefile.am
1.26.2.1+2  -1  beecrypt/configure.ac
1.7.2.1 +1  -1  beecrypt/python/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: beecrypt/Makefile.am
  
  $ cvs diff -u -r1.36 -r1.36.2.1 Makefile.am
  --- beecrypt/Makefile.am  23 Aug 2010 19:03:56 -  1.36
  +++ beecrypt/Makefile.am  31 Oct 2010 00:14:07 -  1.36.2.1
  @@ -34,6 +34,7 @@
   LIBBEECRYPT_LT_REVISION = 0
   
   AUTOMAKE_OPTIONS = gnu check-news no-dependencies
  +ACLOCAL_AMFLAGS = -I m4
   
   SUBDIRS = . include $(MAYBE_SUB) tests docs gas masm
   
  @@ .
  patch -p0 <<'@@ .'
  Index: beecrypt/configure.ac
  
  $ cvs diff -u -r1.26 -r1.26.2.1 configure.ac
  --- beecrypt/configure.ac 23 Aug 2010 19:03:56 -  1.26
  +++ beecrypt/configure.ac 31 Oct 2010 00:14:07 -  1.26.2.1
  @@ -4,6 +4,7 @@
   AC_CANONICAL_TARGET
   AC_CONFIG_SRCDIR(include/beecrypt/beecrypt.h)
   AC_CONFIG_HEADERS([config.h])
  +AC_CONFIG_MACRO_DIR([m4])
   AM_INIT_AUTOMAKE
   
   # Checks for AWK - used by expert mode
  @@ -672,9 +673,9 @@
   java/build.xml
   masm/Makefile
   python/Makefile
  -python/test/Makefile
   tests/Makefile
 ])
  +#   python/test/Makefile
   
   AC_CONFIG_FILES([gnu.h],[
   cp gnu.h $ac_top_srcdir/include/beecrypt/gnu.h
  @@ .
  patch -p0 <<'@@ .'
  Index: beecrypt/python/Makefile.am
  
  $ cvs diff -u -r1.7 -r1.7.2.1 Makefile.am
  --- beecrypt/python/Makefile.am   23 Aug 2010 19:03:57 -  1.7
  +++ beecrypt/python/Makefile.am   31 Oct 2010 00:14:07 -  1.7.2.1
  @@ -4,7 +4,7 @@
   
   LINT = splint
   
  -SUBDIRS = test
  +# SUBDIRS = test
   
   EXTRA_DIST = debug-py.c
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ruby/ rpmmc-rb.c

2010-10-30 Thread Eric Veith 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Eric Veith
  Root:   /v/rpm/cvs   Email:  eve...@rpm5.org
  Module: rpm  Date:   31-Oct-2010 02:12:01
  Branch: HEAD Handle: 2010103100120100

  Modified files:
rpm/rubyrpmmc-rb.c

  Log:
Add global macro context to rpmmc-rb.c via RPM::Mc class methods

  Summary:
RevisionChanges Path
1.5 +27 -17 rpm/ruby/rpmmc-rb.c
  

  patch -p0 <<'@@ .'
  Index: rpm/ruby/rpmmc-rb.c
  
  $ cvs diff -u -r1.4 -r1.5 rpmmc-rb.c
  --- rpm/ruby/rpmmc-rb.c   30 Oct 2010 23:31:26 -  1.4
  +++ rpm/ruby/rpmmc-rb.c   31 Oct 2010 00:12:01 -  1.5
  @@ -50,13 +50,14 @@
   {
   Check_Type(v, T_STRING);
   
  -void *ptr = rpmmc_ptr(s);
  -rpmmc mc = ptr;
  +rpmmc mc = NULL;
  +if(TYPE(s) == T_DATA)
  +mc = rpmmc_ptr(s);
   int lvl = 0;
   
   if (_debug)
   fprintf(stderr, "==> %s(0x%lx, 0x%lx) ptr %p\n",
  -__FUNCTION__, s, v, ptr);
  +__FUNCTION__, s, v, mc);
   
   (void) rpmDefineMacro(mc, StringValueCStr(v), lvl);
   return Qnil;
  @@ -77,12 +78,13 @@
   {
   Check_Type(v, T_STRING);
   
  -void *ptr = rpmmc_ptr(s);
  -rpmmc mc = ptr;
  +rpmmc mc = NULL;
  +if(TYPE(s) == T_DATA)
  +mc = rpmmc_ptr(s);
   
   if (_debug)
   fprintf(stderr, "==> %s(0x%lx, 0x%lx) ptr %p\n",
  -__FUNCTION__, s, v, ptr);
  +__FUNCTION__, s, v, mc);
   
   (void) rpmUndefineMacro(mc, StringValueCStr(v));
   return Qnil;
  @@ -102,8 +104,10 @@
   static VALUE
   rpmmc_list(VALUE s)
   {
  -void *ptr = rpmmc_ptr(s);
  -rpmmc mc = ptr;
  +rpmmc mc = NULL;
  +if(TYPE(s) == T_DATA)
  +mc = rpmmc_ptr(s);
  +
   void * _mire = NULL;
   VALUE v = rb_ary_new();
   int used = -1;
  @@ -111,7 +115,7 @@
   int ac = rpmGetMacroEntries(mc, _mire, used, &av);
   
   if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
  +fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, mc);
   
   if (ac > 0 && av != NULL && av[0] != NULL) {
   int i;
  @@ -158,12 +162,14 @@
   static VALUE
   rpmmc_expand(VALUE s, VALUE v)
   {
  -void *ptr = rpmmc_ptr(s);
  -rpmmc mc = ptr;
  -char * vstr = StringValueCStr(v);
  +rpmmc mc = NULL;
  +if(TYPE(s) == T_DATA)
  +mc = rpmmc_ptr(s);
  +char *vstr = StringValueCStr(v);
  +
   if (_debug)
   fprintf(stderr, "==> %s(0x%lx, 0x%lx) ptr %p \"%s\"\n",
  -__FUNCTION__, s, v, ptr, vstr);
  +__FUNCTION__, s, v, mc, vstr);
   return rb_str_new2(rpmMCExpand(mc, vstr, NULL));
   }
   
  @@ -171,10 +177,14 @@
   static void
   initMethods(VALUE klass)
   {
  -rb_define_method(klass, "add", rpmmc_add, 1);
  -rb_define_method(klass, "del", rpmmc_del, 1);
  -rb_define_method(klass, "list", rpmmc_list, 0);
  -rb_define_method(klass, "expand", rpmmc_expand, 1);
  +rb_define_method(klass, "add", &rpmmc_add, 1);
  +rb_define_singleton_method(klass, "add", &rpmmc_add, 1);
  +rb_define_method(klass, "del", &rpmmc_del, 1);
  +rb_define_singleton_method(klass, "del", &rpmmc_del, 1);
  +rb_define_method(klass, "list", &rpmmc_list, 0);
  +rb_define_singleton_method(klass, "list", &rpmmc_list, 0);
  +rb_define_method(klass, "expand", &rpmmc_expand, 1);
  +rb_define_singleton_method(klass, "expand", &rpmmc_expand, 1);
   }
   
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: neon/ autogen.sh rpm-5_3: pcre/ autogen.sh rpm/ autogen.sh ...

2010-10-30 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 syck neon pcre   Date:   31-Oct-2010 02:11:34
  Branch: rpm-5_3 HEAD Handle: 2010103100113301

  Modified files:
neonautogen.sh
  Modified files:   (Branch: rpm-5_3)
pcreautogen.sh
rpm autogen.sh
syckautogen.sh

  Log:
- autogen.sh: update all the version checks.

  Summary:
RevisionChanges Path
1.9 +2  -2  neon/autogen.sh
1.2.2.3 +2  -2  pcre/autogen.sh
2.105.2.5   +3  -3  rpm/autogen.sh
1.2.2.2 +3  -3  syck/autogen.sh
  

  patch -p0 <<'@@ .'
  Index: neon/autogen.sh
  
  $ cvs diff -u -r1.8 -r1.9 autogen.sh
  --- neon/autogen.sh   26 Oct 2010 02:58:22 -  1.8
  +++ neon/autogen.sh   31 Oct 2010 00:11:33 -  1.9
  @@ -3,8 +3,8 @@
   #   configure the requirements
   AMV="automake (GNU automake) 1.11.1"
   ACV="autoconf (GNU Autoconf) 2.68"
  -LTV="libtoolize (GNU libtool) 2.2.10"
  -GTT="gettextize (GNU gettext-tools) 0.17"
  +LTV="libtoolize (GNU libtool) 2.4"
  +GTT="gettextize (GNU gettext-tools) 0.18.1"
   USAGE="
   To build RPM from plain CVS sources the following
   installed developer tools are mandatory:
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/autogen.sh
  
  $ cvs diff -u -r1.2.2.2 -r1.2.2.3 autogen.sh
  --- pcre/autogen.sh   26 Oct 2010 03:08:39 -  1.2.2.2
  +++ pcre/autogen.sh   31 Oct 2010 00:11:33 -  1.2.2.3
  @@ -3,8 +3,8 @@
   #   configure the requirements
   AMV="automake (GNU automake) 1.11.1"
   ACV="autoconf (GNU Autoconf) 2.68"
  -LTV="libtoolize (GNU libtool) 2.2.10"
  -GTT="gettextize (GNU gettext-tools) 0.17"
  +LTV="libtoolize (GNU libtool) 2.4"
  +GTT="gettextize (GNU gettext-tools) 0.18.1"
   USAGE="
   To build RPM from plain CVS sources the following
   installed developer tools are mandatory:
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/autogen.sh
  
  $ cvs diff -u -r2.105.2.4 -r2.105.2.5 autogen.sh
  --- rpm/autogen.sh18 Oct 2010 04:22:04 -  2.105.2.4
  +++ rpm/autogen.sh31 Oct 2010 00:11:33 -  2.105.2.5
  @@ -2,9 +2,9 @@
   
   #   configure the requirements
   AMV="automake (GNU automake) 1.11.1"
  -ACV="autoconf (GNU Autoconf) 2.63"
  -LTV="libtoolize (GNU libtool) 2.2.10"
  -GTT="gettextize (GNU gettext-tools) 0.17"
  +ACV="autoconf (GNU Autoconf) 2.68"
  +LTV="libtoolize (GNU libtool) 2.4"
  +GTT="gettextize (GNU gettext-tools) 0.18.1"
   USAGE="
   To build RPM from plain CVS sources the following
   installed developer tools are mandatory:
  @@ .
  patch -p0 <<'@@ .'
  Index: syck/autogen.sh
  
  $ cvs diff -u -r1.2.2.1 -r1.2.2.2 autogen.sh
  --- syck/autogen.sh   21 Sep 2010 15:56:59 -  1.2.2.1
  +++ syck/autogen.sh   31 Oct 2010 00:11:34 -  1.2.2.2
  @@ -2,9 +2,9 @@
   
   #   configure the requirements
   AMV="automake (GNU automake) 1.11.1"
  -ACV="autoconf (GNU Autoconf) 2.63"
  -LTV="libtoolize (GNU libtool) 2.2.10"
  -GTT="gettextize (GNU gettext-tools) 0.17"
  +ACV="autoconf (GNU Autoconf) 2.68"
  +LTV="libtoolize (GNU libtool) 2.4"
  +GTT="gettextize (GNU gettext-tools) 0.18.1"
   USAGE="
   To build RPM from plain CVS sources the following
   installed developer tools are mandatory:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/ configure.ac

2010-10-30 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:   31-Oct-2010 02:09:34
  Branch: rpm-5_3  Handle: 2010103100093400

  Modified files:   (Branch: rpm-5_3)
rpm configure.ac

  Log:
- pcre: prefer external over internal.

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

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.432.2.33 -r2.432.2.34 configure.ac
  --- rpm/configure.ac  26 Oct 2010 15:49:13 -  2.432.2.33
  +++ rpm/configure.ac  31 Oct 2010 00:09:34 -  2.432.2.34
  @@ -1656,7 +1656,7 @@
   RPM_CHECK_LIB(
   [PCRE], [pcre],
   [pcre], [pcre_compile], [pcre.h],
  -[yes,internal:external:none], [pcre],
  +[yes,external:internal:none], [pcre],
   [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
 WITH_PCRE_INTERNAL=true
 AC_DEFINE(HAVE_PCRE_H, 1, [Define to 1 if you have ])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2010-10-30 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:   31-Oct-2010 02:08:53
  Branch: rpm-5_3  Handle: 2010103100085200

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

  Log:
- devtool: disable ruby on harwich: multlib lib64 is needed.

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.333.2.56 -r2.333.2.57 devtool.conf
  --- rpm/devtool.conf  30 Oct 2010 11:51:46 -  2.333.2.56
  +++ rpm/devtool.conf  31 Oct 2010 00:08:52 -  2.333.2.57
  @@ -450,7 +450,7 @@
   --without-pythonembed \
   --with-perl \
   --without-perlembed \
  ---with-ruby \
  +--without-ruby \
   --with-selinux \
   --with-sepol \
   --with-semanage \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ruby/ rpmmc-rb.c

2010-10-30 Thread Eric Veith 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Eric Veith
  Root:   /v/rpm/cvs   Email:  eve...@rpm5.org
  Module: rpm  Date:   31-Oct-2010 01:31:26
  Branch: HEAD Handle: 2010103023312600

  Modified files:
rpm/rubyrpmmc-rb.c

  Log:
Add macro name/opts/body split code from lua to rpmmc-rb.c's list code
- Add split code from rpmio/rpmlua.c
- Add more type checking with Ruby's Check_Type macro

  Summary:
RevisionChanges Path
1.4 +127 -29rpm/ruby/rpmmc-rb.c
  

  patch -p0 <<'@@ .'
  Index: rpm/ruby/rpmmc-rb.c
  
  $ cvs diff -u -r1.3 -r1.4 rpmmc-rb.c
  --- rpm/ruby/rpmmc-rb.c   2 May 2009 17:16:25 -   1.3
  +++ rpm/ruby/rpmmc-rb.c   30 Oct 2010 23:31:26 -  1.4
  @@ -9,9 +9,11 @@
   
   #define  _MACRO_INTERNAL
   #include 
  +#include 
   
   #include "../debug.h"
   
  +
   typedef MacroContext rpmmc;
   
   VALUE rpmmcClass;
  @@ -19,7 +21,9 @@
   /*...@unchecked@*/
   static int _debug = 0;
   
  +
   /* --- helpers */
  +
   static void *
   rpmmc_ptr(VALUE s)
   {
  @@ -28,65 +32,142 @@
   return ptr;
   }
   
  +
   /* --- Object methods */
  +
  +/**
  + * Adds a new macro definition to the Macro Context.
  + *
  + * call-seq:
  + *  RPM::Mc#add(macro) -> nil
  + *
  + * @param macro The macro definition in string form just like it would be 
done
  + *  in a macro definition file, but minus the %define stanza.
  + * @see rpmDefineMacro()
  + */
   static VALUE
   rpmmc_add(VALUE s, VALUE v)
   {
  +Check_Type(v, T_STRING);
  +
   void *ptr = rpmmc_ptr(s);
   rpmmc mc = ptr;
   int lvl = 0;
  -if (_debug)
  -fprintf(stderr, "==> %s(0x%lx, 0x%lx) ptr %p\n", __FUNCTION__, s, v, ptr);
  +
  +if (_debug)
  +fprintf(stderr, "==> %s(0x%lx, 0x%lx) ptr %p\n",
  +__FUNCTION__, s, v, ptr);
  +
   (void) rpmDefineMacro(mc, StringValueCStr(v), lvl);
  -return Qtrue;
  +return Qnil;
   }
   
  +
  +/**
  + * Deletes a macro definition.
  + *
  + * call-seq:
  + *  RPM::Mc#del(macro) -> nil
  + *
  + * @param macro The macro name
  + * @see rpmUndefineMacro()
  + */
   static VALUE
   rpmmc_del(VALUE s, VALUE v)
   {
  +Check_Type(v, T_STRING);
  +
   void *ptr = rpmmc_ptr(s);
   rpmmc mc = ptr;
  -if (_debug)
  -fprintf(stderr, "==> %s(0x%lx, 0x%lx) ptr %p\n", __FUNCTION__, s, v, ptr);
  +
  +if (_debug)
  +fprintf(stderr, "==> %s(0x%lx, 0x%lx) ptr %p\n",
  +__FUNCTION__, s, v, ptr);
  +
   (void) rpmUndefineMacro(mc, StringValueCStr(v));
  -return Qtrue;
  +return Qnil;
   }
   
  +
  +/**
  + * List all macro definitions in the corresponding Macro Context.
  + *
  + * call-seq:
  + *  RPM::Mc#list() -> Array
  + *
  + * @return  A list of all macro definitions in form of an array of arrays,
  + *  where each nested arry contains the macro's name, arguments (or an empty
  + *  string) and the macro body.
  + */
   static VALUE
   rpmmc_list(VALUE s)
   {
   void *ptr = rpmmc_ptr(s);
   rpmmc mc = ptr;
  -VALUE v = rb_ary_new();
   void * _mire = NULL;
  +VALUE v = rb_ary_new();
   int used = -1;
   const char ** av = NULL;
   int ac = rpmGetMacroEntries(mc, _mire, used, &av);
   
  -if (_debug)
  -fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
  +if (_debug)
  +fprintf(stderr, "==> %s(0x%lx) ptr %p\n", __FUNCTION__, s, ptr);
   
   if (ac > 0 && av != NULL && av[0] != NULL) {
  - int i;
  - for (i = 0; i < ac; i++) {
  - /* XXX lua splits into {name,opts,body} triple. */
  - rb_ary_push(v, rb_str_new2(av[i]));
  - }
  +int i;
  +for (i = 0; i < ac; i++) {
  +/* Parse out "%name(opts)\tbody" into n/o/b strings. */
  +
  +char *name = (char *)av[i];
  +char *body = strchr(name, '\t');
  +assert(body != NULL);
  +char *opts = ((body > name && body[-1] == ')') ?
  +strchr(name, '(') : NULL);
  +
  + if (*name == '%') name++;
  + if (opts != NULL && *opts == '(') {
  +body[-1] = '\0';
  +opts++;
  +opts[-1] = '\0';
  +} else {
  +body[0] = '\0';
  +opts = "";
  +}
  +body++;
  +
  +VALUE nob_ary = rb_ary_new3(3, rb_str_new2(name),
  +rb_str_new2(opts), rb_str_new2(body));
  +rb_ary_push(v, nob_ary);
  +}
   }
  +
  +argvFree(av);
   return v;
   }

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

2010-10-30 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:  a...@rpm5.org
  Module: rpm  Date:   30-Oct-2010 23:43:41
  Branch: rpm-5_2  Handle: 2010103021434000

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

  Log:
devtool: macosx: fix python version and perl compiler

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.293.2.20 -r2.293.2.21 devtool.conf
  --- rpm/devtool.conf  30 Oct 2010 21:41:33 -  2.293.2.20
  +++ rpm/devtool.conf  30 Oct 2010 21:43:40 -  2.293.2.21
  @@ -1335,6 +1335,7 @@
   UNIVERSAL_CFLAGS="-isystem ${UNIVERSAL_SDK}/usr/include -isystem 
${UNIVERSAL_SDK}/usr/include/gcc/darwin/3.3 -arch ppc"
   UNIVERSAL_LDFLAGS="-Wl,-syslibroot,${UNIVERSAL_SDK} -arch ppc"
   UNIVERSAL_TARGET="--host powerpc-apple-darwin7 --target 
powerpc-apple-darwin7"
  +UNIVERSAL_PYTHON="2.3"
   platform=Panther
   @source %macosx
   
  @@ -1349,6 +1350,7 @@
   UNIVERSAL_CFLAGS="-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386"
   UNIVERSAL_LDFLAGS="-arch ppc -arch i386"
   UNIVERSAL_TARGET="--host i686-apple-darwin8 --target i686-apple-darwin8"
  +UNIVERSAL_PYTHON="2.5" # http://python.org
   platform=Tiger
   @source %macosx
   
  @@ -1363,6 +1365,7 @@
   UNIVERSAL_CFLAGS="-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386"
   UNIVERSAL_LDFLAGS="-arch ppc -arch i386"
   UNIVERSAL_TARGET="--host i686-apple-darwin9 --target i686-apple-darwin9"
  +UNIVERSAL_PYTHON="2.5"
   platform=Leopard
   @source %macosx
   
  @@ -1414,6 +1417,7 @@
   test ".$UNIVERSAL_CPP" == "." && UNIVERSAL_CPP="gcc -E"
   test ".$UNIVERSAL_CC" == "." && UNIVERSAL_CC="gcc"
   test ".$UNIVERSAL_CXX" == "." && UNIVERSAL_CXX="g++"
  +test ".$UNIVERSAL_PYTHON" == "." && UNIVERSAL_PYTHON=`python -c "import 
sys; print sys.version[:3]"`
   
   #   third-party base directory
   basemac="${DEVTOOL_SRCDIR}/../mac"
  @@ -1839,7 +1843,7 @@
   --with-pcre="$basemac/bin/$platform/pcre-${v_pcre}" \
   --with-uuid="$basemac/bin/$platform/uuid-${v_uuid}" \
   --with-perl \
  ---with-python \
  +--with-python=$UNIVERSAL_PYTHON \
   --with-apidocs=auto \
   --disable-static \
   --enable-shared \
  @@ -1855,7 +1859,7 @@
   gnumake
   
   # perl's makefile doesn't seem to be able to find the libraries in 
DYLD_LIBRARY_PATH
  -make -C perl MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" 
OTHERLDFLAGS="$LDFLAGS"
  +make -C perl CC="$UNIVERSAL_CC" 
MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" OTHERLDFLAGS="$LDFLAGS"
   
   # python complains about missing symbols from all over when using 
librpm*, relink:
   make -C misc LIBS="-lz -lxml2 -lpcre $LIBS" clean all
  @@ -1877,7 +1881,7 @@
   rm 
/tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/.packlist
   
   # move perl/python modules to canonical /Library locations
  -python_version=`python -c "import sys; print sys.version[:3]"`
  +python_version=$UNIVERSAL_PYTHON
   mkdir -p /tmp/rpm-root/Library/Python/$python_version
   mv /tmp/rpm-root/System/Library/Frameworks/Python.framework/Versions/* \
  /tmp/rpm-root/Library/Python/ 2>/dev/null
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2010-10-30 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:  a...@rpm5.org
  Module: rpm  Date:   30-Oct-2010 23:41:33
  Branch: rpm-5_2  Handle: 2010103021413300

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

  Log:
devtool: build with beecrypt 4.2.1 (like internal)

  Summary:
RevisionChanges Path
2.122.2.4   +1  -1  rpm/INSTALL
2.293.2.20  +4  -7  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/INSTALL
  
  $ cvs diff -u -r2.122.2.3 -r2.122.2.4 INSTALL
  --- rpm/INSTALL   10 Jan 2010 09:49:28 -  2.122.2.3
  +++ rpm/INSTALL   30 Oct 2010 21:41:33 -  2.122.2.4
  @@ -29,7 +29,7 @@
   POSIX make  mandatory -   -   e.g. 
http://www.gnu.org/software/make/
   Perlmandatory 5.8.0   5.10.0  http://www.perl.com/
   POPTmandatory 1.151.15http://rpm5.org/files/popt/
  -BeeCryptmandatory 4.0 4.1.2   http://beecrypt.sourceforge.net/
  +BeeCryptmandatory 4.2 4.2.1   http://beecrypt.sourceforge.net/
   PCREmandatory 7.0 7.9 http://www.pcre.org/
   Mozilla NSS optional  3.113.11.7  
http://www.mozilla.org/projects/security/pki/nss/
   OpenSSL optional  0.9.8   0.9.8k  http://www.openssl.org/
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.293.2.19 -r2.293.2.20 devtool.conf
  --- rpm/devtool.conf  23 Oct 2010 16:06:24 -  2.293.2.19
  +++ rpm/devtool.conf  30 Oct 2010 21:41:33 -  2.293.2.20
  @@ -507,7 +507,7 @@
   v_openssl="0.9.8k"
   v_expat="2.0.1"
   v_neon="0.28.4"
  -v_beecrypt="4.1.2"
  +v_beecrypt="4.2.1"
   v_db="4.7.25"
   v_sqlite="3.6.14.2"
   v_lua="5.1.4"
  @@ -959,7 +959,7 @@
  -e '/^CXX = /s;@CXX@;@CC@;g' \
  Makefile.in
   $SHTOOL subst \
  --e '/LINENO: error: C[+]* 
preprocessor/{N;N;N;N;s/.*/:/;}' \
  +-e '/LINENO: error: C[+]* 
preprocessor/{N;N;N;N;s/.*/  \}/;}' \
   configure
   ( echo 'ac_cv_have_dev_dsp=no'
 echo 'ac_cv_have_dev_audio=no'
  @@ -973,9 +973,8 @@
   --without-cplusplus \
   --without-java \
   --without-python \
  ---with-cpu=none \
  ---with-arch=none \
   --disable-threads \
  +--disable-openmp \
   --disable-shared
   make
   ) || exit $?
  @@ -1663,7 +1662,7 @@
  -e '/^CXX = /s;@CXX@;@CC@;g' \
  Makefile.in
   $SHTOOL subst \
  --e '/LINENO: error: C[+]* 
preprocessor/{N;N;N;N;s/.*/:/;}' \
  +-e '/LINENO: error: C[+]* 
preprocessor/{N;N;N;N;s/.*/  \}/;}' \
   configure
   ( echo 'ac_cv_have_dev_dsp=no'
 echo 'ac_cv_have_dev_audio=no'
  @@ -1679,8 +1678,6 @@
   --without-cplusplus \
   --without-java \
   --without-python \
  ---with-cpu=none \
  ---with-arch=none \
   --disable-threads \
   --disable-shared
   make
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2010-10-30 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:  a...@rpm5.org
  Module: rpm  Date:   30-Oct-2010 13:51:46
  Branch: rpm-5_3  Handle: 2010103011514600

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

  Log:
devtool: cleanup

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.333.2.55 -r2.333.2.56 devtool.conf
  --- rpm/devtool.conf  30 Oct 2010 11:39:49 -  2.333.2.55
  +++ rpm/devtool.conf  30 Oct 2010 11:51:46 -  2.333.2.56
  @@ -2644,7 +2644,7 @@
--with-python \
--with-apidocs \
--with-db \
  - --with-sqlite=external \
  + --with-sqlite \
--with-dbsql \
--with-db-tools-integrated \
--with-zlib=external \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2010-10-30 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:  a...@rpm5.org
  Module: rpm  Date:   30-Oct-2010 13:51:18
  Branch: HEAD Handle: 2010103011511800

  Modified files:
rpm devtool.conf

  Log:
devtool: cleanup

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.357 -r2.358 devtool.conf
  --- rpm/devtool.conf  30 Oct 2010 11:48:20 -  2.357
  +++ rpm/devtool.conf  30 Oct 2010 11:51:18 -  2.358
  @@ -2572,7 +2572,7 @@
--with-python \
--with-apidocs \
--with-db \
  - --with-sqlite=external \
  + --with-sqlite \
--with-dbsql \
--with-db-tools-integrated \
--with-zlib=external \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2010-10-30 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:  a...@rpm5.org
  Module: rpm  Date:   30-Oct-2010 13:48:20
  Branch: HEAD Handle: 2010103011482000

  Modified files:
rpm devtool.conf

  Log:
devtool: freebsd: stop setting autotools versions

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.356 -r2.357 devtool.conf
  --- rpm/devtool.conf  30 Oct 2010 11:38:48 -  2.356
  +++ rpm/devtool.conf  30 Oct 2010 11:48:20 -  2.357
  @@ -2554,8 +2554,6 @@
#   sysutils/pcre
#   misc/ossp-uuid
   
  - AUTOMAKE_VERSION=111
  - AUTOCONF_VERSION=263
%autogen
LOCALBASE=/usr/local
PREFIX=${LOCALBASE}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2010-10-30 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:  a...@rpm5.org
  Module: rpm  Date:   30-Oct-2010 13:39:49
  Branch: rpm-5_3  Handle: 2010103011394900

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

  Log:
devtool: freebsd: don't use internal file

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.333.2.54 -r2.333.2.55 devtool.conf
  --- rpm/devtool.conf  28 Oct 2010 19:04:25 -  2.333.2.54
  +++ rpm/devtool.conf  30 Oct 2010 11:39:49 -  2.333.2.55
  @@ -2620,7 +2620,7 @@
#   devel/popt  >= 1.15
#   security/beecrypt
#   www/neon28
  - #  *sysutils/file
  + #   sysutils/file
#   sysutils/xar
#   sysutils/xz
#   sysutils/pcre
  @@ -2648,7 +2648,7 @@
--with-dbsql \
--with-db-tools-integrated \
--with-zlib=external \
  - --with-file=internal \
  + --with-file=external \
--with-xar=external \
--with-xz=external \
--with-pcre=external \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2010-10-30 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:  a...@rpm5.org
  Module: rpm  Date:   30-Oct-2010 13:38:48
  Branch: HEAD Handle: 2010103011384800

  Modified files:
rpm devtool.conf

  Log:
devtool: freebsd: don't use internal file

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.355 -r2.356 devtool.conf
  --- rpm/devtool.conf  25 Oct 2010 21:47:22 -  2.355
  +++ rpm/devtool.conf  30 Oct 2010 11:38:48 -  2.356
  @@ -2548,7 +2548,7 @@
#   devel/popt  >= 1.15
#   security/beecrypt
#   www/neon28
  - #  *sysutils/file
  + #   sysutils/file
#   sysutils/xar
#   sysutils/xz
#   sysutils/pcre
  @@ -2578,7 +2578,7 @@
--with-dbsql \
--with-db-tools-integrated \
--with-zlib=external \
  - --with-file=internal \
  + --with-file=external \
--with-xar=external \
--with-xz=external \
--with-pcre=external \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org