Skip to content

fpm: Don't set --rpm-rpmbuild-define#102

Merged
bastelfreak merged 1 commit into
mainfrom
fpm
May 29, 2026
Merged

fpm: Don't set --rpm-rpmbuild-define#102
bastelfreak merged 1 commit into
mainfrom
fpm

Conversation

@bastelfreak
Copy link
Copy Markdown
Contributor

under the hood, fpm calls rpmbuild. Under EL9, the fpm option --rpm-rpmbuild-define worked fine and was set to the version of the actual package. This was probably never correct. It maps to the rpm macro %rpmversion. This is supposed to be used for the rpm version used during the build. rpmbuild on EL10 will set %rpmversion automatically and fpm cannot provide it as well. We also set the actual version here:

shared_opts << "--version #{options.version}"

And this is around since the introduction of fpm in ba3315c.

Also Zhenech confirmed that we can remove --rpm-rpmbuild-define.

Pull Request (PR) description

This Pull Request (PR) fixes the following issues

under the hood, fpm calls rpmbuild. Under EL9, the fpm option
`--rpm-rpmbuild-define` worked fine and was set to the version of the
actual package. This was probably never correct. It maps to the rpm
macro `%rpmversion`. This is supposed to be used for the *rpm* version
used during the build. rpmbuild on EL10 will set `%rpmversion`
automatically and fpm cannot provide it as well. We also set the actual
version here:

```
shared_opts << "--version #{options.version}"
```

And this is around since the introduction of fpm in
ba3315c.

Also Zhenech confirmed that we can remove `--rpm-rpmbuild-define`.

Signed-off-by: Tim Meusel <tim@bastelfreak.de>
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 29, 2026

The rpm/deb packages and the JAR file for OpenVoxProject/ezbake are available in a zip archive:
https://github.com/OpenVoxProject/ezbake/actions/runs/26621526909/artifacts/7284411453

The rpm/deb packages and the JAR file for OpenVoxProject/ezbake are available in a zip archive:
https://github.com/OpenVoxProject/ezbake/actions/runs/26621526909/artifacts/7284476097

@bastelfreak
Copy link
Copy Markdown
Contributor Author

bastelfreak commented May 29, 2026

reference: our latest stable packages from yum.voxpupuli.org:

root@puppet ~ # dnf info openvox-server openvoxdb
Last metadata expiration check: 0:00:25 ago on Fr 29 Mai 2026 08:23:06 CEST.
Installed Packages
Name         : openvox-server
Version      : 8.13.0
Release      : 1.el9
Architecture : noarch
Size         : 80 M
Source       : openvox-server-8.13.0-1.el9.src.rpm
Repository   : @System
From repo    : openvox8
Summary      : Vox Pupuli puppetserver
URL          : http://github.com/openvoxproject
License      : Apache-2.0
Description  : Vox Pupuli puppetserver
             : Contains: OpenVox Server (org.openvoxproject/puppetserver 8.13.0,org.clojure/clojure 1.12.4,org.bouncycastle/bcpkix-jdk18on 1.84,org.openvoxproject/jruby-utils 5.3.8,org.openvoxproject/puppetserver
             : 8.13.0,org.openvoxproject/trapperkeeper-webserver-jetty10 1.1.8,org.openvoxproject/trapperkeeper-metrics 2.1.11)

Name         : openvoxdb
Version      : 8.13.0
Release      : 1.el9
Architecture : noarch
Size         : 67 M
Source       : openvoxdb-8.13.0-1.el9.src.rpm
Repository   : @System
From repo    : openvox8
Summary      : Vox Pupuli puppetdb
URL          : http://github.com/openvoxproject
License      : Apache-2.0
Description  : Vox Pupuli puppetdb
             : Contains: OpenVox-integrated catalog and fact storage (org.openvoxproject/puppetdb 8.13.0,org.bouncycastle/bcpkix-jdk18on 1.84,org.clojure/clojure 1.12.4,org.openvoxproject/puppetdb 8.13.0)

Name         : openvoxdb-termini
Version      : 8.13.0
Release      : 1.el9
Architecture : noarch
Size         : 75 k
Source       : openvoxdb-termini-8.13.0-1.el9.src.rpm
Repository   : @System
From repo    : openvox8
Summary      : Termini for puppetdb
URL          : http://github.com/openvoxproject
License      : Apache-2.0
Description  : Termini for puppetdb
             : Contains terminus for:puppetdb (version 8.13.0)
root@puppet ~ #

@bastelfreak
Copy link
Copy Markdown
Contributor Author

Updated openvoxdb / openvoxdb-termini:

