diff --git a/mingw-nsiswrapper.spec b/mingw-nsiswrapper.spec index 15ee253..7c17b5f 100644 --- a/mingw-nsiswrapper.spec +++ b/mingw-nsiswrapper.spec @@ -1,10 +1,9 @@ Name: mingw-nsiswrapper -Version: 12 -Release: 10%{?dist} +Version: 10 +Release: 9%{?dist} Summary: Helper program for making NSIS Windows installers -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: GPLv2+ URL: http://fedoraproject.org/wiki/MinGW Source0: nsiswrapper.pl @@ -15,7 +14,9 @@ BuildArch: noarch BuildRequires: perl-interpreter BuildRequires: perl-generators +%if 0%{?fedora} > 18 BuildRequires: perl-podlators +%endif %description @@ -30,7 +31,6 @@ installer script that NSIS needs. %package -n mingw32-nsiswrapper Summary: Helper program for making NSIS Windows installers Requires: mingw32-binutils -Requires: mingw32-crt Requires: mingw32-nsis %description -n mingw32-nsiswrapper @@ -77,73 +77,6 @@ pod2man -c "NSIS" -r "%{name}-%{version}" %{SOURCE0} \ %changelog -* Thu Jul 16 2026 Fedora Release Engineering - 12-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Fri Jan 16 2026 Fedora Release Engineering - 12-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Thu Jul 24 2025 Fedora Release Engineering - 12-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 12-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 12-6 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 12-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 12-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 25 2023 Richard W.M. Jones - 12-1 -- Use mingw*-crt to search for DLLs (RHBZ#2164360) -- Remove ancient Fedora conditional. - -* Thu Jan 19 2023 Fedora Release Engineering - 11-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 11-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 11-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 11-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 24 2018 Richard W.M. Jones - 11-1 -- Pango modules are no longer required (RHBZ#1607041). - -* Fri Jul 13 2018 Fedora Release Engineering - 10-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 10-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - * Wed Jul 26 2017 Fedora Release Engineering - 10-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/nsiswrapper.pl b/nsiswrapper.pl index 54a1ddb..c766e16 100755 --- a/nsiswrapper.pl +++ b/nsiswrapper.pl @@ -498,8 +498,7 @@ sub get_windows_system_dlls # https://bugzilla.redhat.com/show_bug.cgi?id=856354#c6 my $cmd = q{ set -e - for pkg in mingw32-filesystem mingw64-filesystem \ - mingw32-crt mingw64-crt ; do + for pkg in mingw32-filesystem mingw64-filesystem; do if rpm -q $pkg >/dev/null 2>&1; then rpm -q --provides $pkg fi @@ -548,6 +547,15 @@ sub do_gtk install_name => "gdk-pixbuf-2.0" ); + add_file_unless_exists ( + "$mingw32_libdir/pango", + root => 0, + dir => 1, + exec => 0, + install_dir => "lib", + install_name => "pango" + ); + add_file_unless_exists ( "$mingw32_sysconfdir/fonts", root => 0, @@ -565,6 +573,25 @@ sub do_gtk install_dir => "etc", install_name => "gtk-2.0" ); + + add_file_unless_exists ( + "$mingw32_sysconfdir/pango", + root => 0, + dir => 1, + only_mkdir => 1, + exec => 0, + install_dir => "etc", + install_name => "pango" + ); + + # We need to run pango-querymodules after installation to + # rebuild etc\pango\pango.modules. + add_file_unless_exists ( + "$mingw32_bindir/pango-querymodules.exe", + root => 0, + dir => 0, + exec => 0 + ); } # Decide how we will name the output files. This removes the @@ -734,6 +761,20 @@ EOT } } + # GTK? + if ($with_gtk) { + my $install_dir = $files{"$mingw32_bindir/pango-querymodules.exe"}->{install_dir}; + my $install_name = $files{"$mingw32_bindir/pango-querymodules.exe"}->{install_name}; + + # This particular piece of Windows stupidity is documented here: + # http://forums.winamp.com/showthread.php?postid=438771#post438771 + # http://forums.winamp.com/printthread.php?s=53c76b4ae4221ff1d9dc361fc5bf7ea2&threadid=231797 + print $io "\n"; + print $io " ReadEnvStr \$0 COMSPEC\n"; + print $io " SetOutPath \"\$INSTDIR\"\n"; + print $io " nsExec::ExecToLog '\$0 /C $install_dir\\$install_name > etc\\pango\\pango.modules'\n" + } + print $io <