RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 20-May-2008 19:54:55
Branch: HEAD Handle: 2008052017545500
Modified files:
rpm devtool.conf
Log:
check for magic existance, to work with file-4.24
Summary:
Revision Changes Path
2.222 +2 -0 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.221 -r2.222 devtool.conf
--- rpm/devtool.conf 20 May 2008 17:33:01 -0000 2.221
+++ rpm/devtool.conf 20 May 2008 17:54:55 -0000 2.222
@@ -995,7 +995,9 @@
make install
# install required runtime files for uninstalled third-party library
"file" (libmagic)
install -d -m 755 $prefix/share/file
+ if [ -f $base3rd/bin/$platform/file-${v_file}/magic/magic ]; then
install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic
$prefix/share/file/
+ fi
install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic.mgc
$prefix/share/file/
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
