From 3deeef4c87c0282517963bb3bcec08f97791f451afe54bafd2bdcadb4276bcf9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 27 Aug 2020 07:41:37 +0000 Subject: [PATCH] Accepting request 829904 from windows:mingw:win64:snapshots - Update to 20200825 - Fix * W: non-etc-or-var-file-marked-as-conffile /usr/libexec/rpm/fileattrs/mingw64-cmake.attr * W: non-etc-or-var-file-marked-as-conffile /usr/libexec/rpm/mingw64-cmake.prov * W: script-without-shebang /usr/libexec/rpm/fileattrs/mingw64-cmake.attr * W: non-standard-group Development/Libraries * installing mingw64-scripts on Tumbleweed * not using present rpmlint config for building this package OBS-URL: https://build.opensuse.org/request/show/829904 OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-filesystem?expand=0&rev=117 --- mingw64-filesystem.changes | 12 ++++++ mingw64-filesystem.spec | 44 +++++++++++---------- mingw64-rpmlint.config => mingw64-rpmlintrc | 0 3 files changed, 35 insertions(+), 21 deletions(-) rename mingw64-rpmlint.config => mingw64-rpmlintrc (100%) diff --git a/mingw64-filesystem.changes b/mingw64-filesystem.changes index f4ca87a..235fd08 100644 --- a/mingw64-filesystem.changes +++ b/mingw64-filesystem.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Aug 25 19:27:01 UTC 2020 - Ralf Habacker + +- Update to 20200825 +- Fix + * W: non-etc-or-var-file-marked-as-conffile /usr/libexec/rpm/fileattrs/mingw64-cmake.attr + * W: non-etc-or-var-file-marked-as-conffile /usr/libexec/rpm/mingw64-cmake.prov + * W: script-without-shebang /usr/libexec/rpm/fileattrs/mingw64-cmake.attr + * W: non-standard-group Development/Libraries + * installing mingw64-scripts on Tumbleweed + * not using present rpmlint config for building this package + ------------------------------------------------------------------- Thu Aug 20 12:06:28 UTC 2020 - Ralf Habacker diff --git a/mingw64-filesystem.spec b/mingw64-filesystem.spec index 99315ca..c86562a 100644 --- a/mingw64-filesystem.spec +++ b/mingw64-filesystem.spec @@ -1,7 +1,7 @@ # # spec file for package mingw64-filesystem # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define debug_package %{nil} +%define _rpmlibdir %{_prefix}/lib/rpm Name: mingw64-filesystem -Version: 20200816 +Version: 20200825 Release: 0 Summary: MinGW base filesystem and environment License: GPL-2.0-or-later -Group: Development/Libraries -URL: http://hg.et.redhat.com/misc/fedora-mingw--devel/ +Group: Development/Libraries/Other +Url: http://hg.et.redhat.com/misc/fedora-mingw--devel/ Source0: COPYING Source1: macros.mingw64 Source2: mingw64.sh @@ -31,7 +32,7 @@ Source3: mingw64-find-debuginfo.sh Source4: mingw64-find-requires.sh Source5: mingw64-find-provides.sh Source6: mingw64-scripts.sh -Source7: mingw64-rpmlint.config +Source7: mingw64-rpmlintrc Source8: mingw64-install-post.sh Source9: mingw64-find-lang.sh Source10: languages @@ -47,7 +48,7 @@ Provides: mingw64(uxtheme.dll) # TODO: The available DLL's can be identified by the # available import libraries of the mingw64-runtime package. # needed by mingw64-libqt5-qtbase -Provides: mingw64(d2d1.dll) +Provides: mingw64(d2d1.dll) Provides: mingw64(d3d11.dll) Provides: mingw64(dwrite.dll) Requires: mingw64-cross-breakpad-tools @@ -77,6 +78,8 @@ sed 's/@VERSION@/%{version}/' < %{SOURCE4} > mingw64-find-requires.sh mkdir -p %{buildroot} mkdir -p %{buildroot}%{_prefix}/lib + +mkdir -p %{buildroot}%{_libexecdir} install -m 755 %{SOURCE6} %{buildroot}%{_libexecdir}/mingw64-scripts mkdir -p %{buildroot}%{_bindir} @@ -94,7 +97,7 @@ install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.mingw64 install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/rpm/macros.mingw64-cmake mkdir -p %{buildroot}%{_sysconfdir}/rpmlint -install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/rpmlint/ +install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/rpmlint/mingw64-rpmlint.config mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32 @@ -136,18 +139,17 @@ mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,9,n} # NB. NOT _libdir -mkdir -p %{buildroot}%{_libexecdir}/rpm -install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/rpm -install -m 0755 %{SOURCE4} %{buildroot}%{_libexecdir}/rpm -install -m 0755 %{SOURCE5} %{buildroot}%{_libexecdir}/rpm -install -m 0755 %{SOURCE8} %{buildroot}%{_libexecdir}/rpm -install -m 0755 %{SOURCE9} %{buildroot}%{_libexecdir}/rpm +mkdir -p %{buildroot}%{_rpmlibdir} +install -m 0755 %{SOURCE3} %{buildroot}%{_rpmlibdir} +install -m 0755 %{SOURCE4} %{buildroot}%{_rpmlibdir} +install -m 0755 %{SOURCE5} %{buildroot}%{_rpmlibdir} +install -m 0755 %{SOURCE8} %{buildroot}%{_rpmlibdir} +install -m 0755 %{SOURCE9} %{buildroot}%{_rpmlibdir} # cmake support -mkdir -p %{buildroot}%{_libexecdir}/rpm -install -m 0755 %{SOURCE12} %{buildroot}%{_libexecdir}/rpm -mkdir -p %{buildroot}%{_libexecdir}/rpm/fileattrs -install -m 0755 %{SOURCE13} %{buildroot}%{_libexecdir}/rpm/fileattrs +install -m 0755 %{SOURCE12} %{buildroot}%{_rpmlibdir} +mkdir -p %{buildroot}%{_rpmlibdir}/fileattrs +install -m 0644 %{SOURCE13} %{buildroot}%{_rpmlibdir}/fileattrs # Create the locale directories: while read LANG ; do @@ -169,12 +171,12 @@ done < %{SOURCE11} %config %{_sysconfdir}/rpm/macros.mingw64-cmake %config %{_sysconfdir}/profile.d/mingw64.sh %config %{_sysconfdir}/rpmlint/mingw64-rpmlint.config -%config %{_libexecdir}/rpm/mingw64-cmake.prov -%config %{_libexecdir}/rpm/fileattrs/mingw64-cmake.attr +%{_rpmlibdir}/mingw64-cmake.prov +%{_rpmlibdir}/fileattrs/mingw64-cmake.attr %{_bindir}/mingw64-* %{_libexecdir}/mingw64-scripts %{_prefix}/x86_64-w64-mingw32/ -%{_libexecdir}/rpm/mingw64-* +%{_rpmlibdir}/mingw64-* %dir %{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/cmake %changelog diff --git a/mingw64-rpmlint.config b/mingw64-rpmlintrc similarity index 100% rename from mingw64-rpmlint.config rename to mingw64-rpmlintrc