rpms/msitools
5
0
Fork 0
Code Issues Pull Requests Releases Activity

New version v0.101, fix rhbz#1923683

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2021-02-03 00:15:08 +04:00
parent 460b59a6b6
commit 8a351c8268
15 changed files with 20 additions and 8684 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -16,3 +16,4 @@
/msitools-0.98.tar.xz
/msitools-0.99.tar.xz
/msitools-0.100.tar.xz
/msitools-0.101.tar.xz

3256
0001-data-wixl-fix-wxi-for-rawhide.patch
View File

File diff suppressed because it is too large Load Diff

225
0001-data-wixl-remove-nss-nspr.patch
View File

@ -1,225 +0,0 @@
From 07a3ca6845e06e0ea2b2e668f64f82efd4c48e63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 15 Jan 2020 13:23:41 +0400
Subject: [PATCH 1/9] data/wixl: remove nss & nspr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
They are no longer in Fedora, and libcacard should switch to libp11.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
data/Makefile.am | 2 -
data/wixl/nspr.wxi | 27 --------
data/wixl/nss.wxi | 151 ---------------------------------------------
3 files changed, 180 deletions(-)
delete mode 100644 data/wixl/nspr.wxi
delete mode 100644 data/wixl/nss.wxi
diff --git a/data/Makefile.am b/data/Makefile.am
index 7935163..e409c64 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -68,8 +68,6 @@ dist_wxi_DATA = \
wixl/libvorbis.wxi \
wixl/libxml2.wxi \
wixl/nettle.wxi \
- wixl/nspr.wxi \
- wixl/nss.wxi \
wixl/openssl.wxi \
wixl/opus.wxi \
wixl/orc.wxi \
diff --git a/data/wixl/nspr.wxi b/data/wixl/nspr.wxi
deleted file mode 100644
index aa5f636..0000000
--- a/data/wixl/nspr.wxi
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?require gcc.wxi?>
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Fragment>
- <DirectoryRef Id="INSTALLDIR">
- <Directory Id="dir2AA90C08CFF39C61E53BB12D6D582979" Name="bin">
- <Component Win64="$(var.Win64)" Id="cmp22A2DEFE509A234A8BFAF3D0B8ABD7D2" Guid="*">
- <File Id="filF98C8175A5228F46C266818E7560CCDB" KeyPath="yes" Source="$(var.SourceDir)/bin/libnspr4.dll"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp49B31C531B672BB004CB42B27F61AB03" Guid="*">
- <File Id="fil156BB112C15356A6A29D8B1B4844948B" KeyPath="yes" Source="$(var.SourceDir)/bin/libplc4.dll"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp22BFC894EE0607BA5D7505D052149CC4" Guid="*">
- <File Id="fil454D755691688FFFEF221990C0B4B9BF" KeyPath="yes" Source="$(var.SourceDir)/bin/libplds4.dll"/>
- </Component>
- </Directory>
- </DirectoryRef>
- </Fragment>
- <Fragment>
- <ComponentGroup Id="CG.nspr">
- <ComponentGroupRef Id="CG.gcc"/>
- <ComponentRef Id="cmp22A2DEFE509A234A8BFAF3D0B8ABD7D2"/>
- <ComponentRef Id="cmp49B31C531B672BB004CB42B27F61AB03"/>
- <ComponentRef Id="cmp22BFC894EE0607BA5D7505D052149CC4"/>
- </ComponentGroup>
- </Fragment>
-</Include>
diff --git a/data/wixl/nss.wxi b/data/wixl/nss.wxi
deleted file mode 100644
index 42aee64..0000000
--- a/data/wixl/nss.wxi
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?require nspr.wxi?>
-<?require sqlite.wxi?>
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Fragment>
- <DirectoryRef Id="INSTALLDIR">
- <Directory Id="dir46E6D11E1F918BFC47FA013768D83337" Name="bin">
- <Component Win64="$(var.Win64)" Id="cmp901134AE979D2DF190AD405E36B9E315" Guid="*">
- <File Id="filF3DA709DABBCB6A8EF3C8750C14CCD7F" KeyPath="yes" Source="$(var.SourceDir)/bin/certutil.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp6C58E80840CAD61AFEECB58BDEAD7113" Guid="*">
- <File Id="filC7C799066E5EADD120908BE978F59422" KeyPath="yes" Source="$(var.SourceDir)/bin/cmsutil.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp54CB944FA13E66225E1C7526CB8B6783" Guid="*">
- <File Id="fil227F10133339F0DD9E82FE28D3785C04" KeyPath="yes" Source="$(var.SourceDir)/bin/crlutil.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmpB88856410E9E4B0B6A0DD081F5524994" Guid="*">
- <File Id="filEAD7575E9DC7E971942831039917590E" KeyPath="yes" Source="$(var.SourceDir)/bin/freebl3.dll"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp19B63C299F566B4C6FD6FDEA3D7E446E" Guid="*">
- <File Id="fil8839D57A4C4457D3DE7411F01F99FD0A" KeyPath="yes" Source="$(var.SourceDir)/bin/modutil.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp3C5BF2290C3FDBA908FCD2275C56FD04" Guid="*">
- <File Id="filD5FD1BC15BBBCF05A6987A581D71DA56" KeyPath="yes" Source="$(var.SourceDir)/bin/nss3.dll"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp957CE9CEDAFB85D0DC339857B9B3887C" Guid="*">
- <File Id="filCFC2D38933472EC04A5C25EEED68317D" KeyPath="yes" Source="$(var.SourceDir)/bin/nssckbi.dll"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp70D0739B59F131CAE17D397EFC6F3FBE" Guid="*">
- <File Id="filE18A51D89FC2F49C8396EFA50E852C1F" KeyPath="yes" Source="$(var.SourceDir)/bin/nssdbm3.dll"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp5545646AAD45B317E5A63B5CA27298EA" Guid="*">
- <File Id="fil4551AF690A4E337BF8D78A7EAA728508" KeyPath="yes" Source="$(var.SourceDir)/bin/nssutil3.dll"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp899EB0F2AB77845049BCBCE454606BEA" Guid="*">
- <File Id="fil23A99E2872515B146406D952847B6434" KeyPath="yes" Source="$(var.SourceDir)/bin/pk12util.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmpABEF36EFD21DF5A3A0CC1B9BAECB94A4" Guid="*">
- <File Id="fil55493C9C97C43A4E672514A17F2CD67B" KeyPath="yes" Source="$(var.SourceDir)/bin/signtool.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp683F418AAA618A58BF43910411C02329" Guid="*">
- <File Id="fil445560875F7387DF3710BDBD2FA1630C" KeyPath="yes" Source="$(var.SourceDir)/bin/signver.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp7BFD5993783105272292C55D87BC2B7B" Guid="*">
- <File Id="fil5E11261556C12E5D2C1C3C0A1524E44D" KeyPath="yes" Source="$(var.SourceDir)/bin/smime3.dll"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmpE2A6747532D045626A3EE0B7BFF34825" Guid="*">
- <File Id="fil30B0FB8553131B9D608F9854CEE601D4" KeyPath="yes" Source="$(var.SourceDir)/bin/softokn3.dll"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp1897D4C53C4ED91C49704D5570547946" Guid="*">
- <File Id="fil08E7D8830FBDB60BBCBADB9F10118791" KeyPath="yes" Source="$(var.SourceDir)/bin/ssl3.dll"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp195DDFDA8E7D7480C2BE2968B2DEE22E" Guid="*">
- <File Id="fil8376938E82B413928FEDF9DC27D29587" KeyPath="yes" Source="$(var.SourceDir)/bin/ssltap.exe"/>
- </Component>
- </Directory>
- <Directory Id="dir238450989E0536E1646A26BA216820CE" Name="etc">
- <Directory Id="dirD1F4B69AAC41DA4D5866CFF3F23DDCA8" Name="pki">
- <Directory Id="dir5DB33CB3C93F4C6A7684E26029C4372C" Name="nssdb">
- <Component Win64="$(var.Win64)" Id="cmp4D8727C826B964B4E03E015D1E29DA6B" Guid="*">
- <File Id="fil00F257FB21EB5B0217288B2070E694B8" KeyPath="yes" Source="$(var.SourceDir)/etc/pki/nssdb/cert8.db"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmpA7CDDCA5411D79DA7792B9E77E01A944" Guid="*">
- <File Id="fil60D959162BFE563EAEB6219268552BE1" KeyPath="yes" Source="$(var.SourceDir)/etc/pki/nssdb/key3.db"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp983B1185C8526C740675955ED2253D86" Guid="*">
- <File Id="fil3A3A63D59D014CE9EF7476BCE091BB91" KeyPath="yes" Source="$(var.SourceDir)/etc/pki/nssdb/secmod.db"/>
- </Component>
- </Directory>
- </Directory>
- </Directory>
- <Directory Id="dirF6A6C531554C841C8B91C4B5F8D19F74" Name="lib">
- <Directory Id="dirDC0FE1A3DB64D2E85485FDE22CE45358" Name="nss">
- <Component Win64="$(var.Win64)" Id="cmp9600721979BC6A73701F4D9F72B0D143" Guid="*">
- <File Id="fil50F52BE84B7E9246A768414DBFA4931A" KeyPath="yes" Source="$(var.SourceDir)/lib/nss/atob.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmpF6F2B7089CCE2CAE40C02BBD4BAE4493" Guid="*">
- <File Id="filA89EC42B736674E323E69CA8F8705661" KeyPath="yes" Source="$(var.SourceDir)/lib/nss/btoa.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmpFF762FBA9D4E1CB9B1B7360AF93C448A" Guid="*">
- <File Id="fil6F102CE161436489429765F1B2FC5A5C" KeyPath="yes" Source="$(var.SourceDir)/lib/nss/derdump.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmpA4B99E3802ECE9FFAD75354127AD376A" Guid="*">
- <File Id="fil868113C63FA4B6D888B5796C994086E4" KeyPath="yes" Source="$(var.SourceDir)/lib/nss/ocspclnt.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp1A3E388100934F5F5954ECC503EA279D" Guid="*">
- <File Id="fil640D7AD343AE61644F6510B34992A445" KeyPath="yes" Source="$(var.SourceDir)/lib/nss/pp.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmpBA518B05EA14228096417D4F003E9313" Guid="*">
- <File Id="fil68BB4C3AC023FE17EB5FA71EBB2F957F" KeyPath="yes" Source="$(var.SourceDir)/lib/nss/selfserv.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmpB2021DDFE2944C1477A98CC89618F783" Guid="*">
- <File Id="filDC2256A22208B20998D4C24704957937" KeyPath="yes" Source="$(var.SourceDir)/lib/nss/shlibsign.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp58A5E9AB6679BFD6471C0D68F517D1FB" Guid="*">
- <File Id="filEAA641299983F94F34F33C92A2E87AB1" KeyPath="yes" Source="$(var.SourceDir)/lib/nss/strsclnt.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmp0E58F11D5FAA5CA2599D20EB0C216EF9" Guid="*">
- <File Id="fil8A73BF77F13E58016B0FE8A401A43DA1" KeyPath="yes" Source="$(var.SourceDir)/lib/nss/symkeyutil.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmpD840BC75078752A13DA58975914DFE4F" Guid="*">
- <File Id="fil4FEA6E616D8FFD6E6C4386B11E50E0C6" KeyPath="yes" Source="$(var.SourceDir)/lib/nss/tstclnt.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmpC630A95AF47DF3E4E2FC88934B7B9B78" Guid="*">
- <File Id="fil6F53C91779089D99D5A80F9EC8A143A2" KeyPath="yes" Source="$(var.SourceDir)/lib/nss/vfychain.exe"/>
- </Component>
- <Component Win64="$(var.Win64)" Id="cmpF24C92ABA84FF6364C814DB720414FBE" Guid="*">
- <File Id="filA72B95F62E3B5E6595DFA87FEF895199" KeyPath="yes" Source="$(var.SourceDir)/lib/nss/vfyserv.exe"/>
- </Component>
- </Directory>
- </Directory>
- </DirectoryRef>
- </Fragment>
- <Fragment>
- <ComponentGroup Id="CG.nss">
- <ComponentGroupRef Id="CG.nspr"/>
- <ComponentGroupRef Id="CG.sqlite"/>
- <ComponentRef Id="cmp901134AE979D2DF190AD405E36B9E315"/>
- <ComponentRef Id="cmp6C58E80840CAD61AFEECB58BDEAD7113"/>
- <ComponentRef Id="cmp54CB944FA13E66225E1C7526CB8B6783"/>
- <ComponentRef Id="cmpB88856410E9E4B0B6A0DD081F5524994"/>
- <ComponentRef Id="cmp19B63C299F566B4C6FD6FDEA3D7E446E"/>
- <ComponentRef Id="cmp3C5BF2290C3FDBA908FCD2275C56FD04"/>
- <ComponentRef Id="cmp957CE9CEDAFB85D0DC339857B9B3887C"/>
- <ComponentRef Id="cmp70D0739B59F131CAE17D397EFC6F3FBE"/>
- <ComponentRef Id="cmp5545646AAD45B317E5A63B5CA27298EA"/>
- <ComponentRef Id="cmp899EB0F2AB77845049BCBCE454606BEA"/>
- <ComponentRef Id="cmpABEF36EFD21DF5A3A0CC1B9BAECB94A4"/>
- <ComponentRef Id="cmp683F418AAA618A58BF43910411C02329"/>
- <ComponentRef Id="cmp7BFD5993783105272292C55D87BC2B7B"/>
- <ComponentRef Id="cmpE2A6747532D045626A3EE0B7BFF34825"/>
- <ComponentRef Id="cmp1897D4C53C4ED91C49704D5570547946"/>
- <ComponentRef Id="cmp195DDFDA8E7D7480C2BE2968B2DEE22E"/>
- <ComponentRef Id="cmp4D8727C826B964B4E03E015D1E29DA6B"/>
- <ComponentRef Id="cmpA7CDDCA5411D79DA7792B9E77E01A944"/>
- <ComponentRef Id="cmp983B1185C8526C740675955ED2253D86"/>
- <ComponentRef Id="cmp9600721979BC6A73701F4D9F72B0D143"/>
- <ComponentRef Id="cmpF6F2B7089CCE2CAE40C02BBD4BAE4493"/>
- <ComponentRef Id="cmpFF762FBA9D4E1CB9B1B7360AF93C448A"/>
- <ComponentRef Id="cmpA4B99E3802ECE9FFAD75354127AD376A"/>
- <ComponentRef Id="cmp1A3E388100934F5F5954ECC503EA279D"/>
- <ComponentRef Id="cmpBA518B05EA14228096417D4F003E9313"/>
- <ComponentRef Id="cmpB2021DDFE2944C1477A98CC89618F783"/>
- <ComponentRef Id="cmp58A5E9AB6679BFD6471C0D68F517D1FB"/>
- <ComponentRef Id="cmp0E58F11D5FAA5CA2599D20EB0C216EF9"/>
- <ComponentRef Id="cmpD840BC75078752A13DA58975914DFE4F"/>
- <ComponentRef Id="cmpC630A95AF47DF3E4E2FC88934B7B9B78"/>
- <ComponentRef Id="cmpF24C92ABA84FF6364C814DB720414FBE"/>
- </ComponentGroup>
- </Fragment>
-</Include>
--
2.25.3

