Author: areq Date: Sat Sep 10 19:56:43 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merge from AC branch - use patched system libmagic
---- Files affected:
SPECS:
rpm.spec (1.687 -> 1.688)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.687 SPECS/rpm.spec:1.688
--- SPECS/rpm.spec:1.687 Tue Sep 6 19:45:20 2005
+++ SPECS/rpm.spec Sat Sep 10 21:56:38 2005
@@ -13,6 +13,7 @@
%bcond_without home_etc # build without HOME_ETC support
%bcond_without python # don't build python bindings
%bcond_without selinux # build without selinux support
+%bcond_without system_libmagic # don't use system libmagic
%bcond_with neon # build with HTTP/WebDAV support (neon library)
# force_cc - force using __cc other than
"%{_target_cpu}-pld-linux-gcc"
# force_cxx - force using __cxx other than
"%{_target_cpu}-pld-linux-g++"
@@ -117,7 +118,7 @@
BuildRequires: findutils
BuildRequires: gettext-devel >= 0.11.4-2
%{?with_home_etc:BuildRequires: home-etc-devel >= 1:1.0.9-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
@@ -140,7 +141,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
@@ -225,6 +226,7 @@
Requires: beecrypt >= %{beecrypt_ver}
Requires: db >= %{reqdb_ver}
%{?with_selinux:Requires: libselinux >= 1.18}
+%{?with_system_libmagic:Requires: libmagic >= 1.15-2}
Requires: popt >= %{reqpopt_ver}
Obsoletes: rpm-libs
# avoid SEGV caused by mixed db versions
@@ -256,6 +258,7 @@
Requires: elfutils-devel
%{?with_home_etc:Requires: home-etc-devel >= 1:1.0.9-2}
%{?with_selinux:Requires: libselinux-devel}
+%{?with_system_libmagic:Requires: libmagic-devel}
Requires: popt-devel >= %{reqpopt_ver}
Requires: zlib-devel
@@ -317,6 +320,7 @@
Requires: bzip2-static
Requires: db-static >= %{reqdb_ver}
Requires: elfutils-static
+%{?with_system_libmagic:Requires: libmagic-static}
Requires: popt-static >= %{reqpopt_ver}
Requires: zlib-static
@@ -670,6 +674,9 @@
done
%build
+%if %{with system_libmagic}
+rm -rf file
+%else
cd file
%{__libtoolize}
%{__aclocal}
@@ -677,6 +684,7 @@
%{__autoconf}
%{__automake}
cd ..
+%endif
%{__libtoolize}
%{__gettextize}
@@ -951,7 +959,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
@@ -1104,6 +1112,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.688 2005/09/10 19:56:38 areq
+- merge from AC branch - use patched system libmagic
+
Revision 1.687 2005/09/06 17:45:20 glen
- rpm_macros_rev 1.236
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.687&r2=1.688&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
