simp-rake-helpers 5.3.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd72175666f147fd150435496fed0093586b507af569c4682afa713f12fb251f
-  data.tar.gz: 21b5c168ec65c56a9081d3b5a53d80f53fe96ec9b8e48b988c47f025d8476f29
+  metadata.gz: 939e5af4addd43fd7426e30482fa751d4998d8f537d63174dcb9a8ab5130b6a0
+  data.tar.gz: c923022ca6e164757b00a8d87a02648277fbe4c50c912520f09211420d35ccad
 SHA512:
-  metadata.gz: 50fc2bed131761ed25041f17ed4455bfe270d96d9c9e42e456ebf3ad870cf2cdb9c936af6ece47cbb98aea65d7ee9bc12429eab9e40f9c4017bcd396564ee68b
-  data.tar.gz: 08206ff2084e66f5544751d3bc6f9430437c6b2fee09d3df4665878d1c7dd97b847e075dc86eabe30f02189d0549b9acadab6bdede251c0996af4f4f46fdfdef
+  metadata.gz: 36fa3a75405f59e9ea37e133ab6bdc4810d68382d51332a6495e8155dba3f3aedb2109fb1431e5bab78656fd28d9cca10e079ba3f66e15f685702e594ca19ff3
+  data.tar.gz: 1f3db5d207c48657ba5dc46a17d8a4b1225d671df47c8ba9e2d426cfd192bb2537fc52914c31ae2f2168247bd4852c3e2e25bc4f35125b9368812918ffb6149b

data/.gitignore

@@ -1,4 +1,10 @@
-*.sw[pnoqst]
-Gemfile.lock
+.bundle/
 dist/
+*.gem
+Gemfile.lock
 /log/
+*.old
+/spec/fixtures
+*.swp
+*.sw[pnoqst]
+.vagrant

data/.travis.yml

@@ -1,42 +1,59 @@
+---
 language: ruby
-sudo: required
-dist: trusty
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y rpm
-  - rm Gemfile.lock || true
-bundler_args: "--without development --path .vendor"
+cache: bundler
+sudo: false
+
+bundler_args: --without development system_tests
+
 notifications:
   email: false
-rvm:
-  - 2.1.9
-  - 2.3.3
-  - 2.4.1
-script:
-  - 'bundle exec rake spec'
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: 2.3.3
-    - rvm: 2.4.1
-before_deploy:
-  - 'bundle exec rake clobber'
-  - "export GEM_VERSION=`ruby -r ./lib/simp/rake/helpers/version.rb -e 'puts Simp::Rake::Helpers::VERSION'`"
-  - '[[ $TRAVIS_TAG =~ ^${GEM_VERSION}$ ]]'
-deploy:
-  - provider: rubygems
-    gemspec: simp-rake-helpers.gemspec
-    gem: simp-rake-helpers
-    api_key:
-      secure: "aoPmOZ3WgjNJ56UXmamKxaRv37iUaxKekAeS8n2fPk78X/nU2qGjdDHFH+SBrfl33PyzsGnS3WAANMKaIkAgssvKoaII/sAC+Sl6q1eyVUprZqloXrG+cHlnHY4GnziWEH3JrkHDChW0xoJq7hhpj7qTRKrEIp6nA25MjozjveoL+HH4kKy/ACJhiEdsYTFaDLYYFY50gGUL9KjIkwN6g9d+dIzG9JqcYoDbneQlO6/23yr4GiAHQ8HM1j5tUoBqJad+CWjWhSY7pbfYBy2ziwVhFy1qoOS4/bhlasRCsLTtz0AjjR0YWOhJap1vJqYhrSxtvhmVuzScmDkueAem/PfWS3XCQvbmjdmFMzPOxo0aRRJMlaeVWRsZ/aVFC7ngpRzokq1duZEKI47xZC27vJSOp3RZMmYl/7GsykoYkqHHsTvzSALEQiVtQq8sIOtN0JOTFI8H4LSMirXuqGq+SgCJiAQ3mQzSgh50TXiZaA2UPPcQaw4AzY36BRKs1cgw3cEWuL38O2cWUTAzEE4SUh499wrU5x+N0PsYL0AvMFONsRaq5epOYrlIL9UPSL/qZRLmzpcEWZRfOX4Ni5N6Aa9ZR8juenR6UmE79S2dupBxQeinkdfXuWznUZH7BcnUDoz8rErABpJGHNVY60dUO/s055WCr7Y95Gi+H75X9/I="
-    on:
-      tags: true
+
+addons:
+  apt:
+    packages:
+      - rpm
+      # provides unbuffer
+      - expect-dev
+
+before_install:
+  - rm -f Gemfile.lock
+
+jobs:
+  include:
+    - stage: spec
+      rvm: 2.1.9
+      script:
+        - bundle exec rake spec
+
+    - stage: acceptance
+      sudo: required
       rvm: 2.1.9