45
0002-ilmbase.wxi-update-v2.4.patch
View File

@ -1,45 +0,0 @@
From 10cf73d3f26b0cd8f829f122a7e4ef32f67e496d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 15 Jan 2020 18:27:41 +0400
Subject: [PATCH 2/9] ilmbase.wxi: update v2.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
data/wixl/ilmbase.wxi | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/wixl/ilmbase.wxi b/data/wixl/ilmbase.wxi
index 5083be2..fce3925 100644
--- a/data/wixl/ilmbase.wxi
+++ b/data/wixl/ilmbase.wxi
@@ -5,19 +5,19 @@
<DirectoryRef Id="INSTALLDIR">
<Directory Id="dirFEE7741CD6956C044C54657F0DD3C9C6" Name="bin">
<Component Win64="$(var.Win64)" Id="cmp49032B593A9BDF7943A16C679B6064B2" Guid="*">
- <File Id="fil787174B51DF1BE93A0239955863C72FF" KeyPath="yes" Source="$(var.SourceDir)/bin/libHalf-24.dll"/>
+ <File Id="fil787174B51DF1BE93A0239955863C72FF" KeyPath="yes" Source="$(var.SourceDir)/bin/libHalf-2_4-24.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmpE94B4B037392585281516E3184369B52" Guid="*">
- <File Id="filEA13CCB16F8A7A448980B093DC653D05" KeyPath="yes" Source="$(var.SourceDir)/bin/libIex-2_3-24.dll"/>
+ <File Id="filEA13CCB16F8A7A448980B093DC653D05" KeyPath="yes" Source="$(var.SourceDir)/bin/libIex-2_4-24.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmp0054B3C0B8B7B470B50527958678189F" Guid="*">
- <File Id="filFD41AFF06C58E24D166C1552FC612BE1" KeyPath="yes" Source="$(var.SourceDir)/bin/libIexMath-2_3-24.dll"/>
+ <File Id="filFD41AFF06C58E24D166C1552FC612BE1" KeyPath="yes" Source="$(var.SourceDir)/bin/libIexMath-2_4-24.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmpCE5584F830B91965B9E59E141529BB0E" Guid="*">
- <File Id="fil1852EFB6E5AEF1D07CAB79ED27F0DD74" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmThread-2_3-24.dll"/>
+ <File Id="fil1852EFB6E5AEF1D07CAB79ED27F0DD74" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmThread-2_4-24.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmp8510F7023D50444985A90AB94DFEDD96" Guid="*">
- <File Id="filE53EBCCD25A262F9346BBF8E4A6AB74B" KeyPath="yes" Source="$(var.SourceDir)/bin/libImath-2_3-24.dll"/>
+ <File Id="filE53EBCCD25A262F9346BBF8E4A6AB74B" KeyPath="yes" Source="$(var.SourceDir)/bin/libImath-2_4-24.dll"/>
</Component>
</Directory>
</DirectoryRef>
--
2.25.3

