[CVS] RPM: rpm/ macros.in
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: 14-Jan-2009 21:40:05 Branch: HEAD Handle: 2009011420400400 Modified files: rpm macros.in Log: - jbj: simplify %pattern_Epoch validation pattern. Summary: RevisionChanges Path 1.271 +2 -2 rpm/macros.in patch -p0 '@@ .' Index: rpm/macros.in $ cvs diff -u -r1.270 -r1.271 macros.in --- rpm/macros.in 11 Jan 2009 22:02:15 - 1.270 +++ rpm/macros.in 14 Jan 2009 20:40:04 - 1.271 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.270 2009/01/11 22:02:15 jbj Exp $ +# $Id: macros.in,v 1.271 2009/01/14 20:40:04 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 @@ -1059,7 +1059,7 @@ # data validation patterns for identifier tags %pattern_Name^[A-Za-z0-9][A-Za-z0-9+._-]*$ -%pattern_Epoch ^[0-9]+*$ +%pattern_Epoch ^[0-9]+$ %pattern_Version ^[A-Za-z0-9+._]+$ %pattern_Release ^[A-Za-z0-9+._]+$ %pattern_Disttag ^[A-Za-z0-9]+$ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ macros.in
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: 14-Jan-2009 21:41:11 Branch: rpm-5_1 Handle: 2009011420411100 Modified files: (Branch: rpm-5_1) rpm macros.in Log: - jbj: simplify %pattern_Epoch validation pattern. Summary: RevisionChanges Path 1.241.2.10 +2 -2 rpm/macros.in patch -p0 '@@ .' Index: rpm/macros.in $ cvs diff -u -r1.241.2.9 -r1.241.2.10 macros.in --- rpm/macros.in 11 Jan 2009 22:03:11 - 1.241.2.9 +++ rpm/macros.in 14 Jan 2009 20:41:11 - 1.241.2.10 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.241.2.9 2009/01/11 22:03:11 jbj Exp $ +# $Id: macros.in,v 1.241.2.10 2009/01/14 20:41:11 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 @@ -1040,7 +1040,7 @@ # data validation patterns for identifier tags %pattern_Name^[A-Za-z0-9][A-Za-z0-9+._-]*$ -%pattern_Epoch ^[0-9]+*$ +%pattern_Epoch ^[0-9]+$ %pattern_Version ^[A-Za-z0-9+._]+$ %pattern_Release ^[A-Za-z0-9+._]+$ %pattern_Disttag ^[A-Za-z0-9]+$ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 14-Jan-2009 21:48:24 Branch: HEAD Handle: 2009011420482300 Modified files: rpm devtool.conf Log: - jbj: -pie linkage prevents using valgrind on F11. avoid the pain for now. Summary: RevisionChanges Path 2.258 +0 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.257 -r2.258 devtool.conf --- rpm/devtool.conf 5 Jan 2009 09:45:56 - 2.257 +++ rpm/devtool.conf 14 Jan 2009 20:48:23 - 2.258 @@ -93,7 +93,6 @@ --with-build-extlibdep \ --with-build-maxextlibdep \ --enable-build-pic \ ---enable-build-pie \ --enable-build-versionscript \ --enable-build-warnings \ --enable-build-debug \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES Makefile.am autogen.sh configure.ac devtool.co...
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: 15-Jan-2009 03:11:45 Branch: HEAD Handle: 2009011502114302 Modified files: rpm CHANGES Makefile.am autogen.sh configure.ac devtool.conf rpm/lib Makefile.am rpm/miscMakefile.am librpmmisc.vers rpm/rpmdb Makefile.am rpm/rpmio Makefile.am rpm/tools Makefile.am Log: - jbj: pcre: punish PLD with internal bloat until the trivial AutoFu exists. Summary: RevisionChanges Path 1.2735 +1 -0 rpm/CHANGES 2.225 +1 -0 rpm/Makefile.am 2.99+3 -0 rpm/autogen.sh 2.335 +8 -2 rpm/configure.ac 2.259 +3 -2 rpm/devtool.conf 2.188 +1 -0 rpm/lib/Makefile.am 1.39+2 -0 rpm/misc/Makefile.am 1.13+8 -0 rpm/misc/librpmmisc.vers 1.107 +1 -0 rpm/rpmdb/Makefile.am 1.202 +1 -0 rpm/rpmio/Makefile.am 2.116 +1 -0 rpm/tools/Makefile.am patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2734 -r1.2735 CHANGES --- rpm/CHANGES 11 Jan 2009 22:02:15 - 1.2734 +++ rpm/CHANGES 15 Jan 2009 02:11:43 - 1.2735 @@ -1,5 +1,6 @@ 5.2a2 - 5.2a3: +- jbj: pcre: punish PLD with internal bloat until the trivial AutoFu exists. - jbj: rpmbuild: use anchored patterns for data validation. - jbj: move rpmgrep and man page from rpmio/ to tools/ and install. - jbj: EVRtuple: eliminate the old EVR parser. @@ . patch -p0 '@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.224 -r2.225 Makefile.am --- rpm/Makefile.am 4 Nov 2008 16:08:16 - 2.224 +++ rpm/Makefile.am 15 Jan 2009 02:11:43 - 2.225 @@ -55,6 +55,7 @@ @WITH_ZLIB_SUBDIR@ \ @WITH_LUA_SUBDIR@ \ @WITH_FILE_SUBDIR@ \ + @WITH_PCRE_SUBDIR@ \ @WITH_XAR_SUBDIR@ \ @WITH_LZMA_SUBDIR@ \ misc \ @@ . patch -p0 '@@ .' Index: rpm/autogen.sh $ cvs diff -u -r2.98 -r2.99 autogen.sh --- rpm/autogen.sh24 Sep 2008 21:20:07 - 2.98 +++ rpm/autogen.sh15 Jan 2009 02:11:43 - 2.99 @@ -40,6 +40,9 @@ [ `libtoolize --version | head -1` != $LTV ] echo $USAGE # exit 1 [ `gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'` != $GTT ] echo $USAGE # exit 1 +#echo === pcre +#( cd pcre sh ./autogen.sh --noconfigure $@ ) +#echo === pcre echo === lzma ( cd lzma sh ./autogen.sh --noconfigure $@ ) echo === lzma @@ . patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.334 -r2.335 configure.ac --- rpm/configure.ac 4 Jan 2009 22:57:04 - 2.334 +++ rpm/configure.ac 15 Jan 2009 02:11:43 - 2.335 @@ -999,6 +999,7 @@ [], []) dnl # libLZMA +WITH_LZMA_INTERNAL=false RPM_CHECK_LIB( [libLZMA], [lzma], [lzma], [lzma_auto_decoder], [lzma.h], @@ -1172,11 +1173,16 @@ AM_CONDITIONAL(USE_LUA_SOCKET, [ test .$USE_LUA_SOCKET = .yes ]) dnl # PCRE +WITH_PCRE_INTERNAL=false RPM_CHECK_LIB( [PCRE], [pcre], [pcre], [pcre_compile], [pcre.h], -[no,external:none], [], -[ dnl # make sure PCRE POSIX API can be really _USED_ by RPM +[yes,internal:external: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 pcre.h]) + fi + dnl # make sure PCRE POSIX API can be really _USED_ by RPM LIBS_SAVED=$LIBS LIBS=-lpcreposix $LIBS AC_LINK_IFELSE([ @@ . patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.258 -r2.259 devtool.conf --- rpm/devtool.conf 14 Jan 2009 20:48:23 - 2.258 +++ rpm/devtool.conf 15 Jan 2009 02:11:43 - 2.259 @@ -3,12 +3,13 @@ ## %common -MODULE_NAMES=db lua file xar lzma +MODULE_NAMES=db lua file xar lzma pcre MODULE_TAG_DB= MODULE_TAG_LUA= MODULE_TAG_FILE= MODULE_TAG_XAR= MODULE_TAG_LZMA= +
