Author: glen Date: Mon Oct 27 20:46:39 2008 GMT
Module: SPECS Tag: rpm-4_5
---- Log message:
- newer fix for installbeforeerase with config loss; rel 0.61
---- Files affected:
SPECS:
rpm.spec (1.837.2.42.2.49.2.31 -> 1.837.2.42.2.49.2.32)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.49.2.31 SPECS/rpm.spec:1.837.2.42.2.49.2.32
--- SPECS/rpm.spec:1.837.2.42.2.49.2.31 Sun Oct 26 22:21:15 2008
+++ SPECS/rpm.spec Mon Oct 27 21:46:34 2008
@@ -14,13 +14,12 @@
# Conditional build:
%bcond_with static # build static rpm+rpmi
%bcond_without apidocs # don't generate documentation with doxygen
+%bcond_with internal_db # internal db (db 4.5.20)
%if "%{pld_release}" == "ac"
%bcond_without autoreqdep # autogenerate package name deps in addition to
sonames/perl(X)
-%bcond_without internal_db # internal db (db 4.5.20)
%bcond_with nptl # internal db: don't use
process-shared POSIX mutexes (NPTL provides full interface)
%else
%bcond_with autoreqdep # autogenerate package name deps in
addition to sonames/perl(X)
-%bcond_with internal_db # internal db (db 4.5.20)
%bcond_without nptl # internal db: don't use process-shared
POSIX mutexes (NPTL provides full interface)
%endif
%bcond_without python # don't build python bindings
@@ -50,7 +49,7 @@
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 4.5
-Release: 0.59
+Release: 0.61
License: LGPL
Group: Base
Source0: %{name}-%{version}.tar.gz
@@ -133,7 +132,8 @@
Patch66: %{name}-v3-support.patch
Patch67: %{name}-cleanbody.patch
Patch69: %{name}-popt-aliases.patch
-#Patch71: %{name}-rpm5-patchset-10061.patch
+# reverse arrows patch
+Patch71: %{name}-installbeforeerase.patch
Patch73: %{name}-namespace-probe.patch
Patch74: %{name}-noversiondir.patch
Patch75: %{name}-rpmte-segv.patch
@@ -303,7 +303,7 @@
%{?with_selinux:Requires: libselinux >= 1.18}
Requires: ossp-uuid >= 1.6.2-4
Requires: popt >= %{reqpopt_ver}
-%{?with_nptl:Requires: uname(release) >= 2.6.0}
+%{?with_internal_db:%{?with_nptl:Requires: uname(release) >= 2.6.0}}
Requires: zlib >= 1.2.3
%{?with_suggest_tags:Suggests: lzma >= 1:4.42.0}
Obsoletes: rpm-libs
@@ -736,7 +736,7 @@
%patch66 -p1
%patch67 -p1
%patch69 -p1
-#%patch71 -p0
+%patch71 -p1
%patch73 -p1
%patch74 -p1
%patch75 -p0
@@ -832,7 +832,7 @@
%{?with_python:--with-python=%{py_ver}} \
%{!?with_python:--without-python} \
%{!?with_selinux:--without-selinux} \
- --%{?with_nptl:en}%{!?with_nptl:dis}able-posixmutexes \
+
%{?with_internal_db:--%{?with_nptl:en}%{!?with_nptl:dis}able-posixmutexes} \
--without-db
%{__make} \
@@ -1410,6 +1410,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.837.2.42.2.49.2.32 2008/10/27 20:46:34 glen
+- newer fix for installbeforeerase with config loss; rel 0.61
+
Revision 1.837.2.42.2.49.2.31 2008/10/26 21:21:15 glen
- disable debuginfo and repackage for ti
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42.2.49.2.31&r2=1.837.2.42.2.49.2.32&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
