Author: arekm Date: Sat Sep 3 14:42:32 2005 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- system libmagic bcond
---- Files affected:
SPECS:
rpm.spec (1.555.2.103 -> 1.555.2.104)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.103 SPECS/rpm.spec:1.555.2.104
--- SPECS/rpm.spec:1.555.2.103 Sat Sep 3 10:55:51 2005
+++ SPECS/rpm.spec Sat Sep 3 16:42:26 2005
@@ -13,6 +13,8 @@
%bcond_without python # don't build python bindings
%bcond_without selinux # build without selinux support
%bcond_with neon # build with HTTP/WebDAV support (neon library)
+%bcond_with system_libmagic
+
# force_cc - force using __cc other than
"%{_target_cpu}-pld-linux-gcc"
# force_cxx - force using __cxx other than
"%{_target_cpu}-pld-linux-g++"
# force_cpp - force using __cpp other than
"%{_target_cpu}-pld-linux-gcc -E"
@@ -32,7 +34,7 @@
Name: rpm
%define sover 4.4
Version: 4.4.2
-Release: 3
+Release: 3.1
License: GPL
Group: Base
Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -75,7 +77,6 @@
Patch16: %{name}-php-deps.patch
Patch17: %{name}-ldconfig-always.patch
Patch18: %{name}-perl_req.patch
-
Patch20: %{name}-magic-usesystem.patch
Patch21: %{name}-dontneedutils.patch
Patch22: %{name}-provides-dont-obsolete.patch
@@ -115,7 +116,7 @@
BuildRequires: elfutils-devel >= 0.108
BuildRequires: findutils
BuildRequires: gettext-devel >= 0.11.4-2
-#BuildRequires: libmagic-devel
+%{?with_system_libmagic:BuildRequires: libmagic-devel}
%{?with_selinux:BuildRequires: libselinux-devel >= 1.18}
# needed only for AM_PROG_CXX used for CXX substitution in rpm.macros
BuildRequires: libstdc++-devel
@@ -139,7 +140,7 @@
BuildRequires: db-static >= %{reqdb_ver}
BuildRequires: glibc-static >= 2.2.94
BuildRequires: elfutils-static
-#BuildRequires: libmagic-static
+%{with_system_libmagic:BuildRequires: libmagic-static}
%{?with_selinux:BuildRequires: libselinux-static >= 1.18}
BuildRequires: popt-static >= %{reqpopt_ver}
BuildRequires: zlib-static
@@ -656,7 +657,7 @@
mv -f po/{no,nb}.po
mv -f po/{sr,[EMAIL PROTECTED]
-rm -rf sqlite zlib db db3 popt rpmdb/db.h
+rm -rf file sqlite zlib db db3 popt rpmdb/db.h
# generate Group translations to *.po
awk -f %{SOURCE6} %{SOURCE1}
@@ -668,14 +669,6 @@
done
%build
-cd file
-%{__libtoolize}
-%{__aclocal}
-%{__autoheader}
-%{__autoconf}
-%{__automake}
-cd ..
-
%{__libtoolize}
%{__gettextize}
%{__aclocal}
@@ -951,7 +944,7 @@
%attr(755,root,root) %{_bindir}/rpmcache
%attr(755,root,root) %{_bindir}/rpmdeps
%attr(755,root,root) %{_bindir}/rpmgraph
-%attr(755,root,root) %{_bindir}/rpmfile
+%{!?with_system_libmagic:%attr(755,root,root) %{_bindir}/rpmfile}
%attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh
%attr(755,root,root) %{_rpmlibdir}/rpm2cpio.sh
%attr(755,root,root) %{_rpmlibdir}/tgpg
@@ -1105,6 +1098,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.555.2.104 2005/09/03 14:42:26 arekm
+- system libmagic bcond
+
Revision 1.555.2.103 2005/09/03 08:55:51 wolf
- BR: file-4.14
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.103&r2=1.555.2.104&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