root@puppet ~ # dnf info openvoxdb openvoxdb-termini
Last metadata expiration check: 0:01:10 ago on Fr 29 Mai 2026 08:29:04 CEST.
Installed Packages
Name         : openvoxdb
Version      : 9.0.0
Release      : 0.1SNAPSHOT.2026.05.29T0619.el9
Architecture : noarch
Size         : 70 M
Source       : openvoxdb-9.0.0-0.1SNAPSHOT.2026.05.29T0619.el9.src.rpm
Repository   : @System
From repo    : @commandline
Summary      : Vox Pupuli puppetdb
URL          : http://github.com/openvoxproject
License      : Apache-2.0
Description  : Vox Pupuli puppetdb
             : Contains: OpenVox-integrated catalog and fact storage (org.openvoxproject/puppetdb 9.0.0-SNAPSHOT,org.bouncycastle/bcpkix-jdk18on 1.84,org.clojure/clojure 1.12.5,org.openvoxproject/puppetdb
             : 9.0.0-SNAPSHOT)

Name         : openvoxdb-termini
Version      : 9.0.0
Release      : 0.1SNAPSHOT.2026.05.29T0619.el9
Architecture : noarch
Size         : 75 k
Source       : openvoxdb-termini-9.0.0-0.1SNAPSHOT.2026.05.29T0619.el9.src.rpm
Repository   : @System
From repo    : @commandline
Summary      : Termini for puppetdb
URL          : http://github.com/openvoxproject
License      : Apache-2.0
Description  : Termini for puppetdb
             : Contains terminus for:puppetdb (version 9.0.0-SNAPSHOT)

root@puppet ~ #

@bastelfreak
Copy link
Copy Markdown
Contributor Author

openvox-server:

root@puppet ~ # dnf info openvox-server
Last metadata expiration check: 0:00:15 ago on Fr 29 Mai 2026 08:51:06 CEST.
Installed Packages
Name         : openvox-server
Version      : 9.0.0
Release      : 0.1SNAPSHOT.2026.05.29T0623.el9
Architecture : noarch
Size         : 79 M
Source       : openvox-server-9.0.0-0.1SNAPSHOT.2026.05.29T0623.el9.src.rpm
Repository   : @System
From repo    : @commandline
Summary      : Vox Pupuli puppetserver
URL          : http://github.com/openvoxproject
License      : Apache-2.0
Description  : Vox Pupuli puppetserver
             : Contains: OpenVox Server (org.openvoxproject/puppetserver 9.0.0-SNAPSHOT,org.clojure/clojure 1.12.5,org.bouncycastle/bcpkix-jdk18on 1.84,org.openvoxproject/jruby-utils
             : 5.4.0,org.openvoxproject/puppetserver 9.0.0-SNAPSHOT,org.openvoxproject/trapperkeeper-webserver 12.0.2,org.openvoxproject/trapperkeeper-metrics 2.3.0)

root@puppet ~ #

@bastelfreak bastelfreak enabled auto-merge May 29, 2026 06:56
@bastelfreak bastelfreak disabled auto-merge May 29, 2026 07:24
@bastelfreak bastelfreak merged commit c0c0e50 into main May 29, 2026
13 checks passed
@bastelfreak bastelfreak deleted the fpm branch May 29, 2026 07:24
@bastelfreak bastelfreak added the bug Something isn't working label May 29, 2026
bastelfreak added a commit to OpenVoxProject/openvox-server that referenced this pull request May 29, 2026
This contains a fixed fpm call, which is required for building on EL10
hosts:

OpenVoxProject/ezbake#102

Signed-off-by: Tim Meusel <tim@bastelfreak.de>
bastelfreak added a commit to OpenVoxProject/openvox-server that referenced this pull request May 29, 2026
This contains a fixed fpm call, which is required for building on EL10
hosts:

OpenVoxProject/ezbake#102

Signed-off-by: Tim Meusel <tim@bastelfreak.de>
bastelfreak added a commit to OpenVoxProject/openvox-server that referenced this pull request May 29, 2026
This contains a fixed fpm call, which is required for building on EL10
hosts:

OpenVoxProject/ezbake#102

Signed-off-by: Tim Meusel <tim@bastelfreak.de>
bastelfreak added a commit to OpenVoxProject/openvox-server that referenced this pull request May 29, 2026
This contains a fixed fpm call, which is required for building on EL10
hosts:

OpenVoxProject/ezbake#102

Signed-off-by: Tim Meusel <tim@bastelfreak.de>
bastelfreak added a commit to OpenVoxProject/openvox-server that referenced this pull request May 29, 2026
This contains a fixed fpm call, which is required for building on EL10
hosts:

OpenVoxProject/ezbake#102

Signed-off-by: Tim Meusel <tim@bastelfreak.de>
bastelfreak added a commit to OpenVoxProject/openvox-server that referenced this pull request May 29, 2026
This contains a fixed fpm call, which is required for building on EL10
hosts:

OpenVoxProject/ezbake#102

Signed-off-by: Tim Meusel <tim@bastelfreak.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants