Author: glen                         Date: Mon Feb 18 21:20:50 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- conflict with older rpm not to get out of sync; rel 6

---- Files affected:
SPECS:
   db4.5.spec (1.8.2.4 -> 1.8.2.5) 

---- Diffs:

================================================================
Index: SPECS/db4.5.spec
diff -u SPECS/db4.5.spec:1.8.2.4 SPECS/db4.5.spec:1.8.2.5
--- SPECS/db4.5.spec:1.8.2.4    Sun Feb 17 16:06:04 2008
+++ SPECS/db4.5.spec    Mon Feb 18 22:20:44 2008
@@ -16,7 +16,7 @@
 Summary(pl.UTF-8):     Biblioteka C do obsługi baz Berkeley DB
 Name:          db4.5
 Version:       %{mver}.20
-Release:       5
+Release:       6
 Epoch:         0
 License:       Sleepycat public license (GPL-like, see LICENSE)
 Group:         Libraries
@@ -36,6 +36,7 @@
 %{?with_tcl:BuildRequires:     tcl-devel >= 8.4.0}
 Provides:      db = %{version}-%{release}
 Obsoletes:     db4
+Conflicts:     rpm < 4.4.9-41
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -215,9 +216,8 @@
 Group:         Applications/Databases
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Provides:      db-utils = %{version}-%{release}
-Obsoletes:     db4-utils
-# obsolete Ra package
 Obsoletes:     db3-utils
+Obsoletes:     db4-utils
 
 %description utils
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -295,7 +295,7 @@
        --%{?with_pmutex:en}%{!?with_pmutex:dis}able-posixmutexes \
        --enable-cxx \
        %{?with_tcl:--enable-tcl} \
-       %{?with_tcl:--with-tcl=/usr/lib} \
+       %{?with_tcl:--with-tcl=%{_libdir}} \
        %{?with_java:--enable-java} \
        --disable-static \
        --enable-shared
@@ -497,6 +497,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8.2.5  2008-02-18 21:20:44  glen
+- conflict with older rpm not to get out of sync; rel 6
+
 Revision 1.8.2.4  2008-02-17 15:06:04  marcus
 - NPTL disabled by default for new rpm 4.4.9 that must works with kernel 2.4 
without nptl
 - rel.5.
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/db4.5.spec?r1=1.8.2.4&r2=1.8.2.5&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to