ndctl: rework release collateral

Prompted by a request to have the spec file reference the github tarball
URL, rework spec file generation:

1/ Use noinst_SCRIPTS to do the token replacements in ndctl.spec.in
using sed, kill contrib/genspec and kill the %lname and %dname variables

2/ Use the LIBNDCTL_CURRENT variable to name the sles library package

3/ Unify the git snapshot naming with github archive naming.  Split git-version
off from git-version-gen as a helper for make-git-snapshot.sh.

4/ Specify --disable-silent-rules to configure

Reported-by: Ralf Corsepius <[email protected]>
Signed-off-by: Dan Williams <[email protected]>

Author: djbw

Documentation/Makefile.am

@@ -8,6 +8,8 @@ man1_MANS = \
 	ndctl-create-namespace.1 \
 	ndctl-list.1
 
+CLEANFILES = $(man1_MANS)
+
 XML_DEPS = \
 	$(top_srcdir)/version.m4 \
 	Makefile \

Makefile.am

@@ -49,6 +49,23 @@ LIBNDCTL_CURRENT=6
 LIBNDCTL_REVISION=0
 LIBNDCTL_AGE=0
 
+noinst_SCRIPTS = rhel/ndctl.spec sles/ndctl.spec
+CLEANFILES += $(noinst_SCRIPTS)
+
+do_rhel_subst = sed -e 's,VERSION,$(VERSION),g' \
+            -e 's,DNAME,ndctl-devel,g' \
+            -e 's,LNAME,libndctl,g'
+
+do_sles_subst = sed -e 's,VERSION,$(VERSION),g' \
+            -e 's,DNAME,libndctl-devel,g' \
+            -e 's,LNAME,libndctl$(LIBNDCTL_CURRENT),g'
+
+rhel/ndctl.spec: ndctl.spec.in Makefile.am
+	$(AM_V_GEN)$(MKDIR_P) rhel; $(do_rhel_subst) < $< > $@
+
+sles/ndctl.spec: ndctl.spec.in Makefile.am
+	$(AM_V_GEN)$(MKDIR_P) sles; cat sles/header $< | $(do_sles_subst) > $@
+
 pkginclude_HEADERS = lib/ndctl/libndctl.h
 lib_LTLIBRARIES = lib/libndctl.la
 

contrib/Makefile

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+dirty() {
+	git update-index -q --refresh
+	if test -z "$(git diff-index --name-only HEAD --)"; then
+		echo "$1"
+	else
+		echo "${1}.dirty"
+	fi
+}
+
+DEF_VER=v50
+
+LF='
+'
+
+# First see if there is a version file (included in release tarballs),
+# then try git-describe, then default.
+if test -f version; then
+	VN=$(cat version) || VN="$DEF_VER"
+elif test -d ${GIT_DIR:-.git} -o -f .git &&
+	VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) &&
+	case "$VN" in
+	*$LF*) (exit 1) ;;
+	v[0-9]*)
+		VN="$(dirty $VN)"
+	esac; then
+	VN=$(echo "$VN" | sed -e 's/-/./g');
+else
+	read COMMIT COMMIT_SUBJECT <<EOF
+	$(git log --oneline --abbrev=8 -n1 HEAD)
+EOF
+	VN="$(dirty ${DEF_VER}.git$COMMIT)"
+fi
+
+#drop leading 'v' out of the version so its a pure number
+if [ ${VN:0:1} = v ]; then
+	VN=${VN:1}
+fi
+
+echo $VN

contrib/genspec.c

@@ -1,45 +1,16 @@
 #!/bin/sh
 
-dirty() {
-	git update-index -q --refresh
-	if test -z "$(git diff-index --name-only HEAD --)"; then
-		echo "$1"
-	else
-		echo "${1}.dirty"
-	fi
-}
-
 GVF=version.m4
-DEF_VER=v50
-
-LF='
-'
-
-# First see if there is a version file (included in release tarballs),
-# then try git-describe, then default.
-if test -f version; then
-	VN=$(cat version) || VN="$DEF_VER"
-elif test -d ${GIT_DIR:-.git} -o -f .git &&
-	VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) &&
-	case "$VN" in
-	*$LF*) (exit 1) ;;
-	v[0-9]*)
-		VN="$(dirty $VN)"
-	esac; then
-	VN=$(echo "$VN" | sed -e 's/-/./g');
-else
-	read COMMIT COMMIT_SUBJECT <<EOF
-	$(git log --oneline --abbrev=8 -n1 HEAD)
-EOF
-	VN="$(dirty ${DEF_VER}.git$COMMIT)"
-fi
 
 if test -r $GVF; then
 	VC=$(sed -e 's/m4_define(\[GIT_VERSION], \[//' <$GVF)
 		VC=$(echo $VC | sed -e 's/\])//')
 else
 	VC=unset
 fi
