RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm pcre Date: 27-Apr-2010 19:25:50 Branch: rpm-5_2 Handle: 2010042717254802 Modified files: (Branch: rpm-5_2) pcre install-sh rpm CHANGES configure.ac devtool.conf rpm/tests Makefile.am rpm/tests/ref .alldigests showrc Log: - tests: "make check" for RHEL6 beta passes. Summary: Revision Changes Path 1.1.1.1.2.1 +3 -2 pcre/install-sh 1.2970.2.51 +1 -0 rpm/CHANGES 2.372.2.12 +12 -0 rpm/configure.ac 2.293.2.13 +27 -25 rpm/devtool.conf 1.35.2.3 +1 -1 rpm/tests/Makefile.am 1.22.2.2 +19 -38 rpm/tests/ref/.alldigests 1.14.2.2 +10 -8 rpm/tests/ref/showrc ____________________________________________________________________________ patch -p0 <<'@@ .' Index: pcre/install-sh ============================================================================ $ cvs diff -u -r1.1.1.1 -r1.1.1.1.2.1 install-sh --- pcre/install-sh 14 Jan 2009 20:19:32 -0000 1.1.1.1 +++ pcre/install-sh 27 Apr 2010 17:25:49 -0000 1.1.1.1.2.1 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2009-04-28.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -515,5 +515,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: @@ . patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2970.2.50 -r1.2970.2.51 CHANGES --- rpm/CHANGES 26 Apr 2010 08:50:02 -0000 1.2970.2.50 +++ rpm/CHANGES 27 Apr 2010 17:25:48 -0000 1.2970.2.51 @@ -1,4 +1,5 @@ 5.2.0 -> 5.2.1: + - jbj: tests: "make check" for RHEL6 beta passes. - jbj: backport most of "make check". - jbj: fix: remove the inheirited %description before adding explicitly. - proyvind: python: make sure that we always use our own rpm build and @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.372.2.11 -r2.372.2.12 configure.ac --- rpm/configure.ac 28 Feb 2010 00:23:40 -0000 2.372.2.11 +++ rpm/configure.ac 27 Apr 2010 17:25:48 -0000 2.372.2.12 @@ -1441,6 +1441,18 @@ fi ], []) +dnl # FIXME: AutoFu tests for <sys/acl.h> and -lacl are needed w/o --with-xar +RPM_CHECK_LIB( + [ATTR], [attr], + [attr], [attr_get], [sys/xattr.h], + [no,external:none], [], + [], []) +RPM_CHECK_LIB( + [ACL], [acl], + [acl], [acl_free], [sys/acl.h], + [no,external:none], [], + [], []) + dnl # XAR RPM_CHECK_LIB( [XAR], [xar], @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf ============================================================================ $ cvs diff -u -r2.293.2.12 -r2.293.2.13 devtool.conf --- rpm/devtool.conf 26 Apr 2010 08:50:03 -0000 2.293.2.12 +++ rpm/devtool.conf 27 Apr 2010 17:25:48 -0000 2.293.2.13 @@ -86,20 +86,22 @@ --with-gcrypt=external \ --with-neon=external \ --with-pcre=internal \ - --with-uuid=system \ + --without-uuid \ + --with-attr \ + --with-acl \ --with-xar=internal \ --with-popt=external \ --with-keyutils=external \ --with-pthreads \ --with-libelf \ --with-selinux \ - --with-ficl=/usr/lib:/usr/include/ficl \ - --with-js=internal \ + --without-ficl \ + --without-js \ --with-python \ - --with-pythonembed=/usr/lib:/usr/include/python2.5 \ + --with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ - --with-perlembed=/usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE \ - --with-ruby=/usr/lib/ruby/1.8/i386-linux \ + --without-perlembed \ + --without-ruby \ --with-build-extlibdep \ --with-build-maxextlibdep \ --enable-build-pic \ @@ -115,7 +117,7 @@ --verbose \ --prefix=/usr \ --with-db=internal \ - --with-db-sql \ + --with-db-sql \ --with-db-tools-integrated \ --with-zlib=external \ --with-bzip2=external \ @@ -178,24 +180,24 @@ %checkout %autogen %configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --libdir=/usr/lib \ - --without-selinux \ - --disable-dependency-tracking \ - --with-perl \ - --with-python \ - --with-sqlite \ - --with-pcre \ - --with-bzip2 \ - --with-openssl \ - --with-file \ - --with-libelf \ - --disable-rpath \ - --without-lua + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + --libdir=/usr/lib \ + --without-selinux \ + --disable-dependency-tracking \ + --with-perl \ + --with-python \ + --with-sqlite \ + --with-pcre \ + --with-bzip2 \ + --with-openssl \ + --with-file \ + --with-libelf \ + --disable-rpath \ + --without-lua %fray-cross %checkout @@ . patch -p0 <<'@@ .' Index: rpm/tests/Makefile.am ============================================================================ $ cvs diff -u -r1.35.2.2 -r1.35.2.3 Makefile.am --- rpm/tests/Makefile.am 26 Apr 2010 08:50:06 -0000 1.35.2.2 +++ rpm/tests/Makefile.am 27 Apr 2010 17:25:49 -0000 1.35.2.3 @@ -127,7 +127,7 @@ @-diff -u {tmp,ref}/showrc || cp {tmp,ref}/showrc @${rpmdigest} --alldigests ref/[^C]* > tmp/.alldigests @-diff -u {tmp,ref}/.alldigests || cp {tmp,ref}/.alldigests - @${mtree} -c -p ref | ${mtree} -p ref + @-${mtree} -c -p ref | ${mtree} -p ref POPTURI = http://rpm5.org/files/popt/ POPTPKGS = \ @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/.alldigests ============================================================================ $ cvs diff -u -r1.22.2.1 -r1.22.2.2 .alldigests --- rpm/tests/ref/.alldigests 26 Apr 2010 08:50:07 -0000 1.22.2.1 +++ rpm/tests/ref/.alldigests 27 Apr 2010 17:25:50 -0000 1.22.2.2 @@ -17,25 +17,6 @@ crc64:536da1eb3cf94321 ref/DB_CONFIG adler32:49493163 ref/DB_CONFIG jlu32:0ddec8d3 ref/DB_CONFIG -md2:49882e19c8de780d55bc77087304873e ref/DB_CONFIG~ -md4:c85e880673a75348e360458903cd43c2 ref/DB_CONFIG~ -md5:dbf60e0eeff2065b950fd99d9d9c0a79 ref/DB_CONFIG~ -sha1:8b137adb66068ff4ee7cc1f8438db3db31ce78b6 ref/DB_CONFIG~ -sha224:63fba9e505e2cb5659b006791c1221480d0e374c7aac1a906f29a6c5 ref/DB_CONFIG~ -sha256:b5363c452c5dbc35e604c2df91bfbae95a5f8da760a457a12765d798fa274ddb ref/DB_CONFIG~ -sha384:4ee91b312ef87b450a0d87ee4cc30753b92e817ae8ac2b32aece4c6e7b565d4bffbbd922cf875bbe687032d0a78396c4 ref/DB_CONFIG~ -sha512:1e4ecf265e7b209e06b49f0a1f802a7f911e0a739a5c3b2e5dfe0c09ec666b6b50ff10c0cff6ff88894080e744a226be437f41f979fa3a61939cebbc23ea0e97 ref/DB_CONFIG~ -salsa10:4999b41cbf1f0ac3b29d0e706f15d777b067b4c30b253c521114cfa37c5630bc8da4c2f644c7c72ee56cf5b600628e7752f94efd842a17803dcd00148831aa71 ref/DB_CONFIG~ -salsa20:e0b2ef1e0c9c3be3be9e6d9b348e6503d61a29af771783fa292340cb8e667b8c358754a6ec0077a300188d094061f875a9992d862343a96c455597d7a8aaa81b ref/DB_CONFIG~ -rmd128:1408d773bce5ffe8f20b892e502087b7 ref/DB_CONFIG~ -rmd160:6cba52ccf3651f6e89d36aa862b60838937bdcb6 ref/DB_CONFIG~ -rmd256:5cc383c322a3331ddcd97a71b9438e0256036ec8bd6bae3cb33bfd641ae8bc0a ref/DB_CONFIG~ -rmd320:2a9ec2de93cb757c075c8f26539aea456197b4cdc8e3f0522308c65a991d7bfb707a5699bdd557e6 ref/DB_CONFIG~ -tiger:198c69858f31e55760946e919900812fd1e6e71fdc83b35e ref/DB_CONFIG~ -crc32:2ed44db2 ref/DB_CONFIG~ -crc64:9bc247bd39882bcc ref/DB_CONFIG~ -adler32:a96c3140 ref/DB_CONFIG~ -jlu32:5639c932 ref/DB_CONFIG~ md2:bc73129d4e085a7fc6855229f6cd6a07 ref/cAos.i386.manifest md4:ee0b08300b409ccf9d9ad2fcbe2bf3df ref/cAos.i386.manifest md5:c702512431a26602340ccf07f5e114d9 ref/cAos.i386.manifest @@ -378,25 +359,25 @@ crc64:78d006d5ebc0570c ref/repomd.xml adler32:9e112467 ref/repomd.xml jlu32:6f662ac3 ref/repomd.xml -md2:da0f67c718fa155c35353032195df9d6 ref/showrc -md4:19a8d3f13c25b4c234f8d71764c17842 ref/showrc -md5:06dd1c498540e8cbb37ddd8665ee2d1d ref/showrc -sha1:b4a09a79a000d103d9af6b8dc8f24e0438693e54 ref/showrc -sha224:08eca566df39f7b0b48b03910d366a67339fee1feeff8602e2d771b9 ref/showrc -sha256:be65ea02852270ea7df8ca4379feb8f92890586727da868d8b4cfe15f800220d ref/showrc -sha384:01f44abeea63cf44e78fe57f28e453eb1f646f7fcc5fb0184b41684ad1552b7dc7ea0cd4c7860acebecb86c0e749770d ref/showrc -sha512:4389e8ae9f5c6156a06074838defadc520fbdbb3036785212f5d1e0c128a8c3bde8a82fdbdbccc4ac3fce88047ffb11a8c92977141a3553d3ba164d17096f66d ref/showrc -salsa10:4bad01f9584867c7b335bfef75baf82e0e510ce96cfd80367e14aed89194046889fd2707c828d3cd0bc0bef2f46682f4fe7e998614780a335a1c67f1039f9f8a ref/showrc -salsa20:88dc6393bb33e3d69192554a85c08e600e5113d1674241d0d6d61f7d4cf424d97d6d6f7cbf06dc35cffe7a9db6145aa5f6ab43cbb4f0f29a1508c38540887368 ref/showrc -rmd128:4ce4792b69abae8d109510f6d7abcfe0 ref/showrc -rmd160:22dac02c300347a02c74a57acddd8459d0d45dc7 ref/showrc -rmd256:f84618fe3f2c5a7bce421b6094a02651f0ad93ce5e62f43dff14c598a0bc9a01 ref/showrc -rmd320:ebc8b67b02f7bc11d0e3c3ef0488d33fb304b5264be86aa8cf367b74e75d22ec77d54caccfaa7481 ref/showrc -tiger:fb3961666fa227ad8d46d2ae8bcf37a24be26ed32a727269 ref/showrc -crc32:2a4827c4 ref/showrc -crc64:c5bacb9ad8922b28 ref/showrc -adler32:4b35c0fb ref/showrc -jlu32:b17bcac7 ref/showrc +md2:854c256467f8973bf87cea81a8b2ce0b ref/showrc +md4:0c75d95fe94a03f716bec7247cfbbfd5 ref/showrc +md5:d4be43a63254cfe0a9a623f65da70c2c ref/showrc +sha1:ce085dae6dc803b71a79bc02e4f0fef30e793231 ref/showrc +sha224:4732b5edb572fd5a3cc2117d8f5811110d954b712d56d9f64d6d54bb ref/showrc +sha256:495f1d3e41b4f2924fa9bad33d6cb4c9377e2fb51d470a364cada92f5fffed90 ref/showrc +sha384:38a869c9f85517a2b0bab1dcf7b155591d92f5e75470759c5d5b79a8727c48b8c7352b2435db076513457fdc29b244a5 ref/showrc +sha512:6f40f8a01a26d4e2253598be800ac5e3bc67a37f227449628d6f60b07884b3431ea39adcd781b92dbd0d1616e79101f683893bde8a044e8165b0948c6facdc20 ref/showrc +salsa10:b6ad38d3b83fca801ae2fd314ecdb54ff273e0a7cd6cb3e957ed7f685792216a94cb9bdbea10b19a0db53af8f95c572085bdde84673e27d8d34e05b05033cc7f ref/showrc +salsa20:0f8a5f959e4eec16ee890ca6946948bc6c963073a8757913d05b31630f556455880cab8c68f2d4e55e175fbe5ad12880626f5b3fcf1e38f8423fef8817572428 ref/showrc +rmd128:8d90c6c3fa8b6068b7303c5047ee0a97 ref/showrc +rmd160:4254a317a804065f545018daf647098afa21d98c ref/showrc +rmd256:6e3cb291bba9525c1dbc427651a9b3ddd6badd25cd346f8c1e4406a88fc60c5b ref/showrc +rmd320:0d9ae58acfc503080fd55e208a20648182a7ba89998dbf94917927287d3cc4632250756e77dcd8d5 ref/showrc +tiger:11b26cea05a42caf2d89dde03f5a0192a0aae589bcfee299 ref/showrc +crc32:a55eea72 ref/showrc +crc64:721161a3749de97b ref/showrc +adler32:985dca49 ref/showrc +jlu32:8b54c634 ref/showrc md2:1fdeee84178a4cc3bc26e13debab2da0 ref/version md4:782bd18488986c571b1ae4cdeb5cc04d ref/version md5:d9941a051422d5ea2b4a438b1a15a640 ref/version @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/showrc ============================================================================ $ cvs diff -u -r1.14.2.1 -r1.14.2.2 showrc --- rpm/tests/ref/showrc 26 Apr 2010 08:50:07 -0000 1.14.2.1 +++ rpm/tests/ref/showrc 27 Apr 2010 17:25:50 -0000 1.14.2.2 @@ -37,6 +37,7 @@ Features provided by current cpuinfo (from /proc/cpuinfo): cpuinfo(acpi) + cpuinfo(aperfmperf) cpuinfo(apic) cpuinfo(arch_perfmon) cpuinfo(bogomips) = 5987.48 @@ -80,6 +81,7 @@ cpuinfo(stepping) = 6 cpuinfo(tsc) cpuinfo(tsc_reliable) + cpuinfo(up) cpuinfo(vme) cpuinfo(wp) @@ -232,8 +234,8 @@ -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename} -14: __grep /bin/grep -14: __gzip /bin/gzip --14: __hg %{_bindir}/hg --14: __id /bin/id +-14: __hg /usr/bin/hg +-14: __id /usr/bin/id -14: __install /usr/bin/install -14: __install_info /sbin/install-info -14: __java_provides %{_rpmhome}/javadeps.sh --provides @@ -245,7 +247,7 @@ -14: __libtool_requires %{nil} -14: __libtoolize libtoolize -14: __ln_s ln -s --14: __lua %{_bindir}/lua +-14: __lua /usr/bin/lua -14: __lzma /usr/bin/lzma -14: __lzop %{_bindir}/lzop -14: __make /usr/bin/make @@ -260,12 +262,12 @@ -14: __objext o -14: __os_install_post %{___build_post} -14: __patch /usr/bin/patch --14: __pax %{_bindir}/pax +-14: __pax /usr/bin/pax -14: __perl /usr/bin/perl -14: __perl_provides %{_rpmhome}/perl.prov -14: __perl_requires %{_rpmhome}/perl.req -14: __pgp %{_bindir}/pgp --14: __php %{_bindir}/php +-14: __php /usr/bin/php -14: __pkgconfig_provides %{_rpmhome}/pkgconfigdeps.sh --provides -14: __pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires -14: __policy_tree %{expand:%%global __policy_tree %{lua: @@ -285,7 +287,7 @@ -14: __ranlib ranlib -14: __remsh %{__rsh} -14: __rm /bin/rm --14: __rsh %{_bindir}/rsh +-14: __rsh /usr/bin/rsh -14: __scriptlet_requires %{nil} -14: __sed /bin/sed -14: __sh /bin/sh @@ -371,7 +373,7 @@ %{nil} -14: __ssh /usr/bin/ssh -14: __strip /usr/bin/strip --14: __svn /usr/bin/svn +-14: __svn %{_bindir}/svn -14: __tar /bin/tar -14: __tclsh /usr/bin/tclsh -14: __unzip /usr/bin/unzip @@ -611,7 +613,7 @@ -14: _uuid_path /package -14: _var /var -14: _varrun /var/run --14: _vendor mandriva +-14: _vendor redhat -14: _verify_file_context_path %{__file_context_path} -14: _vsflags_build %{__vsflags} -14: _vsflags_erase %{__vsflags} @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
