Hello community,

here is the log from the commit of package dapl for openSUSE:Factory checked in 
at 2015-02-10 20:24:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dapl (Old)
 and      /work/SRC/openSUSE:Factory/.dapl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dapl"

Changes:
--------
--- /work/SRC/openSUSE:Factory/dapl/dapl-debug.changes  2014-08-11 
10:07:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dapl.new/dapl-debug.changes     2015-02-10 
20:24:06.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Feb  4 14:33:06 UTC 2015 - [email protected]
+
+- Also have dapl-utils conflict with dapl-debug-utils.
+- Fix baselibs.conf to build libdat2-2-32bit.
+
+-------------------------------------------------------------------
+Mon Sep  8 07:46:08 UTC 2014 - [email protected]
+
+- dapl-debug can't obsolete dapl or zypper will switch between the versions
+  all the time. They do conflict though
+
+-------------------------------------------------------------------
dapl.changes: same change

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dapl-debug.spec ++++++
--- /var/tmp/diff_new_pack.KD3o3B/_old  2015-02-10 20:24:08.000000000 +0100
+++ /var/tmp/diff_new_pack.KD3o3B/_new  2015-02-10 20:24:08.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dapl-debug
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -41,14 +41,8 @@
 BuildRequires:  librdmacm-devel
 BuildRequires:  libtool
 
-%if "%name" == "dapl"
-Provides:       dapl-debug
-Obsoletes:      dapl-debug
-%endif
-
 %if "%name" == "dapl-debug"
-Provides:       dapl
-Obsoletes:      dapl
+Conflicts:      dapl
 %endif
 
 # bug437293
@@ -101,12 +95,10 @@
 Group:          Development/Libraries/Other
 Requires:       %{name} = %{version}
 Requires:       glibc-devel
-%if "%{name}" == "dapl-debug"
-Obsoletes:      dapl-devel
-Provides:       dapl-devel
+%if "%{name}" == "dapl"
+Conflicts:      dapl-debug-devel
 %else
-Obsoletes:      dapl-debug-devel
-Provides:       dapl-debug-devel
+Provides:       dapl-devel
 %endif
 
 %description    devel
@@ -132,6 +124,9 @@
 Summary:        Test suites for the uDAPL library
 Group:          Productivity/Networking/System
 Requires:       %{name} = %{version}-%{release}
+%if "%{name}" == "dapl"
+Conflicts:      dapl-debug-utils
+%endif
 
 %description utils
 Useful test suites to validate the uDAPL library APIs.

++++++ dapl.spec ++++++
--- /var/tmp/diff_new_pack.KD3o3B/_old  2015-02-10 20:24:08.000000000 +0100
+++ /var/tmp/diff_new_pack.KD3o3B/_new  2015-02-10 20:24:08.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dapl
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -41,14 +41,8 @@
 BuildRequires:  librdmacm-devel
 BuildRequires:  libtool
 
-%if "%name" == "dapl"
-Provides:       dapl-debug
-Obsoletes:      dapl-debug
-%endif
-
 %if "%name" == "dapl-debug"
-Provides:       dapl
-Obsoletes:      dapl
+Conflicts:      dapl
 %endif
 
 # bug437293
@@ -101,12 +95,10 @@
 Group:          Development/Libraries/Other
 Requires:       %{name} = %{version}
 Requires:       glibc-devel
-%if "%{name}" == "dapl-debug"
-Obsoletes:      dapl-devel
-Provides:       dapl-devel
+%if "%{name}" == "dapl"
+Conflicts:      dapl-debug-devel
 %else
-Obsoletes:      dapl-debug-devel
-Provides:       dapl-debug-devel
+Provides:       dapl-devel
 %endif
 
 %description    devel
@@ -132,6 +124,9 @@
 Summary:        Test suites for the uDAPL library
 Group:          Productivity/Networking/System
 Requires:       %{name} = %{version}-%{release}
+%if "%{name}" == "dapl"
+Conflicts:      dapl-debug-utils
+%endif
 
 %description utils
 Useful test suites to validate the uDAPL library APIs.

++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.KD3o3B/_old  2015-02-10 20:24:08.000000000 +0100
+++ /var/tmp/diff_new_pack.KD3o3B/_new  2015-02-10 20:24:08.000000000 +0100
@@ -1,2 +1,2 @@
-libdat2
+libdat2-2
 dapl-devel

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to