1
0
rubygem-gem2rpm/0029-Use-or-for-the-conditions-instead-of-and.patch
Stephan Kulow 9f40853891 - Update from git. Add:
A    0027-quote-version_suffix-in-gem2rpm.yml.documentation-to.patch
A    0028-add-binary_map-support.patch
A    0029-Use-or-for-the-conditions-instead-of-and.patch
A    0030-gem_package.spec.erb-sync-with-ruby-common.patch
A    0031-use-template-opensuse-on-openSUSE-Tumbleweed-where-e.patch
A    0032-Replace-no-rdoc-no-ri-with-no-document.patch
And refresh all others
Remove:
D    binary_map.patch
D    enhances.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/rubygem-gem2rpm?expand=0&rev=35
2019-02-23 07:09:23 +00:00

27 lines
845 B
Diff

From 04d2ef0c24748dd4120d1cc3a7b08d5c963dc100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
Date: Wed, 6 Jun 2018 16:40:15 +0200
Subject: [PATCH 29/32] Use "or" for the conditions instead of and
---
templates/gem_packages.spec.erb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb
index 4861bbd..b704b91 100644
--- a/templates/gem_packages.spec.erb
+++ b/templates/gem_packages.spec.erb
@@ -31,7 +31,8 @@
end
def self.map_executable(config, executable)
- if not(config[:binary_map].nil? and config[:binary_map][executable].nil?)
+ if not(config[:binary_map].nil? or
+ config[:binary_map][executable].nil?)
executable=config[:binary_map][executable]
end
executable
--
2.20.1