Author: qboosh Date: Tue Sep 13 11:42:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged baggins's home_etc fixes from AC-branch - release 3
---- Files affected: SPECS: rpm.spec (1.690 -> 1.691) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.690 SPECS/rpm.spec:1.691 --- SPECS/rpm.spec:1.690 Tue Sep 13 13:40:50 2005 +++ SPECS/rpm.spec Tue Sep 13 13:42:05 2005 @@ -8,7 +8,6 @@ %bcond_with static # build static rpmi (not supported at the moment) %bcond_without apidocs # don't generate documentation with doxygen %bcond_with autoreqdep # autogenerate package name deps in addition to sonames/perl(X) -%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 @@ -32,7 +31,7 @@ Name: rpm %define sover 4.4 Version: 4.4.2 -Release: 2 +Release: 3 License: GPL Group: Base Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz @@ -115,7 +114,6 @@ BuildRequires: elfutils-devel >= 0.108 BuildRequires: findutils BuildRequires: gettext-devel >= 0.11.4-2 -%{?with_home_etc:BuildRequires: home-etc-devel >= 1:1.0.9-2} %{?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 @@ -229,10 +227,6 @@ Obsoletes: rpm-libs # avoid SEGV caused by mixed db versions Conflicts: poldek < 0.18.1-16 -%if %{with home_etc} -# avoid linking to /usr/lib -Conflicts: home-etc < 1.0.9-2 -%endif %description lib RPMs library. @@ -254,7 +248,6 @@ Requires: bzip2-devel Requires: db-devel >= %{reqdb_ver} 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} @@ -708,7 +701,6 @@ --enable-shared \ --enable-static \ %{?with_apidocs:--with-apidocs} \ - %{?with_home_etc:--with-home_etc} \ %{?with_python:--with-python=auto} \ %{!?with_python:--without-python} \ %{!?with_selinux:--without-selinux} \ @@ -1112,6 +1104,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.691 2005/09/13 11:42:05 qboosh +- merged baggins's home_etc fixes from AC-branch +- release 3 + Revision 1.690 2005/09/13 11:40:50 qboosh - removed obsolete todo entry (system libmagic) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.690&r2=1.691&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
