Accepting request 567528 from home:jengelh:branches:devel:libraries:c_c++

- Remove excess Provides, BuildRequires and %ifs.
- Fix %description line mismatch for s390x parts.

OBS-URL: https://build.opensuse.org/request/show/567528
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libblockdev?expand=0&rev=2

libblockdev.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 18 23:26:58 UTC 2018 - jengelh@inai.de
+
+- Remove excess Provides, BuildRequires and %ifs.
+- Fix %description line mismatch for s390x parts.
+
 -------------------------------------------------------------------
 Tue Nov 28 22:38:39 UTC 2017 - luc14n0@linuxmail.org
 

libblockdev.spec

@@ -71,7 +71,6 @@ no information about VGs when creating an LV).
 %package -n %{libname}
 Summary:        A library for low-level manipulation with block devices
 Group:          System/Libraries
-Provides:       %{name} = %{version}
 
 %description -n %{libname}
 The LibBlockDev is a C library with GObject introspection support that can be
@@ -125,7 +124,6 @@ LibBlockDev in Python3.
 %package -n libbd_utils%{somajor}
 Summary:        Utility functions library for the LibBlockDev library
 Group:          System/Libraries
-Provides:       libblockdev-utils = %{version}
 
 %description -n libbd_utils%{somajor}
 The LibBlockDev-utils is a library providing utility functions used by the
@@ -136,7 +134,6 @@ Summary:        Development files for libbd_utils
 Group:          Development/Libraries/C and C++
 Requires:       libbd_utils%{somajor} = %{version}
 Requires:       glib2-devel
-Provides:       libblockdev-utils-devel = %{version}
 
 %description -n libbd_utils-devel
 This package contains header files and pkg-config files needed for development
@@ -146,7 +143,6 @@ with the libbd_utils library.
 Summary:        The BTRFS plugin for the LibBlockDev library
 Group:          System/Libraries
 Requires:       libbd_utils%{somajor} >= %{libbd_utils_version}
-Provides:       libblockdev-btrfs = %{version}
 
 %description -n libbd_btrfs%{somajor}
 The LibBlockDev library plugin (and in the same time a standalone library)
@@ -158,7 +154,6 @@ Group:          Development/Libraries/C and C++
 Requires:       libbd_btrfs%{somajor} = %{version}
 Requires:       glib2-devel
 Requires:       libbd_utils-devel
-Provides:       libblockdev-btrfs-devel = %{version}
 
 %description -n libbd_btrfs-devel
 This package contains header files and pkg-config files needed for development
@@ -167,7 +162,6 @@ with the libbd_btrfs plugin/library.
 %package -n libbd_crypto%{somajor}
 Summary:        The crypto plugin for the LibBlockDev library
 Group:          System/Libraries
-Provides:       libblockdev-crypto = %{version}
 
 %description -n libbd_crypto%{somajor}
 The LibBlockDev library plugin (and in the same time a standalone library)
@@ -178,7 +172,6 @@ Summary:        Development files for the libbd_crypto plugin/library
 Group:          Development/Libraries/C and C++
 Requires:       libbd_crypto%{somajor} = %{version}
 Requires:       glib2-devel
-Provides:       libblockdev-crypto-devel = %{version}
 
 %description -n libbd_crypto-devel
 This package contains header files and pkg-config files needed for development
@@ -190,7 +183,6 @@ Group:          System/Libraries
 Requires:       libbd_utils%{somajor} >= %{libbd_utils_version}
 Requires:       device-mapper
 Requires:       dmraid
-Provides:       libblockdev-dm = %{version}
 
 %description -n libbd_dm%{somajor}
 The LibBlockDev library plugin (and in the same time a standalone library)
@@ -205,7 +197,6 @@ Requires:       device-mapper-devel
 Requires:       systemd-devel
 Requires:       dmraid-devel
 Requires:       libbd_utils-devel
-Provides:       libblockdev-dm-devel = %{version}
 
 %description -n libbd_dm-devel
 This package contains header files and pkg-config files needed for development
@@ -216,7 +207,6 @@ Summary:        The FS plugin for the LibBlockDev library
 Group:          System/Libraries
 Requires:       libbd_utils%{somajor} >= %{libbd_utils_version}
 Requires:       device-mapper
-Provides:       libblockdev-fs = %{version}
 
 %description -n libbd_fs%{somajor}
 The LibBlockDev library plugin (and in the same time a standalone library)
@@ -230,7 +220,6 @@ Requires:       libbd_utils-devel
 Requires:       glib2-devel
 Requires:       xfsprogs
 Requires:       dosfstools
-Provides:       libblockdev-fs-devel = %{version}
 
 %description -n libbd_fs-devel
 This package contains header files and pkg-config files needed for development
@@ -241,7 +230,6 @@ Summary:        The KBD plugin for the LibBlockDev library
 Group:          System/Libraries
 Requires:       libbd_utils%{somajor} >= %{libbd_utils_version}
 Requires:       bcache-tools >= %{bcachetools_version}
-Provides:       libblockdev-kbd = %{version}
 
 %description -n libbd_kbd%{somajor}
 The LibBlockDev library plugin (and in the same time a standalone library)
@@ -254,7 +242,6 @@ Group:          Development/Libraries/C and C++
 Requires:       libbd_kbd%{somajor} = %{version}
 Requires:       libbd_utils-devel = %{version}
 Requires:       glib2-devel
-Provides:       libblockdev-kbd-devel = %{version}
 
 %description -n libbd_kbd-devel
 This package contains header files and pkg-config files needed for development
