Accepting request 285001 from OFED:Factory
- Also have dapl-utils conflict with dapl-debug-utils. - Fix baselibs.conf to build libdat2-2-32bit. - Also have dapl-utils conflict with dapl-debug-utils. - Fix baselibs.conf to build libdat2-2-32bit. (forwarded request 284066 from dimstar) OBS-URL: https://build.opensuse.org/request/show/285001 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dapl?expand=0&rev=3
This commit is contained in:
parent
4b801c3ccb
commit
53dfc28efc
@ -1,2 +1,2 @@
|
||||
libdat2
|
||||
libdat2-2
|
||||
dapl-devel
|
||||
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 4 14:33:06 UTC 2015 - dimstar@opensuse.org
|
||||
|
||||
- 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 - coolo@suse.com
|
||||
|
||||
- dapl-debug can't obsolete dapl or zypper will switch between the versions
|
||||
all the time. They do conflict though
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 8 19:06:02 CEST 2014 - pth@suse.de
|
||||
|
||||
|
@ -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: libibverbs-devel
|
||||
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 @@ Summary: Development files for the libdat and libdapl libraries
|
||||
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 @@ library.
|
||||
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.
|
||||
|
12
dapl.changes
12
dapl.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 4 14:33:06 UTC 2015 - dimstar@opensuse.org
|
||||
|
||||
- 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 - coolo@suse.com
|
||||
|
||||
- dapl-debug can't obsolete dapl or zypper will switch between the versions
|
||||
all the time. They do conflict though
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 8 19:06:02 CEST 2014 - pth@suse.de
|
||||
|
||||
|
21
dapl.spec
21
dapl.spec
@ -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: libibverbs-devel
|
||||
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 @@ Summary: Development files for the libdat and libdapl libraries
|
||||
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 @@ library.
|
||||
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.
|
||||
|
Loading…
Reference in New Issue
Block a user