33
0003-OpenEXR.wxi-path-fixes-for-v2.4.patch
View File

@ -1,33 +0,0 @@
From 0479e49fd4ecd898734fc63920d136ef0a8ae7fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 15 Jan 2020 18:40:45 +0400
Subject: [PATCH 3/9] OpenEXR.wxi: path fixes for v2.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
data/wixl/OpenEXR.wxi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/wixl/OpenEXR.wxi b/data/wixl/OpenEXR.wxi
index fe3acdd..6a5669d 100644
--- a/data/wixl/OpenEXR.wxi
+++ b/data/wixl/OpenEXR.wxi
@@ -6,10 +6,10 @@
<DirectoryRef Id="INSTALLDIR">
<Directory Id="dirD82453D760D75AFEACE0B4CFFB66E47F" Name="bin">
<Component Win64="$(var.Win64)" Id="cmpAF01A198C634A806766802238548688B" Guid="*">
- <File Id="fil42091A46F9AA74BB113E15D274AED537" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmImf-2_3-24.dll"/>
+ <File Id="fil42091A46F9AA74BB113E15D274AED537" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmImf-2_4-24.dll"/>
</Component>
<Component Win64="$(var.Win64)" Id="cmp7FD83EB5B344D2CA1DE250C9877ABF62" Guid="*">
- <File Id="fil0C364885851B102522705CC5D4F97F18" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmImfUtil-2_3-24.dll"/>
+ <File Id="fil0C364885851B102522705CC5D4F97F18" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmImfUtil-2_4-24.dll"/>
</Component>
</Directory>
</DirectoryRef>
--
2.25.3

