Author: baggins Date: Mon Aug 29 17:04:36 2005 GMT Module: SPECS Tag: AC-branch ---- Log message: - release 2 - dropped libhome_etc deps and bcond, as we can now do HOME_ETC support without external library
---- Files affected: SPECS: rpm.spec (1.555.2.100 -> 1.555.2.101) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.555.2.100 SPECS/rpm.spec:1.555.2.101 --- SPECS/rpm.spec:1.555.2.100 Mon Aug 29 18:51:14 2005 +++ SPECS/rpm.spec Mon Aug 29 19:04:30 2005 @@ -10,7 +10,6 @@ %bcond_with static # build static rpmi (not supported at the moment) %bcond_without apidocs # don't generate documentation with doxygen %bcond_without autoreqdep # don't 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_with neon # build with HTTP/WebDAV support (neon library) @@ -33,7 +32,7 @@ Name: rpm %define sover 4.4 Version: 4.4.2 -Release: 1.1 +Release: 2 License: GPL Group: Base Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz @@ -116,7 +115,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} #BuildRequires: libmagic-devel %{?with_selinux:BuildRequires: libselinux-devel >= 1.18} # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros @@ -230,10 +228,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. @@ -255,7 +249,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} Requires: popt-devel >= %{reqpopt_ver} Requires: zlib-devel @@ -707,7 +700,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} \ @@ -1113,6 +1105,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.555.2.101 2005/08/29 17:04:30 baggins +- release 2 +- dropped libhome_etc deps and bcond, as we can now do HOME_ETC support + without external library + Revision 1.555.2.100 2005/08/29 16:51:14 baggins - back rel 1.1 - try to do home_etc support without libhome_etc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.100&r2=1.555.2.101&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
