Hehe, what I *really* want to see is some QA on RPMTAG_FILECLASS.
If the data can be stabilized, there's lots of fancy stuff that can
be done.
On Jul 3, 2007, at 11:45 AM, Ralf S. Engelschall wrote:
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
______________________________________________________________________
______
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 03-Jul-2007
17:45:04
Branch: HEAD Handle: 2007070316450400
Modified files:
rpm INSTALL autogen.sh devtool.conf
Log:
Although IMHO it is not necessary to distribute a local
(unmodified)
copy of File/magic, Jeff wishes to include it in the official
RPM 5
distribution, so make it a first class internal third-party
library
similar to Lua, ZLib and Berkeley-DB.
Summary:
Revision Changes Path
2.22 +4 -1 rpm/INSTALL
2.83 +3 -0 rpm/autogen.sh
2.19 +2 -2 rpm/devtool.conf
______________________________________________________________________
______
patch -p0 <<'@@ .'
Index: rpm/INSTALL
======================================================================
======
$ cvs diff -u -r2.21 -r2.22 INSTALL
--- rpm/INSTALL 30 Jun 2007 15:56:27 -0000 2.21
+++ rpm/INSTALL 3 Jul 2007 15:45:04 -0000 2.22
@@ -34,7 +34,7 @@
Lua [2] optional - 5.0 http://www.lua.org/
ZLib [3] optional 1.2 1.2.3 http://www.zlib.net/
GNU bzip2 optional 1.0 1.0.4 http://www.bzip2.org/
-File/magic optional 4.0 4.21 ftp://ftp.astron.com/
pub/file/
+File/magic [4] optional 4.0 4.21 ftp://ftp.astron.com/
pub/file/
GNU gettext optional 1.16 1.16.1 http://www.gnu.org/
software/gettext/
GNU iconv optional 1.11 1.11 http://www.gnu.org/
software/libiconv/
DMalloc optional 5 5.5.2 http://dmalloc.com/
@@ -55,6 +55,9 @@
[3] zlib: Modified ZLib copy bundled with RPM.
Building RPM against stock external Zlib not
recommended.
+[4] file: Unmodified File/magic copy bundled with RPM for
convenience reasons.
+ Building RPM against stock external File/magic
supported, too.
+
Run-Time
--------
@@ .
patch -p0 <<'@@ .'
Index: rpm/autogen.sh
======================================================================
======
$ cvs diff -u -r2.82 -r2.83 autogen.sh
--- rpm/autogen.sh 27 Jun 2007 19:20:45 -0000 2.82
+++ rpm/autogen.sh 3 Jul 2007 15:45:04 -0000 2.83
@@ -38,6 +38,9 @@
echo "===> zlib"
( cd zlib && sh ./autogen.sh --noconfigure "$@" )
echo "<=== zlib"
+echo "===> file"
+( cd file && sh ./autogen.sh --noconfigure "$@" )
+echo "<=== file"
echo "===> rpm"
echo "---> generate files via GNU libtool (libtoolize)"
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
======================================================================
======
$ cvs diff -u -r2.18 -r2.19 devtool.conf
--- rpm/devtool.conf 26 Jun 2007 18:19:08 -0000 2.18
+++ rpm/devtool.conf 3 Jul 2007 15:45:04 -0000 2.19
@@ -3,7 +3,7 @@
##
%common
- MODULE_NAMES="db lua zlib"
+ MODULE_NAMES="db lua zlib file"
MODULE_TAG_DB=""
MODULE_TAG_LUA=""
MODULE_TAG_ZLIB=""
@@ -46,7 +46,7 @@
%configure "$@"
%jbj
- %checkout file
+ %checkout
%autogen
%configure \
--verbose \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [EMAIL PROTECTED]
______________________________________________________________________
RPM Package Manager http://rpm5.org
Developer Communication List rpm-devel@rpm5.org