1137
0004-adwaita-icon-theme.wxi-update-to-v3.34.3.patch
View File

File diff suppressed because it is too large Load Diff

36
0005-libvirt.wxi-depends-on-glib2-these-days.patch
View File

@ -1,36 +0,0 @@
From 69a3fa9de1e6ceb7538b20538c8293cf07d706e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 15 Jan 2020 19:47:34 +0400
Subject: [PATCH 5/9] libvirt.wxi: depends on glib2 these days
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
data/wixl/libvirt.wxi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/wixl/libvirt.wxi b/data/wixl/libvirt.wxi
index abb3586..a81104d 100644
--- a/data/wixl/libvirt.wxi
+++ b/data/wixl/libvirt.wxi
@@ -8,6 +8,7 @@
<?require readline.wxi?>
<?require libxml2.wxi?>
<?require winpthreads.wxi?>
+<?require glib2.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
@@ -567,6 +568,7 @@
<ComponentGroupRef Id="CG.readline"/>
<ComponentGroupRef Id="CG.libxml2"/>
<ComponentGroupRef Id="CG.winpthreads"/>
+ <ComponentGroupRef Id="CG.glib2"/>
<ComponentRef Id="cmpB962DB3CF88FF4B22CD95DDD142C563A"/>
<ComponentRef Id="cmpB6F6993161E17654F77AA88C3F185130"/>
<ComponentRef Id="cmpE285D1D7089CBDBA1061BBD4A7AF1000"/>
--
2.25.3

2321
0006-data-update-adwaita-icon-theme.wxi.patch
View File