+
+VN=$(./git-version)
+
 test "$VN" = "$VC" || {
 	echo >&2 "GIT_VERSION = $VN"
 	echo "m4_define([GIT_VERSION], [$VN])" >$GVF

contrib/rpmbuild.sh

@@ -14,16 +14,8 @@ trap 'rm -rf $WORKDIR' exit
 [ -d "$REFDIR" ] && REFERENCE="--reference $REFDIR"
 git clone $REFERENCE "$UPSTREAM" "$WORKDIR"
 
-pushd "$WORKDIR" > /dev/null
-git branch to-archive $HEAD
-read COMMIT_SHORTID COMMIT_TITLE <<EOGIT
-$(git log to-archive^..to-archive --pretty='format:%h %s')
-EOGIT
-popd > /dev/null
+VERSION=$(./git-version)
+DIRNAME="ndctl-${VERSION}"
+git archive --remote="$WORKDIR" --format=tar --prefix="$DIRNAME/" HEAD | gzip > $OUTDIR/"v${VERSION}.tar.gz"
 
-echo "Making git snapshot using commit: $COMMIT_SHORTID $COMMIT_TITLE"
-
-DIRNAME="$NAME-git$COMMIT_SHORTID"
-git archive --remote="$WORKDIR" --format=tar --prefix="$DIRNAME/" to-archive | xz -9 > $OUTDIR/"$DIRNAME.tar.xz"
-
-echo "Written $OUTDIR/$DIRNAME.tar.xz"
+echo "Written $OUTDIR/v${VERSION}.tar.gz"

git-version

@@ -1,16 +1,11 @@
-%global gitcommit
-%define lname
-%define dname
-
 Name:           ndctl
-Version:
+Version:	VERSION
 Release:        1%{?dist}
 Summary:	Manage "libnvdimm" subsystem devices (Non-volatile Memory)
 License:        GPLv2
 Group:          Hardware/Other
 Url:            https://github.com/pmem/ndctl
-# Snapshot tarball can be created using: ./make-git-shapshot.sh [gitcommit]
-Source0:        %{name}-git%{gitcommit}.tar.xz
+Source0:        https://github.com/pmem/ndctl/archive/v%{version}.tar.gz
 
 BuildRequires:  autoconf
 BuildRequires:  asciidoc
@@ -26,36 +21,36 @@ BuildRequires:  pkgconfig(json-c)
 %description
 Utility library for managing the "libnvdimm" subsystem.  The "libnvdimm"
 subsystem defines a kernel device model and control message interface for
-platform NVDIMM resources like those defined by the ACPI 6.0 NFIT (NVDIMM
+platform NVDIMM resources like those defined by the ACPI 6+ NFIT (NVDIMM
 Firmware Interface Table).
 
 
-%package -n %dname
+%package -n DNAME
 Summary:        Development files for libndctl
 License:        LGPLv2
 Group:          Development/Libraries/Other
-Requires:       %{lname}%{?_isa} = %{version}-%{release}
+Requires:       LNAME%{?_isa} = %{version}-%{release}
 
-%description -n %dname
+%description -n DNAME
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 
-%package -n %lname
+%package -n LNAME
 Summary:        Management library for "libnvdimm" subsystem devices (Non-volatile Memory)
 License:        LGPLv2
 Group:          System/Libraries
 
-%description -n %lname
+%description -n LNAME
 Libraries for %{name}.
 
 %prep
-%setup -q %{?gitcommit:-n %{name}-git%{gitcommit}}
+%setup -q v%{version}
 
 %build
-echo "" > version
+echo "VERSION" > version
 ./autogen.sh
-%configure --disable-static --enable-local
+%configure --disable-static --enable-local --disable-silent-rules
 make %{?_smp_mflags}
 
 %install
@@ -65,23 +60,23 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %check
 make check
 
-%post -n %lname -p /sbin/ldconfig
+%post -n LNAME -p /sbin/ldconfig
 
-%postun -n %lname -p /sbin/ldconfig
+%postun -n LNAME -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %license licenses/GPLv2 licenses/BSD-MIT licenses/CC0
 %{_bindir}/ndctl
 %{_mandir}/man1/*
 
-%files -n %lname
+%files -n LNAME
 %defattr(-,root,root)
 %doc README.md
 %license COPYING licenses/BSD-MIT licenses/CC0
 %{_libdir}/libndctl.so.*
 
-%files -n %dname
+%files -n DNAME
 %defattr(-,root,root)
 %license COPYING
 %{_includedir}/ndctl/

git-version-gen

@@ -0,0 +1,5 @@
+#!/bin/bash
+pushd $(dirname $0) >/dev/null
+./make-git-snapshot.sh
+popd > /dev/null
+rpmbuild -ba $(dirname $0)/rhel/ndctl.spec