diff --git a/dpdk-thunderx.changes b/dpdk-thunderx.changes index f03b4dd..2a9d12b 100644 --- a/dpdk-thunderx.changes +++ b/dpdk-thunderx.changes @@ -2,11 +2,13 @@ Fri Jan 20 11:01:47 CET 2017 - ndas@suse.de - Added gcc-6 as default compiler for CRC/mtune & other optimizations. +- Fix possible parallel installation of dpdk subpackages. ------------------------------------------------------------------- Wed Jan 4 18:11:17 CET 2017 - ndas@suse.de - Add pre_checkin.sh to generate the dpdk-thunderx.spec file + ------------------------------------------------------------------- Mon Dec 12 11:35:44 UTC 2016 - marco.varlese@suse.com diff --git a/dpdk-thunderx.spec b/dpdk-thunderx.spec index c205b36..5ae7e2f 100644 --- a/dpdk-thunderx.spec +++ b/dpdk-thunderx.spec @@ -64,7 +64,8 @@ BuildRequires: libnuma-devel BuildRequires: libpcap-devel BuildRequires: zlib-devel ExclusiveArch: aarch64 x86_64 %ix86 ppc64le -Conflicts: dpdk +Provides: dpdk-any = %{version} +Conflicts: otherproviders(dpdk-any) %description The Data Plane Development Kit is a set of libraries and drivers for @@ -74,6 +75,8 @@ fast packet processing in the user space. Summary: Data Plane Development Kit development files (thunderx) Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +Provides: dpdk-any-devel = %{version} +Conflicts: otherproviders(dpdk-any-devel) %description devel This package contains the headers and other files needed for developing @@ -83,6 +86,8 @@ applications with the Data Plane Development Kit. Summary: Data Plane Development Kit API documentation (thunderx) Group: System/Libraries BuildArch: noarch +Provides: dpdk-any-doc = %{version} +Conflicts: otherproviders(dpdk-any-doc) %description doc API programming documentation for the Data Plane Development Kit. @@ -96,6 +101,8 @@ Requires: findutils Requires: iproute Requires: kmod Requires: pciutils +Provides: dpdk-any-tools = %{version} +Conflicts: otherproviders(dpdk-any-tools) %description tools This package contains tools for setting up Data Plane Development Kit environment @@ -106,6 +113,8 @@ This package contains tools for setting up Data Plane Development Kit environmen Summary: Data Plane Development Kit example applications (thunderx) Group: System/Libraries BuildRequires: libvirt-devel +Provides: dpdk-any-examples = %{version} +Conflicts: otherproviders(dpdk-any-examples) %description examples Example applications utilizing the Data Plane Development Kit, such diff --git a/dpdk.changes b/dpdk.changes index f03b4dd..2a9d12b 100644 --- a/dpdk.changes +++ b/dpdk.changes @@ -2,11 +2,13 @@ Fri Jan 20 11:01:47 CET 2017 - ndas@suse.de - Added gcc-6 as default compiler for CRC/mtune & other optimizations. +- Fix possible parallel installation of dpdk subpackages. ------------------------------------------------------------------- Wed Jan 4 18:11:17 CET 2017 - ndas@suse.de - Add pre_checkin.sh to generate the dpdk-thunderx.spec file + ------------------------------------------------------------------- Mon Dec 12 11:35:44 UTC 2016 - marco.varlese@suse.com diff --git a/dpdk.spec b/dpdk.spec index ef226c9..727931b 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -62,6 +62,8 @@ BuildRequires: libnuma-devel BuildRequires: libpcap-devel BuildRequires: zlib-devel ExclusiveArch: aarch64 x86_64 %ix86 ppc64le +Provides: dpdk-any = %{version} +Conflicts: otherproviders(dpdk-any) %description The Data Plane Development Kit is a set of libraries and drivers for @@ -71,6 +73,8 @@ fast packet processing in the user space. Summary: Data Plane Development Kit development files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +Provides: dpdk-any-devel = %{version} +Conflicts: otherproviders(dpdk-any-devel) %description devel This package contains the headers and other files needed for developing @@ -80,6 +84,8 @@ applications with the Data Plane Development Kit. Summary: Data Plane Development Kit API documentation Group: System/Libraries BuildArch: noarch +Provides: dpdk-any-doc = %{version} +Conflicts: otherproviders(dpdk-any-doc) %description doc API programming documentation for the Data Plane Development Kit. @@ -93,6 +99,8 @@ Requires: findutils Requires: iproute Requires: kmod Requires: pciutils +Provides: dpdk-any-tools = %{version} +Conflicts: otherproviders(dpdk-any-tools) %description tools This package contains tools for setting up Data Plane Development Kit environment @@ -103,6 +111,8 @@ This package contains tools for setting up Data Plane Development Kit environmen Summary: Data Plane Development Kit example applications Group: System/Libraries BuildRequires: libvirt-devel +Provides: dpdk-any-examples = %{version} +Conflicts: otherproviders(dpdk-any-examples) %description examples Example applications utilizing the Data Plane Development Kit, such diff --git a/pre_checkin.sh b/pre_checkin.sh index dbad2cc..4061ca4 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -16,5 +16,4 @@ sed -i -e "/^Name:.*dpdk$/i \ -e "/^Name:/s/dpdk/&-thunderx/g" \ -e "/^Summary:/s/^.*$/&\ \(thunderx\)/g" \ -e "/^%define machine2 armv8a/s/armv8a/thunderx/g" \ --e "/^ExclusiveArch/a Conflicts: dpdk" \ dpdk-thunderx.spec || exit 1