File diff suppressed because it is too large Load Diff

1318
0007-data-update-atk.wxi.patch
View File

File diff suppressed because it is too large Load Diff

36
0008-data-update-gdk-pixbuf-deps.patch
View File

@ -1,36 +0,0 @@
From 805ff902ae92f0020f4371820a2421fd2fc7120e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Sat, 28 Mar 2020 02:34:52 +0100
Subject: [PATCH 8/9] data: update gdk-pixbuf deps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
data/wixl/gdk-pixbuf.wxi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/wixl/gdk-pixbuf.wxi b/data/wixl/gdk-pixbuf.wxi
index 89ae9db..6fb5ee8 100644
--- a/data/wixl/gdk-pixbuf.wxi
+++ b/data/wixl/gdk-pixbuf.wxi
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?require glib2.wxi?>
<?require libpng.wxi?>
+<?require libtiff.wxi?>
<?require jasper.wxi?>
<?require gettext.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
@@ -742,6 +743,7 @@
<ComponentGroup Id="CG.gdk-pixbuf">
<ComponentGroupRef Id="CG.glib2"/>
<ComponentGroupRef Id="CG.libpng"/>
+ <ComponentGroupRef Id="CG.libtiff"/>
<ComponentGroupRef Id="CG.jasper"/>
<ComponentGroupRef Id="CG.gettext"/>
<ComponentRef Id="cmp4BF448B47E572302678F2495BDE525FC"/>
--
2.25.3

118
0009-Update-file-manifest-for-gstreamer1-plugins-bad-free.patch
View File

