From b1e91bcab0e0ed0ac32b66ea8f0168a0fffd5356d97f5a73037189fbf3c1bc12 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 2 Dec 2021 14:07:53 +0000 Subject: [PATCH] Accepting request 935197 from home:dimstar:Factory - Change all version comparisons for Tumbleweed to >= 1550 (instead of == 1550). Anything in Tumbleweed counts for current Tumbleweed plus future CODE branches. Additionally, the Tumbleweed suse_version code is not chiseled in stone. OBS-URL: https://build.opensuse.org/request/show/935197 OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-filesystem?expand=0&rev=132 --- mingw64-filesystem.changes | 8 ++++++++ mingw64-filesystem.spec | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/mingw64-filesystem.changes b/mingw64-filesystem.changes index c81d9a8..f372395 100644 --- a/mingw64-filesystem.changes +++ b/mingw64-filesystem.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 2 14:04:48 UTC 2021 - Dominique Leuenberger + +- Change all version comparisons for Tumbleweed to >= 1550 (instead + of == 1550). Anything in Tumbleweed counts for current Tumbleweed + plus future CODE branches. Additionally, the Tumbleweed + suse_version code is not chiseled in stone. + ------------------------------------------------------------------- Tue Sep 14 10:20:08 UTC 2021 - Ralf Habacker diff --git a/mingw64-filesystem.spec b/mingw64-filesystem.spec index 4177911..d5482eb 100644 --- a/mingw64-filesystem.spec +++ b/mingw64-filesystem.spec @@ -17,7 +17,7 @@ # Tumbleweed -%if %suse_version == 1550 +%if %suse_version >= 1550 %define _rpmlintdir /opt/testing/share/rpmlint %else %define _rpmlintdir /opt/testing/share/rpmlint/mini @@ -52,7 +52,7 @@ Source11: languages.man Source12: mingw64-cmake.prov Source13: mingw64-cmake.attr Source14: macros.mingw64-cmake -Source15: mingw64-filesystem-rpmlintrc +Source15: mingw64-filesystem-rpmlintrc Provides: mingw64(bcrypt.dll) Provides: mingw64(dbghelp.dll) Provides: mingw64(mpr.dll) @@ -116,7 +116,7 @@ install -m 644 %{SOURCE14} %{buildroot}%{_rpmmacrodir}/$(basename %{SOURCE14}) mkdir -p %{buildroot}%_rpmlintdir # tumbleweed -%if %suse_version == 1550 +%if %suse_version >= 1550 # convert to toml file format, which seems to be required sed "s,addFilter *(\", ',g;s#\")#',#g" %{SOURCE7} | gawk 'BEGIN { print "Filters = ["} { print $0 } END { print "]"}' > %{SOURCE7}.toml install -m 644 %{SOURCE7}.toml %{buildroot}%_rpmlintdir/mingw64.toml @@ -199,7 +199,7 @@ done < %{SOURCE11} %else %{_distconfdir}/profile.d/mingw64.sh %endif -%if %suse_version == 1550 +%if %suse_version >= 1550 %_rpmlintdir/mingw64.toml %else %_rpmlintdir/mingw64-rpmlint.config