diff --git a/.gitignore b/.gitignore index 13aed94fca..a3c8323e2a 100644 --- a/.gitignore +++ b/.gitignore @@ -76,7 +76,6 @@ tests/other.crt tests/other.csr tests/other.key vdsm-*.tar.gz -vdsm.spec vdsm/vdscli.py static/usr/share/man/man1/vdsm-tool.1 static/usr/share/man/man8/vdsmd.8 diff --git a/Makefile.am b/Makefile.am index aa4f9a3c4d..7c3fb7fe22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008-2020 Red Hat, Inc. +# Copyright 2008-2022 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -59,12 +59,10 @@ EXTRA_DIST = \ contrib/repostat \ pylintrc \ vdsm.spec \ - vdsm.spec.in \ tox.ini \ $(NULL) CLEANFILES = \ - vdsm.spec \ $(DIST_ARCHIVES) \ $(NULL) @@ -165,9 +163,6 @@ storage: clean-storage: python3 tests/storage/userstorage.py teardown -all-local: \ - vdsm.spec - clean-local: clean-build .PHONY: upgrade diff --git a/build-aux/pkg-version b/build-aux/pkg-version index 42be7c6e42..dde7c8c647 100755 --- a/build-aux/pkg-version +++ b/build-aux/pkg-version @@ -36,7 +36,7 @@ AWK_SPEC_VERSION=' PKG_VERSION=`cat VERSION 2> /dev/null || git describe --tags --match "v[0-9]*"` if [ -d .git ]; then - SPEC_VERSION=`awk "$AWK_SPEC_VERSION" vdsm.spec.in` + SPEC_VERSION=`awk "$AWK_SPEC_VERSION" vdsm.spec` if [ "$PKG_VERSION" != "$SPEC_VERSION" ] && [ "${PKG_VERSION#$SPEC_VERSION-}" = "$PKG_VERSION" ]; then # New version, not yet tagged. PKG_VERSION="$SPEC_VERSION" diff --git a/doc/development.md b/doc/development.md index d047df2f8e..a47e674154 100644 --- a/doc/development.md +++ b/doc/development.md @@ -83,9 +83,9 @@ For more information about testing see [/tests/README.md](/tests/README.md). Release process of Vdsm version `VERSION` consists of the following steps: -- Changing `Version:` field value in `vdsm.spec.in` to `VERSION`. +- Changing `Version:` field value in `vdsm.spec` to `VERSION`. -- Updating `%changelog` line in `vdsm.spec.in` to the current date, +- Updating `%changelog` line in `vdsm.spec` to the current date, the committer, and `VERSION`. - Committing these changes, with subject "New release: `VERSION`" and diff --git a/tests/check_distpkg.sh b/tests/check_distpkg.sh index c5bf820600..3ce668d500 100755 --- a/tests/check_distpkg.sh +++ b/tests/check_distpkg.sh @@ -20,7 +20,6 @@ for i in $(git ls-files \*.in); do for f in \ static/libexec/vdsm/vdsm-gencerts.sh \ static/usr/share/man/man1/vdsm-tool.1 \ - vdsm.spec \ ; do if test "$FILE" = "$f" ; then KEEP=1 diff --git a/vdsm.spec.in b/vdsm.spec similarity index 99% rename from vdsm.spec.in rename to vdsm.spec index 38cd92dbb1..64e405dfb9 100644 --- a/vdsm.spec.in +++ b/vdsm.spec @@ -53,7 +53,7 @@ # - generated using ./build-aux/make-dist script # - passed to rpmbuild as # --define="vdsm_release $(./build-aux/pkg-version --release)" -%{!?vdsm_release: %global vdsm_release @PACKAGE_RELEASE@} +%{!?vdsm_release: %global vdsm_release 1} Name: %{vdsm_name} Version: 4.50.2.2