@ -1,118 +0,0 @@
From c47eb4dde574f4f74bc8d8a7bff272e2e5f485e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Thu, 23 Apr 2020 18:01:47 +0100
Subject: [PATCH] Update file manifest for gstreamer1-plugins-bad-free 1.16.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
data/wixl/gstreamer1-plugins-bad-free.wxi | 24 ++++++++---------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/data/wixl/gstreamer1-plugins-bad-free.wxi b/data/wixl/gstreamer1-plugins-bad-free.wxi
index bc4104c..7224071 100644
--- a/data/wixl/gstreamer1-plugins-bad-free.wxi
+++ b/data/wixl/gstreamer1-plugins-bad-free.wxi
@@ -17,9 +17,6 @@
<Component Win64="$(var.Win64)" Id="cmp705F0A830103CB63E5311A0F5D856051" Guid="*">
<File Id="fil9763CF7625468C8ECEFAAFC218DA2345" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstbadaudio-1.0-0.dll"/>
</Component>
- <Component Win64="$(var.Win64)" Id="cmpCF0950505CA3AAD329BD2CE5D1B4608A" Guid="*">
- <File Id="fil4C6948ECF35D5A7B9D182F82665BBAFF" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstbadvideo-1.0-0.dll"/>
- </Component>
<Component Win64="$(var.Win64)" Id="cmp363E6461D1E5D1974AB4C7E1BAF0A6C7" Guid="*">
<File Id="fil7F7C2C37D669D2EE4A6D45D423BF54DA" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstbasecamerabinsrc-1.0-0.dll"/>
</Component>
@@ -41,6 +38,9 @@
<Component Win64="$(var.Win64)" Id="cmp782CD06F4684B8D06372D1AF46DB033F" Guid="*">
<File Id="fil77D05A0C36356857A26637BD1B9E5028" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstplayer-1.0-0.dll"/>
</Component>
+ <Component Win64="$(var.Win64)" Id="cmp11EC2FEEBE514933A2555D776F69C84C" Guid="*">
+ <File Id="fil9F363F926F1E4DEA9F42989DEEF480B1" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstsctp-1.0-0.dll"/>
+ </Component>
<Component Win64="$(var.Win64)" Id="cmpA65BB2A10006E125524C1AECEC473AB8" Guid="*">
<File Id="filCEB27EFAB6F3DCAEDB807485FFA3DD93" KeyPath="yes" Source="$(var.SourceDir)/bin/libgsturidownloader-1.0-0.dll"/>
</Component>
@@ -92,12 +92,12 @@
<Component Win64="$(var.Win64)" Id="cmp0B6971ACAC29EF6C9F71818B1A7A50F5" Guid="*">
<File Id="filBFE89BF51EF96D0B900BD96D24D9C0D0" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstcamerabin.dll"/>
</Component>
+ <Component Win64="$(var.Win64)" Id="cmpD3169FDE8F254F6BAB999FDC971DC896" Guid="*">
+ <File Id="fil03731ADC934F4B16B841C51BA1B1BCC4" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstclosedcaption.dll"/>
+ </Component>
<Component Win64="$(var.Win64)" Id="cmp83B90DFB1EDBF160FA4CFCCD84AC9F77" Guid="*">
<File Id="filC09AA31BFA85800C43BF2CF6BEAE7A89" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstcoloreffects.dll"/>
</Component>
- <Component Win64="$(var.Win64)" Id="cmp6E91331EBAE90B4042C77563B3B41347" Guid="*">
- <File Id="filD91C9D414F5903B4F3052D6682723320" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstcompositor.dll"/>
- </Component>
<Component Win64="$(var.Win64)" Id="cmpF3A7DA356D8A5E9DA6767517F0FD91FB" Guid="*">
<File Id="filBA1195BAE9888895F8108D8294B39371" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstd3d.dll"/>
</Component>
@@ -194,9 +194,6 @@
<Component Win64="$(var.Win64)" Id="cmpA51A4882249288BCBF783B2B8F6C3F58" Guid="*">
<File Id="fil7D04370A014E2CE2B0DB5B0D13ADA733" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstopenexr.dll"/>
</Component>
- <Component Win64="$(var.Win64)" Id="cmpB446D8A310733F576D028DBCA35E6E65" Guid="*">
- <File Id="filAE369AE87D78ACA50B13A39B0F8031CE" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstopenglmixers.dll"/>
- </Component>
<Component Win64="$(var.Win64)" Id="cmpD4E115B11B1C07D461165365952FB3D8" Guid="*">
<File Id="fil35CDBAAD35D1174AABBC81C300B55212" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstopusparse.dll"/>
</Component>
@@ -233,9 +230,6 @@
<Component Win64="$(var.Win64)" Id="cmpB098DB5DEDEAEF123797B73CA2475F52" Guid="*">
<File Id="fil1E54A44405E471DD7C8CF3F308C3C96C" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstspeed.dll"/>
</Component>
- <Component Win64="$(var.Win64)" Id="cmp7ED52E6E97B8F8CB3C63AED55C2111EF" Guid="*">
- <File Id="filA330FEA223E3049D1285B2A466661033" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgststereo.dll"/>
- </Component>
<Component Win64="$(var.Win64)" Id="cmp9636A0A03B7F15CAF6857781F8B44D88" Guid="*">
<File Id="filC2AFE42D04669028B7372DDCD648EC2C" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstsubenc.dll"/>
</Component>
@@ -579,7 +573,6 @@
<ComponentGroupRef Id="CG.gsm"/>
<ComponentRef Id="cmpE39DF1299C0BDC69E6FF0EDB21C2B44C"/>
<ComponentRef Id="cmp705F0A830103CB63E5311A0F5D856051"/>
- <ComponentRef Id="cmpCF0950505CA3AAD329BD2CE5D1B4608A"/>
<ComponentRef Id="cmp363E6461D1E5D1974AB4C7E1BAF0A6C7"/>
<ComponentRef Id="cmp21FD03FF91768F04EFEECB1CBCF2E99C"/>
<ComponentRef Id="cmp12335C8DCBEC08051B25016C1ABEE398"/>
@@ -587,6 +580,7 @@
<ComponentRef Id="cmp53917300AE358650C927C34E74BBB7E4"/>
<ComponentRef Id="cmp98713F3053389CDE2696F9DFA9070528"/>
<ComponentRef Id="cmp782CD06F4684B8D06372D1AF46DB033F"/>
+ <ComponentRef Id="cmp11EC2FEEBE514933A2555D776F69C84C"/>
<ComponentRef Id="cmpA65BB2A10006E125524C1AECEC473AB8"/>
<ComponentRef Id="cmp7BA932DF4EFE4996E310E5FC393CC203"/>
<ComponentRef Id="cmpF5FCC6FFE2344FCD11D3E0CAFD634BA6"/>
@@ -603,8 +597,8 @@
<ComponentRef Id="cmp8CF560E80ED412A4766EB3F10B675A10"/>
<ComponentRef Id="cmp0A2FDB7B684211C4370B7703BCDA6669"/>
<ComponentRef Id="cmp0B6971ACAC29EF6C9F71818B1A7A50F5"/>
+ <ComponentRef Id="cmpD3169FDE8F254F6BAB999FDC971DC896"/>
<ComponentRef Id="cmp83B90DFB1EDBF160FA4CFCCD84AC9F77"/>
- <ComponentRef Id="cmp6E91331EBAE90B4042C77563B3B41347"/>
<ComponentRef Id="cmpF3A7DA356D8A5E9DA6767517F0FD91FB"/>
<ComponentRef Id="cmpD9F44A71152095BB1311504F5E2746D5"/>
<ComponentRef Id="cmp636E288E0B7C6AEB2990AF348215C9AA"/>
@@ -637,7 +631,6 @@
<ComponentRef Id="cmp2BE4E40CAEDD29B510E7D2B8EF41DCAA"/>
<ComponentRef Id="cmp88A44C9FDB695E9AE413FC989E426434"/>
<ComponentRef Id="cmpA51A4882249288BCBF783B2B8F6C3F58"/>
- <ComponentRef Id="cmpB446D8A310733F576D028DBCA35E6E65"/>
<ComponentRef Id="cmpD4E115B11B1C07D461165365952FB3D8"/>
<ComponentRef Id="cmp3EE8E68CC754693F270A95AF269F9338"/>
<ComponentRef Id="cmpB127DDDC0A2E1F900291F6BE245CB844"/>
@@ -650,7 +643,6 @@
<ComponentRef Id="cmp22B267EF33BACD5D1D66C8F5B11EA946"/>
<ComponentRef Id="cmp1D081C963C3D5EB41890240B28CE34F3"/>
<ComponentRef Id="cmpB098DB5DEDEAEF123797B73CA2475F52"/>
- <ComponentRef Id="cmp7ED52E6E97B8F8CB3C63AED55C2111EF"/>
<ComponentRef Id="cmp9636A0A03B7F15CAF6857781F8B44D88"/>
<ComponentRef Id="cmp0E39931874F2FB39E9BD3911778A5790"/>
<ComponentRef Id="cmp6ACAF6D1C4020E1CBBB56B9DFE590445"/>
--
2.25.3

67
0010-Add-brotli-files-missing-in-upstream-release-tarball.patch
View File