@@ -264,7 +251,6 @@ with the libbd_kbd plugin/library..
 Summary:        The loop plugin for the LibBlockDev library
 Group:          System/Libraries
 Requires:       libbd_utils%{somajor} >= %{libbd_utils_version}
-Provides:       libblockdev-loop = %{version}
 
 %description -n libbd_loop%{somajor}
 The LibBlockDev library plugin (and in the same time a standalone library)
@@ -276,7 +262,6 @@ Group:          Development/Libraries/C and C++
 Requires:       libbd_loop%{somajor} = %{version}
 Requires:       libbd_utils-devel
 Requires:       glib2-devel
-Provides:       libblockdev-loop-devel = %{version}
 
 %description -n libbd_loop-devel
 This package contains header files and pkg-config files needed for development
@@ -288,7 +273,6 @@ Group:          System/Libraries
 Requires:       libbd_utils%{somajor} >= %{libbd_utils_version}
 Requires:       lvm2
 Requires:       device-mapper
-Provides:       libblockdev-lvm = %{version}
 
 %description -n libbd_lvm%{somajor}
 The LibBlockDev library plugin (and in the same time a standalone library)
@@ -300,7 +284,6 @@ Group:          Development/Libraries/C and C++
 Requires:       libbd_lvm%{somajor} = %{version}
 Requires:       libbd_utils-devel
 Requires:       glib2-devel
-Provides:       libblockdev-lvm-devel = %{version}
 
 %description -n libbd_lvm-devel
 This package contains header files and pkg-config files needed for development
@@ -335,7 +318,6 @@ Summary:        The MD RAID plugin for the LibBlockDev library
 Group:          System/Libraries
 Requires:       libbd_utils%{somajor} >= %{libbd_utils_version}
 Requires:       mdadm
-Provides:       libblockdev-mdraid = %{version}
 
 %description -n libbd_mdraid%{somajor}
 The LibBlockDev library plugin (and in the same time a standalone library)
@@ -347,7 +329,6 @@ Group:          Development/Libraries/C and C++
 Requires:       libbd_mdraid%{somajor} = %{version}
 Requires:       libbd_utils-devel
 Requires:       glib2-devel
-Provides:       libblockdev-mdraid-devel = %{version}
 
 %description -n libbd_mdraid-devel
 This package contains header files and pkg-config files needed for development
@@ -358,7 +339,6 @@ Summary:        The multipath plugin for the LibBlockDev library
 Group:          System/Libraries
 Requires:       libbd_utils%{somajor} >= %{libbd_utils_version}
 Requires:       device-mapper
-Provides:       libblockdev-mpath = %{version}
 
 %description -n libbd_mpath%{somajor}
 The LibBlockDev library plugin (and in the same time a standalone library)
@@ -383,7 +363,6 @@ Requires:       libbd_utils%{somajor} >= %{libbd_utils_version}
 Requires:       device-mapper
 Requires:       gdisk
 Requires:       util-linux
-Provides:       libblockdev-part = %{version}
 
 %description -n libbd_part%{somajor}
 The LibBlockDev library plugin (and in the same time a standalone library)
@@ -395,7 +374,6 @@ Group:          Development/Libraries/C and C++
 Requires:       libbd_part%{somajor} = %{version}
 Requires:       libbd_utils-devel
 Requires:       glib2-devel
-Provides:       libblockdev-part-devel = %{version}
 
 %description -n libbd_part-devel
 This package contains header files and pkg-config files needed for development
@@ -406,7 +384,6 @@ Summary:        The swap plugin for the LibBlockDev library
 Group:          System/Libraries
 Requires:       libbd_utils%{somajor} >= %{libbd_utils_version}
 Requires:       util-linux
-Provides:       libblockdev-swap = %{version}
 
 %description -n libbd_swap%{somajor}
 The LibBlockDev library plugin (and in the same time a standalone library)
@@ -418,21 +395,17 @@ Group:          Development/Libraries/C and C++
 Requires:       libbd_swap%{somajor} = %{version}
 Requires:       libbd_utils-devel
 Requires:       glib2-devel
-Provides:       libblockdev-swap-devel = %{version}
 
 %description -n libbd_swap-devel
 This package contains header files and pkg-config files needed for development
 with the libbd_swap plugin/library..
 
-%ifarch s390 s390x
 %package -n libbd_s390%{somajor}
-BuildRequires:  s390utils-devel
 Summary:        The s390 plugin for the LibBlockDev library
 Group:          System/Libraries
 Requires:       s390utils
-Provides:       libblockdev-s390 = %{version}
 
-%description -n libbd_s390
+%description -n libbd_s390%{somajor}
 The LibBlockDev library plugin (and in the same time a standalone library)
 providing the functionality related to s390 devices.
 
@@ -443,12 +416,10 @@ Requires:       libbd_s390%{somajor} = %{version}
 Requires:       libbd_utils-devel
 Requires:       glib2-devel
 Requires:       s390utils-devel
-Provides:       libblockdev-s390-devel = %{version}
 
 %description -n libbd_s390-devel
 This package contains header files and pkg-config files needed for development
 with the libbd_s390 plugin/library.
-%endif
 
 %prep
 %setup -q
@@ -520,10 +491,8 @@ find %{buildroot} -name "*.la" -print -type f -delete
 %post -n libbd_swap%{somajor} -p /sbin/ldconfig
 %postun -n libbd_swap%{somajor} -p /sbin/ldconfig
 
-%ifarch s390 s390x
 %post -n libbd_s390%{somajor} -p /sbin/ldconfig
 %postun -n libbd_s390%{somajor} -p /sbin/ldconfig
-%endif
 
 %files -n %{libname}
 %defattr(-,root,root,-)