Accepting request 919461 from home:rhabacker:branches:games:mingw64

- Fix install path and file format for global rpmlint config file on
  openSUSE_Tumbleweed (bug boo#1190304, boo#1190438)
- Use rpmlint-mini also on Leap 15.x to fix the conflict breakage
- Be more verbose when version in generated xxxConfigVersion.cmake
  files is empty (see https://build.opensuse.org/request/show/915515)
- Sync with mingw32 variant

OBS-URL: https://build.opensuse.org/request/show/919461
OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-filesystem?expand=0&rev=131

mingw64-cmake.prov

@@ -69,7 +69,10 @@ class CMakeParser:
             # set(PACKAGE_VERSION <version>)
             version = re.match(r"^set[\ ]*\([\ ]*PACKAGE_VERSION[\ ]+[\"]*([0-9\.]+)[\"]*[\ ]*[.]*\)", line)
             if version:
-                return version.groups(1)[0]
+                _version = version.groups(1)[0]
+                if _version == '..':
+                    sys.stderr.write("error: Version pattern found without values - '%s' was created incorrectly\n" % versionFile)
+                return _version
 
         return None
 

mingw64-filesystem-rpmlintrc

@@ -0,0 +1,5 @@
+addFilter("^mingw64-.*filelist-forbidden-fhs23")
+addFilter("^mingw64-.*filelist-forbidden-opt")
+addFilter("^mingw64-.*non-conffile-in-etc")
+# positive false on tumbleweed, does not work as expected
+addFilter("^mingw64-.*unused-rpmlintrc-filter")

mingw64-filesystem.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Sep 14 10:20:08 UTC 2021 - Ralf Habacker <ralf.habacker@freenet.de>
+
+- Fix install path and file format for global rpmlint config file on
+  openSUSE_Tumbleweed (bug boo#1190304, boo#1190438)
+- Use rpmlint-mini also on Leap 15.x to fix the conflict breakage
+- Be more verbose when version in generated xxxConfigVersion.cmake
+  files is empty (see https://build.opensuse.org/request/show/915515)
+- Sync with mingw32 variant
+
 -------------------------------------------------------------------
 Tue Sep 14 06:39:03 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 

mingw64-filesystem.spec

@@ -16,6 +16,13 @@
 #
 
 
+# Tumbleweed
+%if %suse_version == 1550
+%define _rpmlintdir /opt/testing/share/rpmlint
+%else
+%define _rpmlintdir /opt/testing/share/rpmlint/mini
+%endif
+
 %define debug_package %{nil}
 %if %{undefined _distconfdir}
 %define _distconfdir %{_sysconfdir}
@@ -24,7 +31,7 @@
 %define _rpmmacrodir %{_sysconfdir}/rpm
 %endif
 Name:           mingw64-filesystem
-Version:        20201105
+Version:        20210914
 Release:        0
 Summary:        MinGW base filesystem and environment
 License:        GPL-2.0-or-later
@@ -45,6 +52,7 @@ Source11:       languages.man
 Source12:       mingw64-cmake.prov
 Source13:       mingw64-cmake.attr
 Source14:       macros.mingw64-cmake
+Source15:       mingw64-filesystem-rpmlintrc 
 Provides:       mingw64(bcrypt.dll)
 Provides:       mingw64(dbghelp.dll)
 Provides:       mingw64(mpr.dll)
@@ -61,8 +69,7 @@ Provides:       mingw64(ncrypt.dll)
 Requires:       mingw64-cross-breakpad-tools
 Requires:       python3
 Requires:       rpm
-Requires:       rpmlint
-Conflicts:      rpmlint-mini
+Requires:       rpmlint-mini
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 #!BuildIgnore: post-build-checks
@@ -105,10 +112,17 @@ install -m 644 %{SOURCE2} %{buildroot}%{_distconfdir}/profile.d
 
 mkdir -p %{buildroot}%{_rpmmacrodir}
 install -m 644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.mingw64
-install -m 644 %{SOURCE14} %{buildroot}%{_rpmmacrodir}/macros.mingw64-cmake
+install -m 644 %{SOURCE14} %{buildroot}%{_rpmmacrodir}/$(basename %{SOURCE14})
 
-mkdir -p %{buildroot}%{_sysconfdir}/rpmlint
-install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/rpmlint/mingw64-rpmlint.config
+mkdir -p %{buildroot}%_rpmlintdir
+# tumbleweed
+%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
+%else
+install -m 644 %{SOURCE7} %{buildroot}%_rpmlintdir/mingw64-rpmlint.config
+%endif
 
 mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32
 
@@ -185,7 +199,11 @@ done < %{SOURCE11}
 %else
 %{_distconfdir}/profile.d/mingw64.sh
 %endif
-%config %{_sysconfdir}/rpmlint/mingw64-rpmlint.config
+%if %suse_version == 1550
+%_rpmlintdir/mingw64.toml
+%else
+%_rpmlintdir/mingw64-rpmlint.config
+%endif
 %{_rpmconfigdir}/mingw64-cmake.prov
 %{_fileattrsdir}/mingw64-cmake.attr
 %{_bindir}/mingw64-*

mingw64-rpmlintrc

@@ -3,7 +3,7 @@ addFilter ("^mingw64-.*devel-file-in-non-devel")
 
 # /usr/x86_64-w64-mingw32 is permitted by MinGW packaging guidelines.
 addFilter ("^mingw64-.*non-standard-dir-in-usr x86_64-w64-mingw32")
-addFilter ("^mingw64-.*suse-filelist-forbidden-fhs23 /usr/x86_64-w64-mingw32")
+addFilter ("^mingw64-.*filelist-forbidden-fhs23 /usr/x86_64-w64-mingw32")
 
 # GCC and libtool create executable archive files.  It's not clear
 # why, but we permit this for now.
@@ -20,3 +20,8 @@ addFilter("debuginfo-without-sources")
 
 # This group is used a lot, so ignore the warning about it.
 addFilter ("^mingw64-.*non-standard-group Development/Libraries$")
+
+# using /opt/testing
+addFilter("^mingw64-*filelist-forbidden-opt")
+
+addFilter("^mingw64-.*potential-bashisms")