Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spec: Use vdsm.spec directly rather than generating it #296

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

spec: Use vdsm.spec directly rather than generating it #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -59,12 +59,10 @@ EXTRA_DIST = \
contrib/repostat \
pylintrc \
vdsm.spec \
vdsm.spec.in \
tox.ini \
$(NULL)

CLEANFILES = \
vdsm.spec \
$(DIST_ARCHIVES) \
$(NULL)

Expand Down Expand Up @@ -165,9 +163,6 @@ storage:
clean-storage:
python3 tests/storage/userstorage.py teardown

all-local: \
vdsm.spec

clean-local: clean-build

.PHONY: upgrade
Expand Down
2 changes: 1 addition & 1 deletion build-aux/pkg-version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions doc/development.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/check_distpkg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vdsm.spec.in → vdsm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down