@ -1,67 +0,0 @@
From 9dba05055ac5fa8512b0338d988ad5913d8bbb34 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Thu, 23 Apr 2020 18:56:24 +0100
Subject: [PATCH] Add brotli files missing in upstream release tarball
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
data/Makefile.am | 1 +
data/wixl/brotli.wxi | 31 +++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 data/wixl/brotli.wxi
diff --git a/data/Makefile.am b/data/Makefile.am
index e409c64..6db1e91 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,6 +9,7 @@ dist_wxi_DATA = \
wixl/OpenEXR.wxi \
wixl/adwaita-icon-theme.wxi \
wixl/atk.wxi \
+ wixl/brotli.wxi \
wixl/bzip2.wxi \
wixl/cairo.wxi \
wixl/celt051.wxi \
diff --git a/data/wixl/brotli.wxi b/data/wixl/brotli.wxi
new file mode 100644
index 0000000..ac73167
--- /dev/null
+++ b/data/wixl/brotli.wxi
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <DirectoryRef Id="INSTALLDIR">
+ <Directory Id="dirD6DE5EE53EAC69C85D4723E67D18D7AD" Name="bin">
+ <Component Win64="$(var.Win64)" Id="cmpB336AC899DE387A813412D5D2C2C6CB8" Guid="*">
+ <File Id="fil0B31B0E7F00432B0ECED888858212B7E" KeyPath="yes" Source="$(var.SourceDir)/bin/brotli.exe"/>
+ </Component>
+ <Component Win64="$(var.Win64)" Id="cmpE91C930EC548A1F8EFBA853B5875B9DD" Guid="*">
+ <File Id="filD8C79A6706B907C99E9FFC29FF047AF0" KeyPath="yes" Source="$(var.SourceDir)/bin/libbrotlicommon.dll"/>
+ </Component>
+ <Component Win64="$(var.Win64)" Id="cmp283C38D965F9EF7F304458A8495E3B4E" Guid="*">
+ <File Id="filAA1A09F2669638ABB4B2AACBB3870989" KeyPath="yes" Source="$(var.SourceDir)/bin/libbrotlidec.dll"/>
+ </Component>
+ <Component Win64="$(var.Win64)" Id="cmp91DE05133FEDDE9752F704AB6E5805AD" Guid="*">
+ <File Id="filC470C4E5C88EDB60935E1B455E71B834" KeyPath="yes" Source="$(var.SourceDir)/bin/libbrotlienc.dll"/>
+ </Component>
+ </Directory>
+ </DirectoryRef>
+ </Fragment>
+ <Fragment>
+ <ComponentGroup Id="CG.brotli">
+ <ComponentRef Id="cmpB336AC899DE387A813412D5D2C2C6CB8"/>
+ <ComponentRef Id="cmpE91C930EC548A1F8EFBA853B5875B9DD"/>
+ <ComponentRef Id="cmp283C38D965F9EF7F304458A8495E3B4E"/>
+ <ComponentRef Id="cmp91DE05133FEDDE9752F704AB6E5805AD"/>
+ </ComponentGroup>
+ </Fragment>
+</Include>
+<!-- generated with msitools 0.99 -->
+<!-- wixl-heat -var var.SourceDir -p /usr/i686-w64-mingw32/sys-root/mingw/ -component-group CG.brotli -directory-ref INSTALLDIR -win64 -->
--
2.25.3

52
0011-wixl-switch-spice-glib-back-to-dsound-driver.patch
View File

@ -1,52 +0,0 @@
From ab255b17d5d0bf08ada407738f567af3c7221a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Wed, 13 May 2020 17:39:51 +0100
Subject: [PATCH] wixl: switch spice-glib back to dsound driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The libgstwasapi.dll sink has bad interactions with spice causing it to
stop playing audio after the first time the stream was opened and
closed. Revert back to dsound driver until there is some solution that
makes the wasapi driver reliable.
Fixes https://gitlab.com/virt-viewer/virt-viewer/-/issues/2
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
data/wixl/spice-glib.wxi | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/data/wixl/spice-glib.wxi b/data/wixl/spice-glib.wxi
index 8debe63..916e728 100644
--- a/data/wixl/spice-glib.wxi
+++ b/data/wixl/spice-glib.wxi
@@ -62,9 +62,13 @@
<Component Win64="$(var.Win64)" Id="cmp6E40650EE781D7A31FD8621801955090" Guid="*">
<File Id="fil5FE981BB233522C4A80C71349DDCDC94" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstautodetect.dll"/>
</Component>
-
<Component Win64="$(var.Win64)" Id="cmpEE8AD0322820C368BE403D5588B6C5A3" Guid="*">
- <File Id="FIL887859C95D334F8EAF8A10FAEC6F7CE9" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstwasapi.dll"/>
+ <File Id="filA999BEB07C46CC2A776985F40270F7ED" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstdirectsound.dll"/>
+ </Component>
+
+ <!-- gstreamer1-plugins-bad-free -->
+ <Component Win64="$(var.Win64)" Id="cmp83B339398D5E5381DD1E992E16858015" Guid="*">
+ <File Id="filF556FED35C41B9063691FFEB1488F4EF" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstdirectsoundsrc.dll"/>
</Component>
</Directory>
</Directory> <!-- INSTALLDIR/lib -->
@@ -122,6 +126,9 @@
<!-- from gstreamer1-plugins-good (lib) -->
<ComponentRef Id="cmp6E40650EE781D7A31FD8621801955090"/>
<ComponentRef Id="cmpEE8AD0322820C368BE403D5588B6C5A3"/>
+
+ <!-- from gstreamer1-plugins-bad-free (lib) -->
+ <ComponentRef Id="cmp83B339398D5E5381DD1E992E16858015"/>
</ComponentGroup>
</Fragment>
</Include>
--
2.26.2