-      condition: '($SKIP_PUBLISH != true)'
-  - provider: releases
-    api_key:
-      secure: "QKvAL4yAk8u9prJT6dFzKvszJfoo5/R9jIJ/WEUwdH17jij9Q/XhNrUzJZnrdVtqq4yCK6UqGqkRMMn2YLOKthoJycLEXzH+ZeCxBwzyN6uQkLmK5Mx43H+NNCsRkYTmcOdi4wJraWaWVq7XBxz6XdNRUkV99WyIh93wVnTwZuJxvF9koDFq+lRR4qRPh5Xn8HjKEZNPY7QHaecqsyWjgdEILWaQk/32IU20dLCT7U3jDdSuk92p24gWlkvTJ/gP+IYKWEPhgMMpx+WAtGGC+djMyZUrkaKEa/ennkOcFgqJ6UtDEInEtTBFWScGL70dwHORbEVExp9AKcLP3TmMyQ/36ybu7yrgcp6L995tM4Huez3GBM6NJ8xl/hYG3D1QwwoXGnWfUjQW2we7h8gcvl2yUSx59pb2V5QW3nCbD8rAiF/kpAcgwWyBT3iLpMer2j0Ux05NCBGqsltl9J944M+pLtO+YKldUw7uGDWMQQzq8/2m5+MoE4fvTgnaJ0rv0eRLWfNH2RQ565mE95nyJC/wXz/XB2v/KKHrf8FQZRIavH4Nuo4E2+tU8u2APU/n+gP8iQrtd86Nlo5RrBTu+NoDPDrM5OBnVYTT/AUAEUggXTPgZsqwZrSDSBEt0VbExnwQ5QMGIB9ZX+ZunrEZ6NeH8hV5hm67WYZ+qRFOPvI="
-    on:
-      tags: true
+      services:
+        - docker
+      script:
+        - bundle exec rake acceptance
+
+    - stage: deploy
       rvm: 2.1.9
