[msitools] More f19 wxi updates

Marc-André Lureau elmarco at fedoraproject.org
Fri Apr 5 20:58:28 UTC 2013


commit fa76863029c96ed40a84f8e50e56c485ce988b40
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Fri Apr 5 22:57:58 2013 +0200

    More f19 wxi updates

 0003-share-wxi-fix-a-few-more-wxi-for-f19.patch |   39 +++++++++++++++++++++++
 msitools.spec                                   |    6 +++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/0003-share-wxi-fix-a-few-more-wxi-for-f19.patch b/0003-share-wxi-fix-a-few-more-wxi-for-f19.patch
new file mode 100644
index 0000000..cd9e0ed
--- /dev/null
+++ b/0003-share-wxi-fix-a-few-more-wxi-for-f19.patch
@@ -0,0 +1,39 @@
+From aa318c46b490807ecde198b90ab7c12f69ecd2dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau at 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
+
diff --git a/msitools.spec b/msitools.spec
index 339e355..c776089 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -1,6 +1,6 @@
 Name:           msitools
 Version:        0.92
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Windows Installer tools
 
 License:        GPLv2+
@@ -19,6 +19,7 @@ BuildRequires:  vala-tools
 
 Patch1:         0001-glib2.wxi-add-a-GLIB_ARCH-to-workaround-697156.patch
 Patch2:         0002-glib2.wxi-remove-obsolete-file.patch
+Patch3:         0003-share-wxi-fix-a-few-more-wxi-for-f19.patch
 
 %description
 msitools is a collection of utilities to inspect and create Windows
@@ -89,6 +90,9 @@ rm -f %{buildroot}%{_libdir}/*.la
 
 
 %changelog
+* Fri Apr  5 2013 Marc-André Lureau <marcandre.lureau at gmail.com> - 0.92-4
+- More f19 wxi updates
+
 * Thu Apr  4 2013 Marc-André Lureau <marcandre.lureau at gmail.com> - 0.92-3
 - Remove obsolete file in glib.wxi
 


More information about the scm-commits mailing list