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: 02-Nov-2010 16:03:51
Branch: HEAD Handle: 2010110215035100
Modified files:
rpm CHANGES devtool.conf
Log:
- devtool: don't distribute internal pcre.
Summary:
Revision Changes Path
1.3490 +1 -0 rpm/CHANGES
2.362 +13 -13 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3489 -r1.3490 CHANGES
--- rpm/CHANGES 1 Nov 2010 19:52:40 -0000 1.3489
+++ rpm/CHANGES 2 Nov 2010 15:03:51 -0000 1.3490
@@ -5,6 +5,7 @@
- proyvind: mandriva: fix 'Conflicts: dependencies without release
misfire'. (mdvbz#55810)
- proyvind: make sure to expand %buildroot from main package.
+ - jbj: devtool: don't distribute internal pcre.
- proyvind: filetriggers: don't bother w unneeded chroot.
5.3.4 -> 5.3.5:
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.361 -r2.362 devtool.conf
--- rpm/devtool.conf 1 Nov 2010 10:26:08 -0000 2.361
+++ rpm/devtool.conf 2 Nov 2010 15:03:51 -0000 2.362
@@ -3,7 +3,7 @@
##
%common
- MODULE_NAMES="lua pcre syck neon beecrypt"
+ MODULE_NAMES="lua syck neon beecrypt"
MODULE_TAG_DB=""
MODULE_TAG_LUA=""
MODULE_TAG_FILE=""
@@ -109,7 +109,7 @@
--with-neon=internal \
--without-libproxy \
--with-expat \
- --with-pcre=internal \
+ --with-pcre \
--enable-utf8 \
--without-uuid \
--with-attr \
@@ -164,7 +164,7 @@
--with-beecrypt=internal \
--with-gcrypt \
--without-tomcrypt \
- --with-pcre=internal \
+ --with-pcre \
--enable-utf8 \
--with-uuid=system \
--with-popt=system \
@@ -224,7 +224,7 @@
--with-neon=external \
--without-libproxy \
--with-expat \
- --with-pcre=internal \
+ --with-pcre \
--enable-utf8 \
--with-uuid=/opt/local/lib:/opt/local/include/ossp \
--without-attr \
@@ -289,7 +289,7 @@
--with-neon=external \
--without-libroxy \
--with-expat \
- --with-pcre=internal \
+ --with-pcre \
--enable-utf8 \
--with-uuid=/opt/local/lib:/opt/local/include/ossp \
--without-attr \
@@ -356,7 +356,7 @@
--with-neon=internal \
--without-libproxy \
--with-expat \
- --with-pcre=internal \
+ --with-pcre \
--enable-utf8 \
--without-uuid \
--with-attr \
@@ -427,7 +427,7 @@
--with-neon=internal \
--without-libproxy \
--with-expat \
- --with-pcre=internal \
+ --with-pcre \
--enable-utf8 \
--without-uuid \
--with-attr \
@@ -497,7 +497,7 @@
--without-libroxy \
--without-expat \
--with-libxml2 \
- --with-pcre=internal \
+ --with-pcre \
--enable-utf8 \
--with-uuid=system \
--with-attr \
@@ -566,7 +566,7 @@
--without-libroxy \
--without-expat \
--with-libxml2 \
- --with-pcre=internal \
+ --with-pcre \
--enable-utf8 \
--without-uuid \
--with-attr \
@@ -635,7 +635,7 @@
--without-libroxy \
--without-expat \
--with-libxml2 \
- --with-pcre=external \
+ --with-pcre \
--enable-utf8 \
--without-uuid \
--with-attr \
@@ -787,7 +787,7 @@
--with-neon=internal \
--without-libproxy \
--with-expat \
- --with-pcre=internal \
+ --with-pcre \
--without-uuid \
--with-attr \
--with-acl \
@@ -852,7 +852,7 @@
--without-pakchois \
--without-gnutls \
--with-neon=internal \
- --with-pcre=internal \
+ --with-pcre \
--without-uuid \
--with-attr \
--with-acl \
@@ -922,7 +922,7 @@
--with-neon=internal \
--without-libproxy \
--with-expat \
- --with-pcre=internal \
+ --with-pcre \
--enable-utf8 \
--without-uuid \
--without-attr \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