57
msitools.spec
View File

@ -11,46 +11,25 @@
%endif
Name: msitools
Version: 0.100
Release: 8%{?dist}
Version: 0.101
Release: 1%{?dist}
Summary: Windows Installer tools
License: GPLv2+
URL: http://ftp.gnome.org/pub/GNOME/sources/%{name}
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}%{?_version_suffix}.tar.xz
# Some patches from upstream post 0.100
Patch0001: 0001-data-wixl-remove-nss-nspr.patch
Patch0002: 0002-ilmbase.wxi-update-v2.4.patch
Patch0003: 0003-OpenEXR.wxi-path-fixes-for-v2.4.patch
Patch0004: 0004-adwaita-icon-theme.wxi-update-to-v3.34.3.patch
Patch0005: 0005-libvirt.wxi-depends-on-glib2-these-days.patch
Patch0006: 0006-data-update-adwaita-icon-theme.wxi.patch
Patch0007: 0007-data-update-atk.wxi.patch
Patch0008: 0008-data-update-gdk-pixbuf-deps.patch
Patch0009: 0009-Update-file-manifest-for-gstreamer1-plugins-bad-free.patch
# Non-upstream patch to fix tarball missing the brotli.wxi file
# Upstream fixed as side effect of the switch to meson.
Patch0010: 0010-Add-brotli-files-missing-in-upstream-release-tarball.patch
Patch0011: 0011-wixl-switch-spice-glib-back-to-dsound-driver.patch
# from upstream
Patch0012: 0001-data-wixl-fix-wxi-for-rawhide.patch
Requires: libgsf >= 1.14.24-2
BuildRequires: make
BuildRequires: git
BuildRequires: git-core
BuildRequires: meson
BuildRequires: intltool
BuildRequires: glib2-devel
BuildRequires: gobject-introspection-devel
BuildRequires: intltool
BuildRequires: libgcab1-devel >= 0.2
BuildRequires: libgsf-devel
BuildRequires: libuuid-devel
BuildRequires: vala
BuildRequires: bison
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
%if %{with_validate}
BuildRequires: perl
@ -65,8 +44,6 @@ BuildRequires: mingw32-bzip2
BuildRequires: mingw64-bzip2
BuildRequires: mingw32-cairo
BuildRequires: mingw64-cairo
BuildRequires: mingw32-celt051
BuildRequires: mingw64-celt051
BuildRequires: mingw32-curl
BuildRequires: mingw64-curl
BuildRequires: mingw32-dlfcn
@ -213,6 +190,9 @@ BuildRequires: mingw32-zlib
BuildRequires: mingw64-zlib
%endif
# https://bugzilla.redhat.com/show_bug.cgi?id=1924216
ExcludeArch: s390x
%description
msitools is a collection of utilities to inspect and create Windows
Installer files. It is useful in a cross-compilation environment such
@ -238,28 +218,23 @@ The libmsi1-devel package includes the header files for libmsi.
%autosetup -S git_am -n msitools-%{version}%{?_version_suffix}
%build
autoreconf -i -f
%configure --enable-fast-install
make %{?_smp_mflags} V=1
%meson
%meson_build
%install
%make_install
rm -f %{buildroot}%{_libdir}/*.a
rm -f %{buildroot}%{_libdir}/*.la
%meson_install
%find_lang %{name}
%if %{with_validate}
%check
make -C data check-wxi
%meson_test
%endif
%ldconfig_scriptlets -n libmsi1
%files
%doc COPYING NEWS README.md TODO
%doc copyright NEWS README.md TODO
%{_bindir}/msibuild
%{_bindir}/msidiff
%{_bindir}/msidump
@ -271,19 +246,23 @@ make -C data check-wxi
%{_datadir}/wixl-%{version}%{?_version_suffix}
%files -n libmsi1 -f %{name}.lang
%doc COPYING.LIB
%{_libdir}/girepository-1.0/Libmsi-1.0.typelib
%{_libdir}/libmsi.so.0*
%files -n libmsi1-devel
%{_datadir}/gir-1.0/Libmsi-1.0.gir
%{_datadir}/vala/vapi/libmsi-1.0.vapi
%{_datadir}/vala/vapi/libmsi-1.0.deps
%{_includedir}/libmsi-1.0/*
%{_libdir}/libmsi.so
%{_libdir}/pkgconfig/libmsi-1.0.pc
%changelog
* Tue Feb 02 2021 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.101-1
- new version v0.101
- Fix FTBFS. rhbz#1923683
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.100-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (msitools-0.100.tar.xz) = a903a84aadb01a5b0d6591250466dabecfbf423588c5c47996d8cfb43770d5a1c4f7f8ad536cfc4659aa66326526be158495879d0dfd3f48c33eb8c3e4c2dfc2
SHA512 (msitools-0.101.tar.xz) = 4a68884cc22dc917f3d0637791f9ada4cd38a96bdf54832ac2c4266c9a44076e391588422039b3b958d39acf4ebe6ef8ccd3e0f3966d9d93a77faef0354262b7