From 6eeeef6c0145d93d5f77515d1f946b84dd94dcb11cf0e3c7b7aaa3474e2f59b4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 23 Feb 2019 06:47:45 +0000 Subject: [PATCH] Accepting request 671875 from home:jengelh:branches:devel:languages:ruby - Use less strict PreReq replacements. OBS-URL: https://build.opensuse.org/request/show/671875 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/rubygem-gem2rpm?expand=0&rev=34 --- rubygem-gem2rpm.changes | 24 ++++++++++------- rubygem-gem2rpm.spec | 59 ++++++++++++++++++++++++----------------- 2 files changed, 49 insertions(+), 34 deletions(-) diff --git a/rubygem-gem2rpm.changes b/rubygem-gem2rpm.changes index a241953..59eecf8 100644 --- a/rubygem-gem2rpm.changes +++ b/rubygem-gem2rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 4 19:57:20 UTC 2019 - Jan Engelhardt + +- Use less strict PreReq replacements. + ------------------------------------------------------------------- Fri Jan 18 15:32:43 UTC 2019 - Marcus Rueckert @@ -177,7 +182,7 @@ Wed Sep 17 16:16:59 UTC 2014 - mrueckert@suse.de ------------------------------------------------------------------- Wed Sep 17 14:55:33 UTC 2014 - mrueckert@suse.de -- added 0008-dont-allow-suffixes-with-just-a-plain-number.-prefix.patch +- added 0008-dont-allow-suffixes-with-just-a-plain-number.-prefix.patch Dont allow an suffix with just a plain number. prefix it with ruby. @@ -244,18 +249,18 @@ Thu Jul 24 15:30:14 UTC 2014 - mrueckert@suse.de - rebased gem2rpm-0.9.2_config_file_support.patch, new name 0002-added-basic-config-file-support-to-gem2rpm-in-yaml-f.patch - rebased gem2rpm-0.9.2_sles12_template.patch, new name: - 0003-sle-12-templates.-they-require-the-config-file-suppo.patch + 0003-sle-12-templates.-they-require-the-config-file-suppo.patch - rebased and splitted gem2rpm-fix-opensuse-template.diff, new name: 0004-openSUSE-template-fixes.patch - 0005-added-example-gem2rpm.yml.patch - 0006-properly-shorten-description-and-summary.patch - 0007-Preserve-the-license-header-found-in-the-output-file.patch + 0005-added-example-gem2rpm.yml.patch + 0006-properly-shorten-description-and-summary.patch + 0007-Preserve-the-license-header-found-in-the-output-file.patch ------------------------------------------------------------------- Wed Jul 23 09:06:02 UTC 2014 - mrueckert@suse.de -- make sure the sle12 template is also installed +- make sure the sle12 template is also installed ------------------------------------------------------------------- Mon Jul 21 11:32:38 UTC 2014 - mrueckert@suse.de @@ -486,7 +491,7 @@ Thu Jul 26 13:11:05 UTC 2012 - coolo@suse.com ------------------------------------------------------------------- Thu Jul 26 09:56:31 UTC 2012 - coolo@suse.com -- no longer provide stuff for older distributions, we rely on patched +- no longer provide stuff for older distributions, we rely on patched rpms ------------------------------------------------------------------- @@ -512,7 +517,7 @@ Wed Apr 4 15:42:10 UTC 2012 - coolo@suse.com ------------------------------------------------------------------- Wed Dec 7 13:38:47 UTC 2011 - jreidinger@suse.com -- fix requirements, as package need to run json parser +- fix requirements, as package need to run json parser ------------------------------------------------------------------- Wed Mar 23 11:33:09 UTC 2011 - mrueckert@suse.de @@ -548,7 +553,7 @@ Thu Jan 20 13:44:42 UTC 2011 - mrueckert@suse.de Mon Jan 17 13:40:33 UTC 2011 - mvidner@suse.cz - Updated openSUSE template to produce *- doc and *-testsuite subpackages. - http://lists.opensuse.org/opensuse-ruby/2010-12/msg00001.html + http://lists.opensuse.org/opensuse-ruby/2010-12/msg00001.html ------------------------------------------------------------------- Thu Dec 9 15:33:55 UTC 2010 - chris@computersalat.de @@ -604,4 +609,3 @@ Fri Mar 27 17:38:45 CET 2009 - mrueckert@suse.de Fri Mar 27 16:06:28 CET 2009 - mrueckert@suse.de - initial package - diff --git a/rubygem-gem2rpm.spec b/rubygem-gem2rpm.spec index 67c29b0..5274402 100644 --- a/rubygem-gem2rpm.spec +++ b/rubygem-gem2rpm.spec @@ -47,7 +47,7 @@ BuildRequires: ruby-macros >= 5 BuildRequires: %{rubygem gem2rpm} %endif BuildRequires: update-alternatives -Url: https://github.com/lutter/gem2rpm/ +URL: https://github.com/lutter/gem2rpm/ Source: http://rubygems.org/gems/%{mod_full_name}.gem Source1: gem2rpm.yml.documentation Source2: gem2rpm-opensuse @@ -84,10 +84,11 @@ Patch29: enhances.patch Summary: Generate rpm specfiles from gems License: GPL-2.0-or-later Group: Development/Languages/Ruby -PreReq: update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives %description -Generate source rpms and rpm spec files from a Ruby Gem. +Generate source rpms and rpm spec files from a Ruby Gem. The spec file tries to follow the gem as closely as possible %prep @@ -137,10 +138,11 @@ done %package -n ruby2.1-rubygem-gem2rpm Summary: Generate rpm specfiles from gems Group: Development/Languages/Ruby -PreReq: update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives %description -n ruby2.1-rubygem-gem2rpm -Generate source rpms and rpm spec files from a Ruby Gem. +Generate source rpms and rpm spec files from a Ruby Gem. The spec file tries to follow the gem as closely as possible %package -n ruby2.1-rubygem-gem2rpm-doc @@ -193,10 +195,11 @@ fi %package -n ruby1.8-rubygem-gem2rpm Summary: Generate rpm specfiles from gems Group: Development/Languages/Ruby -PreReq: update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives %description -n ruby1.8-rubygem-gem2rpm -Generate source rpms and rpm spec files from a Ruby Gem. +Generate source rpms and rpm spec files from a Ruby Gem. The spec file tries to follow the gem as closely as possible %package -n ruby1.8-rubygem-gem2rpm-doc @@ -249,10 +252,11 @@ fi %package -n ruby1.9-rubygem-gem2rpm Summary: Generate rpm specfiles from gems Group: Development/Languages/Ruby -PreReq: update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives %description -n ruby1.9-rubygem-gem2rpm -Generate source rpms and rpm spec files from a Ruby Gem. +Generate source rpms and rpm spec files from a Ruby Gem. The spec file tries to follow the gem as closely as possible %package -n ruby1.9-rubygem-gem2rpm-doc @@ -305,10 +309,11 @@ fi %package -n ruby2.0-rubygem-gem2rpm Summary: Generate rpm specfiles from gems Group: Development/Languages/Ruby -PreReq: update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives %description -n ruby2.0-rubygem-gem2rpm -Generate source rpms and rpm spec files from a Ruby Gem. +Generate source rpms and rpm spec files from a Ruby Gem. The spec file tries to follow the gem as closely as possible %package -n ruby2.0-rubygem-gem2rpm-doc @@ -361,10 +366,11 @@ fi %package -n ruby2.2-rubygem-gem2rpm Summary: Generate rpm specfiles from gems Group: Development/Languages/Ruby -PreReq: update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives %description -n ruby2.2-rubygem-gem2rpm -Generate source rpms and rpm spec files from a Ruby Gem. +Generate source rpms and rpm spec files from a Ruby Gem. The spec file tries to follow the gem as closely as possible %package -n ruby2.2-rubygem-gem2rpm-doc @@ -417,10 +423,11 @@ fi %package -n ruby2.3-rubygem-gem2rpm Summary: Generate rpm specfiles from gems Group: Development/Languages/Ruby -PreReq: update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives %description -n ruby2.3-rubygem-gem2rpm -Generate source rpms and rpm spec files from a Ruby Gem. +Generate source rpms and rpm spec files from a Ruby Gem. The spec file tries to follow the gem as closely as possible %package -n ruby2.3-rubygem-gem2rpm-doc @@ -473,10 +480,11 @@ fi %package -n ruby2.4-rubygem-gem2rpm Summary: Generate rpm specfiles from gems Group: Development/Languages/Ruby -PreReq: update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives %description -n ruby2.4-rubygem-gem2rpm -Generate source rpms and rpm spec files from a Ruby Gem. +Generate source rpms and rpm spec files from a Ruby Gem. The spec file tries to follow the gem as closely as possible %package -n ruby2.4-rubygem-gem2rpm-doc @@ -529,10 +537,11 @@ fi %package -n ruby2.5-rubygem-gem2rpm Summary: Generate rpm specfiles from gems Group: Development/Languages/Ruby -PreReq: update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives %description -n ruby2.5-rubygem-gem2rpm -Generate source rpms and rpm spec files from a Ruby Gem. +Generate source rpms and rpm spec files from a Ruby Gem. The spec file tries to follow the gem as closely as possible %package -n ruby2.5-rubygem-gem2rpm-doc @@ -585,10 +594,11 @@ fi %package -n ruby2.6-rubygem-gem2rpm Summary: Generate rpm specfiles from gems Group: Development/Languages/Ruby -PreReq: update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives %description -n ruby2.6-rubygem-gem2rpm -Generate source rpms and rpm spec files from a Ruby Gem. +Generate source rpms and rpm spec files from a Ruby Gem. The spec file tries to follow the gem as closely as possible %package -n ruby2.6-rubygem-gem2rpm-doc @@ -643,10 +653,11 @@ fi # /MANUAL Summary: Generate rpm specfiles from gems Group: Development/Languages/Ruby -PreReq: update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives %description -n rbx2.5-rubygem-gem2rpm -Generate source rpms and rpm spec files from a Ruby Gem. +Generate source rpms and rpm spec files from a Ruby Gem. The spec file tries to follow the gem as closely as possible. %package -n rbx2.5-rubygem-gem2rpm-doc @@ -695,7 +706,7 @@ fi %defattr(-,root,root,-) %doc %{_libdir}/rubinius/gems/2.5/doc/gem2rpm-%{version} %endif -%else +%else %gem_packages %endif