Author: qboosh                       Date: Thu Dec 15 17:06:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unified: more Obsoletes when built as default_db

---- Files affected:
packages/db4.3:
   db4.3.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/db4.3/db4.3.spec
diff -u packages/db4.3/db4.3.spec:1.25 packages/db4.3/db4.3.spec:1.26
--- packages/db4.3/db4.3.spec:1.25      Tue Dec 13 16:20:05 2011
+++ packages/db4.3/db4.3.spec   Thu Dec 15 18:06:51 2011
@@ -3,7 +3,7 @@
 # Conditional build:
 %bcond_without java            # don't build Java library
 %bcond_without tcl             # don't build Tcl bindings
-%bcond_with    pmutex          # use POSIX mutexes (only process-private with 
linuxthreads)
+%bcond_with    pmutex          # use process-shared POSIX mutexes (not 
available with linuxthreads)
 %bcond_without nptl            # don't use process-shared POSIX mutexes (NPTL 
provides full interface)
 %bcond_without static_libs     # don't build static libraries
 %bcond_with    default_db      # use this db as default system db
@@ -62,6 +62,7 @@
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-devel = %{version}-%{release}
+Obsoletes:     db-devel
 Obsoletes:     db3-devel
 Obsoletes:     db4-devel
 %endif
@@ -95,6 +96,7 @@
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-static = %{version}-%{release}
+Obsoletes:     db-static
 Obsoletes:     db3-static
 Obsoletes:     db4-static
 %endif
@@ -144,6 +146,7 @@
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-cxx-devel = %{version}-%{release}
+Obsoletes:     db-cxx-devel
 %endif
 Conflicts:     db-devel < 4.1.25-3
 
@@ -160,6 +163,7 @@
 Requires:      %{name}-cxx-devel = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-cxx-static = %{version}-%{release}
+Obsoletes:     db-cxx-static
 %endif
 Conflicts:     db-static < 4.2.50-1
 
@@ -176,6 +180,7 @@
 Requires:      jpackage-utils
 %if %{with default_db}
 Provides:      db-java = %{version}-%{release}
+Obsoletes:     db-java
 %endif
 
 %description java
@@ -191,6 +196,7 @@
 Requires:      %{name}-java = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-java-devel = %{version}-%{release}
+Obsoletes:     db-java-devel
 %endif
 Conflicts:     db-devel < 4.1.25-3
 
@@ -223,6 +229,7 @@
 Requires:      %{name}-tcl = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-tcl-devel = %{version}-%{release}
+Obsoletes:     db-tcl-devel
 %endif
 Conflicts:     db-devel < 4.1.25-3
 
@@ -579,6 +586,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2011/12/15 17:06:51  qboosh
+- unified: more Obsoletes when built as default_db
+
 Revision 1.25  2011/12/13 15:20:05  qboosh
 - unified; install versioned db.jar and db-utils (with symlinks if built as 
default_db)
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db4.3/db4.3.spec?r1=1.25&r2=1.26&f=u

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

Reply via email to