-      condition: '($SKIP_PUBLISH != true)'
+      script:
+        - true
+      before_deploy:
+        - "export GEM_VERSION=`ruby -r ./lib/simp/rake/helpers/version.rb -e 'puts Simp::Rake::Helpers::VERSION'`"
+        - '[[ $TRAVIS_TAG =~ ^${GEM_VERSION}$ ]]'
+      deploy:
+        - provider: rubygems
+          gemspec: simp-rake-helpers.gemspec
+          gem: simp-rake-helpers
+          api_key:
+            secure: "aoPmOZ3WgjNJ56UXmamKxaRv37iUaxKekAeS8n2fPk78X/nU2qGjdDHFH+SBrfl33PyzsGnS3WAANMKaIkAgssvKoaII/sAC+Sl6q1eyVUprZqloXrG+cHlnHY4GnziWEH3JrkHDChW0xoJq7hhpj7qTRKrEIp6nA25MjozjveoL+HH4kKy/ACJhiEdsYTFaDLYYFY50gGUL9KjIkwN6g9d+dIzG9JqcYoDbneQlO6/23yr4GiAHQ8HM1j5tUoBqJad+CWjWhSY7pbfYBy2ziwVhFy1qoOS4/bhlasRCsLTtz0AjjR0YWOhJap1vJqYhrSxtvhmVuzScmDkueAem/PfWS3XCQvbmjdmFMzPOxo0aRRJMlaeVWRsZ/aVFC7ngpRzokq1duZEKI47xZC27vJSOp3RZMmYl/7GsykoYkqHHsTvzSALEQiVtQq8sIOtN0JOTFI8H4LSMirXuqGq+SgCJiAQ3mQzSgh50TXiZaA2UPPcQaw4AzY36BRKs1cgw3cEWuL38O2cWUTAzEE4SUh499wrU5x+N0PsYL0AvMFONsRaq5epOYrlIL9UPSL/qZRLmzpcEWZRfOX4Ni5N6Aa9ZR8juenR6UmE79S2dupBxQeinkdfXuWznUZH7BcnUDoz8rErABpJGHNVY60dUO/s055WCr7Y95Gi+H75X9/I="
+          on:
+            tags: true
+            rvm: 2.1.9
+            condition: '($SKIP_PUBLISH != true)'
+        - provider: releases
+          api_key:
+            secure: "QKvAL4yAk8u9prJT6dFzKvszJfoo5/R9jIJ/WEUwdH17jij9Q/XhNrUzJZnrdVtqq4yCK6UqGqkRMMn2YLOKthoJycLEXzH+ZeCxBwzyN6uQkLmK5Mx43H+NNCsRkYTmcOdi4wJraWaWVq7XBxz6XdNRUkV99WyIh93wVnTwZuJxvF9koDFq+lRR4qRPh5Xn8HjKEZNPY7QHaecqsyWjgdEILWaQk/32IU20dLCT7U3jDdSuk92p24gWlkvTJ/gP+IYKWEPhgMMpx+WAtGGC+djMyZUrkaKEa/ennkOcFgqJ6UtDEInEtTBFWScGL70dwHORbEVExp9AKcLP3TmMyQ/36ybu7yrgcp6L995tM4Huez3GBM6NJ8xl/hYG3D1QwwoXGnWfUjQW2we7h8gcvl2yUSx59pb2V5QW3nCbD8rAiF/kpAcgwWyBT3iLpMer2j0Ux05NCBGqsltl9J944M+pLtO+YKldUw7uGDWMQQzq8/2m5+MoE4fvTgnaJ0rv0eRLWfNH2RQ565mE95nyJC/wXz/XB2v/KKHrf8FQZRIavH4Nuo4E2+tU8u2APU/n+gP8iQrtd86Nlo5RrBTu+NoDPDrM5OBnVYTT/AUAEUggXTPgZsqwZrSDSBEt0VbExnwQ5QMGIB9ZX+ZunrEZ6NeH8hV5hm67WYZ+qRFOPvI="
+          on:
+            tags: true
+            rvm: 2.1.9
+            condition: '($SKIP_PUBLISH != true)'

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+### 5.4.1 / 2018-03-04
+* Fix Travis CI deployment script
+
+### 5.4.0 / 2018-02-12
+* Add support for RPM customization (e.g., scriptlets, triggers)
+  - Scans new location `build/rpm_metadata/custom/` to find new content to
+    inject into the RPM spec (e.g., scriptlets, triggers).
+  - There is logic to permit overriding the `%pre`/`%post`/`%preun`/`%postun`
+    default scriptlets.
+* Enable `%triggerpostun` fix for SIMP-3895
+  - The custom scriptlet feature provides a means for module RPMs that obsolete
+    the same module name to introduce a `%triggerpostun -- <obsoleted-package>`
+    scriptlet as a workaround to prevent `simp_rpm_helpers` from deleting
+    everything.
+  - The acceptance tests specifically demonstrate this type of trigger
+* Improve RPM build troubleshooting:
+  - New env var: `SIMP_RPM_verbose=yes`
+  - New env var: `SIMP_RAKE_PKG_verbose=yes`
+* Improve `simpdefault.spec` RPM Lua code troubleshooting:
+  - Cleaned up header documentation
+  - Added optional stderr warnings
+  - Refactored (some) code into functions
+  - Improved error messages
+* Improve acceptance test / development workflow
+  - Add `Vagrantfile` to provide a quick & pristine beaker/docker setup
+* Refactor acceptance test structure
+  - Code formerly embedded in the `pkg_rpm` tests have been refactored into
+    common helpers that other tests can use.
+  - There are mock prereq RPMs to test installation of newly-built RPMs
+  - A `simp_rpm_helper` (a copy of the script in simp-adapter) for scenarios
+* Update README.md
+  - Removed obsolete references to `mock`-based development
+  - Clarified RPM Generation documentation
+
+### 5.3.1 / 2018-02-18
+* Add a conditional check so simp-core can build an ISO with a
+  pre-existing tarball with no user input
+
 ### 5.3.0 / 2018-02-02
 * Add ability to specify external, non-module, RPM dependencies for
   a checked-out repo from `simp-core/build/rpm/dependencies.yaml`
