Update to upstream 0.93.6-74a2, fixes RegLocator
This commit is contained in:
Marc-André Lureau
parent
3fc122a5f7
commit
9d390aa91d
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
|||||||
/msitools-0.92.tar.xz
|
/msitools-0.92.tar.xz
|
||||||
/msitools-0.92.26-940f.tar.xz
|
/msitools-0.92.26-940f.tar.xz
|
||||||
/msitools-0.93.tar.xz
|
/msitools-0.93.tar.xz
|
||||||
|
/msitools-0.93.6-74a2.tar.xz
|
||||||
|
|||||||
@ -1,36 +0,0 @@
|
|||||||
From 03da0f1ed92cfe61bffbebda824c0900865e5eab Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
|
|
||||||
Date: Wed, 3 Apr 2013 13:49:32 +0200
|
|
||||||
Subject: [PATCH] glib2.wxi: add a GLIB_ARCH to workaround #697156
|
|
||||||
|
|
||||||
---
|
|
||||||
data/wixl/glib2.wxi | 9 +++++++--
|
|
||||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/data/wixl/glib2.wxi b/data/wixl/glib2.wxi
|
|
||||||
index ead91b1..0d2058e 100644
|
|
||||||
--- a/data/wixl/glib2.wxi
|
|
||||||
+++ b/data/wixl/glib2.wxi
|
|
||||||
@@ -35,12 +35,17 @@
|
|
||||||
<Component Id="cmp641F505793C8C044C76414CB6C791C85" Guid="*">
|
|
||||||
<File Id="filA257891410A87696A3ADE5852462FBDE" KeyPath="yes" Source="$(var.SourceDir)/bin/gsettings.exe"/>
|
|
||||||
</Component>
|
|
||||||
+
|
|
||||||
+ <!-- FIXME: perhaps not correct to share component id for two
|
|
||||||
+ versions here, but we lack condition expression evaluation.
|
|
||||||
+ Also, see GLib bug 697156 to remove that unnecessary kludge -->
|
|
||||||
<Component Id="cmp6D51B76EDAC50E07576738CC967DF2B8" Guid="*">
|
|
||||||
- <File Id="fil4EE00EB97025D93A2059F8C6CE6CE4DF" KeyPath="yes" Source="$(var.SourceDir)/bin/gspawn-win32-helper-console.exe"/>
|
|
||||||
+ <File Id="fil4EE00EB97025D93A2059F8C6CE6CE4DF" KeyPath="yes" Source="$(var.SourceDir)/bin/gspawn-$(env.GLIB_ARCH)-helper-console.exe"/>
|
|
||||||
</Component>
|
|
||||||
<Component Id="cmpD2B981C370CD6226A814AE8B4C124DDE" Guid="*">
|
|
||||||
- <File Id="filEE7F8F0A2194C97E113C07E0A1CD6E6E" KeyPath="yes" Source="$(var.SourceDir)/bin/gspawn-win32-helper.exe"/>
|
|
||||||
+ <File Id="filEE7F8F0A2194C97E113C07E0A1CD6E6E" KeyPath="yes" Source="$(var.SourceDir)/bin/gspawn-$(env.GLIB_ARCH)-helper.exe"/>
|
|
||||||
</Component>
|
|
||||||
+
|
|
||||||
<Component Id="cmp4A6A2B5ACA14940BF3D57B9FF19C9689" Guid="*">
|
|
||||||
<File Id="filE25C44314299AD6EE8F900723C732123" KeyPath="yes" Source="$(var.SourceDir)/bin/libgio-2.0-0.dll"/>
|
|
||||||
</Component>
|
|
||||||
--
|
|
||||||
1.8.1.1.439.g50a6b54
|
|
||||||
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
From e3c4e69731b7ac458f8fd971ac19440beb4db792 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
|
|
||||||
Date: Thu, 4 Apr 2013 14:39:28 +0200
|
|
||||||
Subject: [PATCH] glib2.wxi: remove obsolete file
|
|
||||||
|
|
||||||
---
|
|
||||||
data/wixl/glib2.wxi | 4 ----
|
|
||||||
1 file changed, 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/data/wixl/glib2.wxi b/data/wixl/glib2.wxi
|
|
||||||
index 0d2058e..183e458 100644
|
|
||||||
--- a/data/wixl/glib2.wxi
|
|
||||||
+++ b/data/wixl/glib2.wxi
|
|
||||||
@@ -96,9 +96,6 @@
|
|
||||||
</Component>
|
|
||||||
</Directory>
|
|
||||||
<Directory Id="dirDC91424A11A0F53C9A234A9B2AE16588" Name="gettext">
|
|
||||||
- <Component Id="cmp27894D46045118E880E9597C49163940" Guid="*">
|
|
||||||
- <File Id="filF8B4A439C2FC8E3413F1690ADA673BDF" KeyPath="yes" Source="$(var.SourceDir)/share/glib-2.0/gettext/mkinstalldirs"/>
|
|
||||||
- </Component>
|
|
||||||
<Directory Id="dir6DED64F8CABFCE4F4C1904B8B3920654" Name="po">
|
|
||||||
<Component Id="cmp814A5CAB037A06029EF1E9006457A3AE" Guid="*">
|
|
||||||
<File Id="fil6F68985D09F4207CCD55C90C0BBDC38C" KeyPath="yes" Source="$(var.SourceDir)/share/glib-2.0/gettext/po/Makefile.in.in"/>
|
|
||||||
@@ -804,7 +801,6 @@
|
|
||||||
<ComponentRef Id="cmp058ABAE3E4BE796474C695380BAE5224"/>
|
|
||||||
<ComponentRef Id="cmpDA64D053823C9BB47669A576DFD79865"/>
|
|
||||||
<ComponentRef Id="cmp2C44A4EB3A7F3E66A8A1DE7FED951A85"/>
|
|
||||||
- <ComponentRef Id="cmp27894D46045118E880E9597C49163940"/>
|
|
||||||
<ComponentRef Id="cmp814A5CAB037A06029EF1E9006457A3AE"/>
|
|
||||||
<ComponentRef Id="cmpF88FF5AF54096E3F6FB53DF45E40A219"/>
|
|
||||||
<ComponentRef Id="cmpCF8F003E2F7DB70E0B9D552C18C1D6E9"/>
|
|
||||||
--
|
|
||||||
1.8.1.1.439.g50a6b54
|
|
||||||
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
From aa318c46b490807ecde198b90ab7c12f69ecd2dc Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
|
|
||||||
Date: Fri, 5 Apr 2013 22:35:32 +0200
|
|
||||||
Subject: [PATCH] share/wxi: fix a few more wxi for f19
|
|
||||||
|
|
||||||
---
|
|
||||||
data/wixl/gnutls.wxi | 2 +-
|
|
||||||
data/wixl/libtasn1.wxi | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/data/wixl/gnutls.wxi b/data/wixl/gnutls.wxi
|
|
||||||
index 8265fcf..a020449 100644
|
|
||||||
--- a/data/wixl/gnutls.wxi
|
|
||||||
+++ b/data/wixl/gnutls.wxi
|
|
||||||
@@ -7,7 +7,7 @@
|
|
||||||
<DirectoryRef Id="INSTALLDIR">
|
|
||||||
<Directory Id="dir6A4BB80DC22241BD2E3AE9ECF3DB60D5" Name="bin">
|
|
||||||
<Component Id="cmp845933D5BF01B8450C766D545EF5F537" Guid="*">
|
|
||||||
- <File Id="fil9C333DD6A36336E25CD821B997A40BC9" KeyPath="yes" Source="$(var.SourceDir)/bin/libgnutls-26.dll"/>
|
|
||||||
+ <File Id="fil9C333DD6A36336E25CD821B997A40BC9" KeyPath="yes" Source="$(var.SourceDir)/bin/libgnutls-28.dll"/>
|
|
||||||
</Component>
|
|
||||||
</Directory>
|
|
||||||
</DirectoryRef>
|
|
||||||
diff --git a/data/wixl/libtasn1.wxi b/data/wixl/libtasn1.wxi
|
|
||||||
index 7a319c4..e8aac24 100644
|
|
||||||
--- a/data/wixl/libtasn1.wxi
|
|
||||||
+++ b/data/wixl/libtasn1.wxi
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
<DirectoryRef Id="INSTALLDIR">
|
|
||||||
<Directory Id="dir353068C57C7655EF0641549FDAAB3898" Name="bin">
|
|
||||||
<Component Id="cmpA0ECA72D4779635FA3B2FDA40876FCC3" Guid="*">
|
|
||||||
- <File Id="fil4B149CE82CDBC6A91851CD63D11A682E" KeyPath="yes" Source="$(var.SourceDir)/bin/libtasn1-3.dll"/>
|
|
||||||
+ <File Id="fil4B149CE82CDBC6A91851CD63D11A682E" KeyPath="yes" Source="$(var.SourceDir)/bin/libtasn1-6.dll"/>
|
|
||||||
</Component>
|
|
||||||
</Directory>
|
|
||||||
</DirectoryRef>
|
|
||||||
--
|
|
||||||
1.8.1.1.439.g50a6b54
|
|
||||||
|
|
||||||
@ -1,8 +1,8 @@
|
|||||||
#define _version_suffix
|
%define _version_suffix -74a2
|
||||||
|
|
||||||
Name: msitools
|
Name: msitools
|
||||||
Version: 0.93
|
Version: 0.93.6
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Windows Installer tools
|
Summary: Windows Installer tools
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -85,6 +85,9 @@ rm -f %{buildroot}%{_libdir}/*.la
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 13 2013 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.93.6-1
|
||||||
|
- Update to upstream 0.93.6-74a2, fixes RegLocator
|
||||||
|
|
||||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.93-2
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.93-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user