build: improve rpm build

Improve libzbc RPM spec file to fix errors and warnings generated by
rpmlint. libzbc spec file is now not generated automatically through
"make rpm".

Signed-off-by: Damien Le Moal <[email protected]>

Author: damien-lemoal

Makefile.am

@@ -11,28 +11,23 @@ if BUILD_TEST
 SUBDIRS += test/programs
 endif
 
-EXTRA_DIST = autogen.sh
+EXTRA_DIST = autogen.sh COPYING.BSD COPYING.LESSER README.md
 
 if ENABLE_RPMBUILD
 rpmdir = $(abs_top_builddir)/rpmbuild
 
 EXTRA_DIST += libzbc.spec
 RPMARCH=`$(RPM) --eval %_target_cpu`
 
-spec: libzbc.spec.in
-	@echo "Generating rpm spec file..."
-	@echo "Version:        $(PACKAGE_VERSION)" > libzbc.spec
-	@cat libzbc.spec.in | grep -v '# ' >> libzbc.spec
-
-rpm: spec dist
+rpm: dist
 	@echo "Building RPM packages..."
 	@mkdir -p $(rpmdir)
-	$(RPMBUILD) -ta --clean -D "_topdir $(rpmdir)" libzbc-$(PACKAGE_VERSION).tar.gz
+	@mv libzbc-$(PACKAGE_VERSION).tar.gz v$(PACKAGE_VERSION).tar.gz
+	$(RPMBUILD) -ta --clean -D "_topdir $(rpmdir)" v$(PACKAGE_VERSION).tar.gz
 	@mv -f $(rpmdir)/RPMS/$(RPMARCH)/*.rpm $(abs_top_builddir)
 	@mv -f $(rpmdir)/SRPMS/*.rpm $(abs_top_builddir)
 	@rm -rf $(rpmdir)
-	@rm -f libzbc-$(PACKAGE_VERSION).tar.gz
-	@rm -f libzbc.spec
+	@rm -f v$(PACKAGE_VERSION).tar.gz
 else
 rpm:
 	@echo "To build RPM packages, install the rpm and rpm-build packages"

README.md

@@ -167,19 +167,27 @@ for the tests is thus not allowed.
 Each test outputs a log file in the `test/log` directory. These files can be
 consulted in case of a failed test to identify the reason for the test failure.
 
-## Building rpm packages
+## Building RPM packages
 
-The following command will build redistributable rpm packages.
+The *rpm* and *rpmbuild* utilities are necessary to build *libzbc* RPM
+packages. Once these utilities are installed, the RPM packages can be built
+using the following command.
 
 ```
+$ sh ./autogen.sh
+$ ./configure
 $ make rpm
 ```
 
-Three rpm packages are built: a binary package providing the library and
-executable tools, a development package providing *libzbc* header files and a
-source package. The source package can be used to build the binary and
-development rpm packages outside of *libzbc* source tree using the following
-command.
+Five RPM packages are built:
+* A binary package providing *libzbc* library, tools, documentation and
+  license files.
+* A source RPM package
+* A *debuginfo* RPM package and a *debugsource* RPM package
+* A development package providing the library header files
+
+The source RPM package can be used to build the binary and debug RPM packages
+outside of *libzbc* source tree using the following command.
 
 ```
 $ rpmbuild --rebuild libzbc-<version>.src.rpm

libzbc.spec.in libzbc.speclibzbc.spec.in renamed to libzbc.spec

@@ -2,39 +2,34 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 #
 # Copyright (c) 2020 Western Digital Corporation or its affiliates.
+Name:		libzbc
+Version:	5.9.0
+Release:	1%{?dist}
+Summary:	A library to control SCSI/ZBC and ATA/ZAC zoned devices
 
-Name:           libzbc
-Release:        1%{?dist}
-Summary:        A library to control zoned SCSI/ATA devices
-Group:		System Environment/Libraries
-License:        BSD and LGPLv3+
-URL:		https://github.com/westerndigitalcorporation/libzbc
-Source:         %{name}-%{version}.tar.gz
+License:	BSD and LGPLv3+
+URL:		https://github.com/westerndigitalcorporation/%{name}
+Source0:	https://github.com/westerndigitalcorporation/%{name}/archive/refs/tags/v%{version}.tar.gz
 
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
-BuildRequires:  gcc
+BuildRoot:	%{_topdir}/BUILDROOT/
+BuildRequires:	autoconf,autoconf-archive,automake,libtool
 
 %description
-libzbc is a simple library providing functions for manipulating SCSI and ATA
+libzbc is a library providing functions for manipulating SCSI and ATA
 devices supporting the Zoned Block Command (ZBC) and Zoned-device ATA command
 set (ZAC) specifications.
-libzbc implementation is compliant with the latest drafts of the ZBC and ZAC
-standards defined by INCITS technical committee T10 and T13 (respectively).
+libzbc implementation is compliant with the ZBC and ZAC v1 standards
+defined by INCITS technical committee T10 and T13 (respectively).
 
 %package devel
 Summary: Development header files for libzbc
-Group: Development/System
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 This package provides development header files for libzbc.
 
 %prep
-%setup
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
+%autosetup
 
 %build
 sh autogen.sh
@@ -45,17 +40,25 @@ sh autogen.sh
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT
+chmod -x $RPM_BUILD_ROOT%{_mandir}/man8/*.8
 
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
 %ldconfig_scriptlets
 
 %files
-%{_bindir}/*
 %{_libdir}/*
+%{_bindir}/*
+%{_mandir}/man8/*
 %exclude %{_libdir}/pkgconfig
 
 %files devel
 %{_includedir}/*
 %{_libdir}/pkgconfig
 
+%license COPYING.BSD COPYING.LESSER
+%doc README.md
+
+%changelog
+* Sat May 22 2021 Damien Le Moal <[email protected]> 5.9.0-1
+- Version 5.9.0 initial package