From 9d390aa91d1694e3389c5431d7160ec368e5ac8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 13 Aug 2013 22:32:11 +0200 Subject: [PATCH] Update to upstream 0.93.6-74a2, fixes RegLocator --- .gitignore | 1 + ...add-a-GLIB_ARCH-to-workaround-697156.patch | 36 ----------------- 0002-glib2.wxi-remove-obsolete-file.patch | 34 ---------------- ...share-wxi-fix-a-few-more-wxi-for-f19.patch | 39 ------------------- msitools.spec | 9 +++-- sources | 2 +- 6 files changed, 8 insertions(+), 113 deletions(-) delete mode 100644 0001-glib2.wxi-add-a-GLIB_ARCH-to-workaround-697156.patch delete mode 100644 0002-glib2.wxi-remove-obsolete-file.patch delete mode 100644 0003-share-wxi-fix-a-few-more-wxi-for-f19.patch diff --git a/.gitignore b/.gitignore index 77f8501..4824172 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /msitools-0.92.tar.xz /msitools-0.92.26-940f.tar.xz /msitools-0.93.tar.xz +/msitools-0.93.6-74a2.tar.xz diff --git a/0001-glib2.wxi-add-a-GLIB_ARCH-to-workaround-697156.patch b/0001-glib2.wxi-add-a-GLIB_ARCH-to-workaround-697156.patch deleted file mode 100644 index b5178a8..0000000 --- a/0001-glib2.wxi-add-a-GLIB_ARCH-to-workaround-697156.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 03da0f1ed92cfe61bffbebda824c0900865e5eab Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -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 @@ - - - -+ -+ - -- -+ - - -- -+ - -+ - - - --- -1.8.1.1.439.g50a6b54 - diff --git a/0002-glib2.wxi-remove-obsolete-file.patch b/0002-glib2.wxi-remove-obsolete-file.patch deleted file mode 100644 index 5869406..0000000 --- a/0002-glib2.wxi-remove-obsolete-file.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e3c4e69731b7ac458f8fd971ac19440beb4db792 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -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 @@ - - - -- -- -- - - - -@@ -804,7 +801,6 @@ - - - -- - - - --- -1.8.1.1.439.g50a6b54 - 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 deleted file mode 100644 index cd9e0ed..0000000 --- a/0003-share-wxi-fix-a-few-more-wxi-for-f19.patch +++ /dev/null @@ -1,39 +0,0 @@ -From aa318c46b490807ecde198b90ab7c12f69ecd2dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -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 @@ - - - -- -+ - - - -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 @@ - - - -- -+ - - - --- -1.8.1.1.439.g50a6b54 - diff --git a/msitools.spec b/msitools.spec index 068d6ed..86243ad 100644 --- a/msitools.spec +++ b/msitools.spec @@ -1,8 +1,8 @@ -#define _version_suffix +%define _version_suffix -74a2 Name: msitools -Version: 0.93 -Release: 2%{?dist} +Version: 0.93.6 +Release: 1%{?dist} Summary: Windows Installer tools License: GPLv2+ @@ -85,6 +85,9 @@ rm -f %{buildroot}%{_libdir}/*.la %changelog +* Tue Aug 13 2013 Marc-André Lureau - 0.93.6-1 +- Update to upstream 0.93.6-74a2, fixes RegLocator + * Sat Aug 03 2013 Fedora Release Engineering - 0.93-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 768c7c4..ca2d953 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d30fb049fbad65ff8dd532bad20c4f0 msitools-0.93.tar.xz +6c85c7979c54ee68185426cc99f3aee6 msitools-0.93.6-74a2.tar.xz