Skip to content

Commit afdd5f2

Browse files
authored
Merge pull request #21 from ekohl/provide-puppet-agent
Provide puppet-agent on RPM
2 parents 3767bc4 + 83d06f3 commit afdd5f2

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

configs/projects/openvox-agent.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@
8888
proj.license "See components"
8989
proj.vendor "Vox Pupuli <openvox@voxpupuli.org>"
9090
proj.homepage "https://voxpupuli.org"
91-
proj.target_repo "openvox8"
91+
92+
major = proj.get_version.split('.').first
93+
proj.target_repo "openvox#{major}"
9294

9395
if platform.is_solaris?
9496
proj.identifier "voxpupuli.org"
@@ -169,8 +171,13 @@
169171
end
170172

171173
# make sure we can replace puppet-agent in place for the rename
172-
proj.replaces 'puppet-agent'
174+
proj.replaces 'puppet-agent', "< #{major.to_i + 1}"
173175
proj.conflicts 'puppet-agent'
176+
if platform.is_rpm?
177+
proj.provides 'puppet-agent', "= #{major}"
178+
elsif platform.is_deb?
179+
proj.provides 'puppet-agent', "(= #{major})"
180+
end
174181

175182
proj.timeout 7200 if platform.is_windows?
176183
end

0 commit comments

Comments
 (0)