@@ -10,13 +48,13 @@
   - Provides more extensive validation of date strings and changelog
     entry ordering.
   - Stops processing at the first invalid changelog entry, to minimize
-    non-catestrophic errors from old changelog entries.
+    non-catastrophic errors from old changelog entries.
 * Create pkg:compare_latest_tag, which is a more general replacement
   for the Simp::Rake::Pupmod::Helpers compare_latest_tag task.
   - Now supports non-Puppet SIMP assets for which version and changelog
     information is specified in an RPM spec files.
   - Does the same validation as the new pkg:create_tag_changelog task.
-* Fix broken acceptance tests 
+* Fix broken acceptance tests
   - Remove logic to build SIMP 4 and SIMP 5 RPMs.
   - Remove mock logic
 

data/Gemfile

@@ -12,6 +12,7 @@ gemspec
 gem 'ruby-progressbar'
 gem 'simp-build-helpers'
 gem 'simp-beaker-helpers'
+gem 'beaker-puppet_install_helper'
 
 if puppetversion
   gem 'puppet', puppetversion

data/README.md

@@ -7,36 +7,30 @@
 
 #### Table of Contents
 
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-
-- [Overview](#overview)
-  - [This gem is part of SIMP](#this-gem-is-part-of-simp)
-  - [Features](#features)
-- [Setup](#setup)
-  - [Gemfile](#gemfile)
-- [Usage](#usage)
-  - [In a Puppet module](#in-a-puppet-module)
-  - [In a Ruby Gem](#in-a-ruby-gem)
-  - [RPM Generation](#rpm-generation)
-    - [RPM Changelog](#rpm-changelog)
-    - [RPM Dependencies](#rpm-dependencies)
-- [Reference](#reference)
-  - [simp/rake/rpm](#simprakerpm)
-    - [rake pkg:rpm[chroot,unique,snapshot_release]](#rake-pkgrpmchrootuniquesnapshot_release)
-      - [Parameters](#parameters)
-    - [rake pkg:scrub[chroot,unique]](#rake-pkgscrubchrootunique)
-    - [rake pkg:srpm[chroot,unique,snapshot_release]](#rake-pkgsrpmchrootuniquesnapshot_release)
-      - [Parameters](#parameters-1)
-    - [rake pkg:tar[snapshot_release]](#rake-pkgtarsnapshot_release)
-      - [Parameters](#parameters-2)
-- [Limitations](#limitations)
-  - [FIPS Enabled Systems](#fips-enabled-systems)
-- [Development](#development)
-  - [License](#license)
-  - [History](#history)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+<!-- vim-markdown-toc GFM -->
+
+* [Overview](#overview)
+  * [This gem is part of SIMP](#this-gem-is-part-of-simp)
+  * [Features](#features)
+* [Setup](#setup)
+  * [Gemfile](#gemfile)
+* [Usage](#usage)
+  * [In a Puppet module](#in-a-puppet-module)
+  * [In a Ruby Gem](#in-a-ruby-gem)
+  * [Generating RPMs](#generating-rpms)
+    * [RPM Changelog](#rpm-changelog)
+    * [RPM Dependencies](#rpm-dependencies)
+* [Reference](#reference)
+  * [simp/rake/rpm](#simprakerpm)
+    * [`rake pkg:rpm`](#rake-pkgrpm)
+    * [`rake pkg:tar`](#rake-pkgtar)
+* [Limitations](#limitations)
+  * [Some versions of bundler fail on FIPS-enabled Systems](#some-versions-of-bundler-fail-on-fips-enabled-systems)
+* [Development](#development)
+  * [License](#license)
+  * [History](#history)
+
+<!-- vim-markdown-toc -->
 
 ## Overview
 
@@ -49,8 +43,8 @@ This gem is part of (the build tooling for) the [System Integrity Management Pla
 
 ### Features
 
-* Supports multithreaded mock operations
-* RPM packaging and signing
+* Customizable RPM packaging based on a Puppet module's [`metadata.json`][metadata.json]
+* RPM signing
 * Rubygem packaging
 
 ## Setup
@@ -124,87 +118,81 @@ To see the extra rake tasks:
 bunde exec rake -T
 ```
 
-### RPM Generation
+### Generating RPMs
 
-This Gem provides the ability to generate an RPM from *any* Puppet module.
+The task [`rake pkg:rpm`](#simprakerpm)) provides the ability to package an RPM
+from *any* Puppet module (regardless of whether it is a SIMP module or not).
+The only requirement is that the Puppet module MUST include a valid
+[`metadata.json`][metadata.json] file with entries for `name`,
+`version`, `license`, `summary`, and `source`.
 
-By default, the information for the RPM will be pulled from the Forge
-compatible [metadata.json](https://docs.puppet.com/puppet/latest/reference/modules_metadata.html).
+[metadata.json]: https://docs.puppet.com/puppet/latest/reference/modules_metadata.html
 
-The `name` and `version` fields *must* be present and well formatted. The
-`license` field is also used if present.
+The RPM package may be configured by other (optional) files under the project
+directory .  The full list of files considered are:
+
+```
+./
+├── metadata.json     # REQUIRED keys: name, version, license, summary, source
+├── CHANGELOG         # OPTIONAL written in RPM's CHANGELOG format
+└── build/            # OPTIONAL
+    └── rpm_metadata/ # OPTIONAL
+        ├── release   # OPTIONAL defines the RPM's "-0" release number
+        ├── requires  # OPTIONAL supplementary 'Requires','Provides','Obsoletes'
+        └── custom/   # OPTIONAL
+          └── *       # OPTIONAL custom snippets in RPM .spec format
+```
 
 *NOTE*: The dependencies in `metadata.json` are *not* used to generate RPM
 dependencies!
 
+
 #### RPM Changelog
 
-The Changelog is pulled from a file called `CHANGELOG` at the top level of the
-project. If this file does not start with a well formatted RPM changelog
-string, it will be ignored.
+The RPM Changelog will be derived from a `CHANGELOG` file at the top
+level of the project, if it exists.
+
+  * The file is expected to conform to the [RPM Changelog][RPM CHANGELOG]
+    format described in the Fedora packaging guidelines
+  * The file MUST start with a well-formatted RPM changelog string, or it will
+    be ignored.
+  * The format is *not* fully checked before attempting to build the RPM―the
+    RPM build will fail if the Changelog entries are not valid.
+
+[RPM CHANGELOG]: https://fedoraproject.org/wiki/Packaging:Guidelines#Changelogs
 
-The Changelog is *not* fully checked before attempting to build the RPM. Your
-RPM build will fail if the Changelog entries are not valid per the RPM
-specification.
 
 #### RPM Dependencies
 
 It is likely that you will want to declare your dependencies in your RPM. To do
-this, you can create a `build/rpm_metadata` directory at the root of your
-project. A file named `requires` in the `build/rpm_metadata` directory will be
+this, create a `build/rpm_metadata` directory at the root of the project.
+A `requires` file in the `build/rpm_metadata` directory will be
 used to declare the dependencies of the RPM. A file named `release` in the
 `build/rpm_metadata` directory will be used to declare the RPM release
 number.
 
 The following directives may be declared in the `requires` file:
-  * Provides
-  * Requires
-  * Obsoletes
+  * `Provides:`
+  * `Requires:`
+  * `Obsoletes:`
 
 ## Reference
 
 ### simp/rake/rpm
 
-#### rake pkg:rpm[chroot,unique,snapshot_release]
-Builds an RPM to package the current SIMP project.
-
-**NOTE**: Building RPMs requires a working Mock setup (http://fedoraproject.org/wiki/Projects/Mock)
-
-##### Parameters
-
-  * **:chroot** - The Mock chroot configuration to use. See the '--root' option in mock(1)."
-  * **:unique** - Whether or not to build the RPM in a unique Mock environment.  This can be very useful for parallel builds of all modules.
-* **:snapshot_release** - Add snapshot_release (date and time) to rpm version.  Rpm spec file must have macro for this to work.
-
-
-#### rake pkg:scrub[chroot,unique]
-
-Scrub the current SIMP project's mock build directory.
-
-
-#### rake pkg:srpm[chroot,unique,snapshot_release]
-Build the pupmod-simp-iptables SRPM.   Building RPMs requires a working Mock setup (http://fedoraproject.org/wiki/Projects/Mock)
-
-**NOTE**: Building RPMs requires a working Mock setup (http://fedoraproject.org/wiki/Projects/Mock)
-
-##### Parameters
-
-  * **:chroot** - The Mock chroot configuration to use. See the '--root' option in mock(1)."
-  * **:unique** - Whether or not to build the SRPM in a unique Mock environment.  This can be very useful for parallel builds of all modules.
-  * **:snapshot_release** - Add snapshot_release (date and time) to rpm version.  The RPM spec file must support macros for this to work.
+#### `rake pkg:rpm`
 
-#### rake pkg:tar[snapshot_release]
+Packages the current SIMP project as an RPM
 
-##### Parameters
+#### `rake pkg:tar`
 
-Build the pupmod-simp-iptables tar package
-  * :snapshot_release - Add snapshot_release (date and time) to rpm version, rpm spec file must have macro for this to work.
+Build the tar package for the current SIMP project
 
 ## Limitations
 
-### FIPS Enabled Systems
+### Some versions of bundler fail on FIPS-enabled Systems
 
-This is not a limitation of the module, but of Bundler.
+This is a limitation of Bundler, not the gem.
 
 If you are running on a FIPS-enabled system, you will need to use `bundler '~> 1.14.0'`
 until the FIPS support can be corrected.

data/lib/simp/rake/build/auto.rb

@@ -102,6 +102,7 @@ module Simp::Rake::Build
           - SIMP_BUILD_staging_dir    => Path to stage big build assets
                                          [Default: './SIMP_ISO_STAGING']
           - SIMP_BUILD_rm_staging_dir => 'no' do not forcibly remove the staging dir before starting
+          - SIMP_BUILD_overlay        => 'no' uses an existing DVD overlay if found 
           - SIMP_BUILD_force_dirty    => 'yes' tries to checks out subrepos even if dirty
           - SIMP_BUILD_docs           => 'yes' builds & includes documentation
           - SIMP_BUILD_checkout       => 'no' will skip the git repo checkouts
@@ -143,6 +144,7 @@ module Simp::Rake::Build
           prompt           = ENV.fetch('SIMP_BUILD_prompt', 'yes') != 'no'
           method           = ENV.fetch('SIMP_BUILD_puppetfile','tracking')
           do_rm_staging    = ENV.fetch('SIMP_BUILD_rm_staging_dir', 'yes') == 'yes'
+          build_overlay    = ENV.fetch('SIMP_BUILD_overlay', "yes") == 'yes'
           do_docs          = ENV['SIMP_BUILD_docs'] == 'yes' ? 'true' : 'false'
           do_merge         = ENV['SIMP_BUILD_unpack_merge'] != 'no'
           do_prune         = ENV['SIMP_BUILD_prune'] != 'no' ? 'true' : 'false'
@@ -212,6 +214,10 @@ module Simp::Rake::Build
                     puts("Invalid input: '#{resp}', please try again")
                   end
                 end
+              else
+                unless (build_overlay)
+                  tarball = tar_file
+                end
               end
             end
 

data/lib/simp/rake/build/pkg.rb

@@ -861,8 +861,8 @@ protect=1
                   $stderr.puts e if opts[:verbose]
                 end
               end
-            elsif opts[:verbose]
-              $stderr.puts '>>Issue creating YUM configuration. Packages will be locally generated.'
+            else
+              $stderr.puts '>>Issue creating YUM configuration. Packages will be locally generated.' if opts[:verbose]
 
               result = true
             end

data/lib/simp/rake/build/rpmdeps.rb

@@ -57,10 +57,13 @@ module Simp::Rake::Build::RpmDeps
 
       # We don't want to add this if we're building an older
       # version or the RPM will be malformed
-      if Gem::Version.new(module_version) >
-        Gem::Version.new(version.split('-').first)
+      main_version, release = version.split('-')
+      release = '0' unless release
+      release = release.to_i
 
-        rpm_metadata_content << "Obsoletes: #{pkg} >= #{version}"
+      if Gem::Version.new(module_version) > Gem::Version.new(main_version)
+        rpm_metadata_content << "Obsoletes: #{pkg} < #{main_version}-#{release}.obsolete"
+        rpm_metadata_content << "Provides: #{pkg} = #{main_version}-#{release}.obsolete"
       else
         puts "Ignoring 'obsoletes' for #{pkg}: module version" +
          " #{module_version} from metadata.json is not >" +