Changeset 1563

Timestamp:

Jan 21, 2019, 8:19:46 PM (7 years ago)

Author:

Silvan Scherrer

Message:

spec: os2-rpm: Release version 1-6.

Location:

spec/trunk/SPECS

Files:

• os2-rpm.spec (modified) (2 diffs)
• os2-rpm/macros.scm (modified) (1 diff)

spec/trunk/SPECS/os2-rpm.spec

@@ -2 +2 @@
 Name: os2-rpm
 Version: 1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Development/System
@@ -102 +102 @@
 
 %changelog
+* Mon Jan 21 2019 Silvan Scherrer <silvan.scherrer@aroa.ch> 1-6
+- fix scm_macro to work with noarch only spec as well
+
 * Tue Nov 27 2018 Silvan Scherrer <silvan.scherrer@aroa.ch> 1-5
 - some rather old packages still need warpin-conflicts at the ols location,

spec/trunk/SPECS/os2-rpm/macros.scm

@@ -86 +86 @@
 # User-level macros
 
+# the __scm_defined was needed for noarch only spec
 %scm_source()\
+%if 0%{!?__scm_defined}\
 %{?SOURCE0:%{error:%0: Source tag is already set to '%SOURCE0'}%{quit}}\
 %{?1:%global __source_scm %1}\
 %{?2:%global __source_url %2}\
 %{?3:%global __source_rev %3}\
+%endif\
+%global __scm_defined 1\
 %{expand:%%{!?__scm_source_%1:%%{error:%0: Invalid SCM type: %{?1}}%{quit}}}\
 %{expand:%%{?__scm_source_%1}}\