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
This commit is contained in:
parent
cf72d02343
commit
b1e91bcab0
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 2 14:04:48 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- 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 <ralf.habacker@freenet.de>
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user