diff --git a/0006-wxi-add-pcre.wxi.patch b/0006-wxi-add-pcre.wxi.patch new file mode 100644 index 0000000..20c8873 --- /dev/null +++ b/0006-wxi-add-pcre.wxi.patch @@ -0,0 +1,76 @@ +From fde23efd4e5fa07d0caeb3afbf0bf202b860d064 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= +Date: Mon, 20 Jun 2016 11:44:53 +0200 +Subject: [PATCH 6/7] wxi: add pcre.wxi +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +pcre is needed as it's a new dep of glib2 since 2.48.0. + +Signed-off-by: Fabiano Fidêncio +Acked-by: Marc-André Lureau +--- + data/Makefile.am | 1 + + data/wixl/pcre.wxi | 37 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 38 insertions(+) + create mode 100644 data/wixl/pcre.wxi + +diff --git a/data/Makefile.am b/data/Makefile.am +index 19fa3ff..f680337 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -62,6 +62,7 @@ dist_wxi_DATA = \ + wixl/orc.wxi \ + wixl/p11-kit.wxi \ + wixl/pango.wxi \ ++ wixl/pcre.wxi \ + wixl/pixman.wxi \ + wixl/portablexdr.wxi \ + wixl/pthreads.wxi \ +diff --git a/data/wixl/pcre.wxi b/data/wixl/pcre.wxi +new file mode 100644 +index 0000000..26ae70d +--- /dev/null ++++ b/data/wixl/pcre.wxi +@@ -0,0 +1,37 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +-- +2.7.4 + diff --git a/0007-wxi-add-pcre-as-glib2-dep.patch b/0007-wxi-add-pcre-as-glib2-dep.patch new file mode 100644 index 0000000..3814b3a --- /dev/null +++ b/0007-wxi-add-pcre-as-glib2-dep.patch @@ -0,0 +1,39 @@ +From c27852a6b4cf8a4d179d43fa13b4e6ea9fb0e99a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= +Date: Mon, 20 Jun 2016 11:46:19 +0200 +Subject: [PATCH 7/7] wxi: add pcre as glib2 dep +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +pcre is a new dep since 2.48.0 + +Signed-off-by: Fabiano Fidêncio +Acked-by: Marc-André Lureau +--- + data/wixl/glib2.wxi | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/data/wixl/glib2.wxi b/data/wixl/glib2.wxi +index b0ace65..66a58ac 100644 +--- a/data/wixl/glib2.wxi ++++ b/data/wixl/glib2.wxi +@@ -1,6 +1,7 @@ + + + ++ + + + +@@ -776,6 +777,7 @@ + + + ++ + + + +-- +2.7.4 + diff --git a/msitools.spec b/msitools.spec index d87fceb..66aa6a2 100644 --- a/msitools.spec +++ b/msitools.spec @@ -2,7 +2,7 @@ Name: msitools Version: 0.95 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Windows Installer tools License: GPLv2+ @@ -14,6 +14,8 @@ Patch0002: 0002-wxi-update-nettle-to-3.2.1.patch Patch0003: 0003-wxi-Remove-non-existent-libvirt-glib-translations.patch Patch0004: 0004-wxi-Fix-translation-s-path-for-libvirt-glib.patch Patch0005: 0005-wxi-Add-adwaita-icon-theme.patch +Patch0006: 0006-wxi-add-pcre.wxi.patch +Patch0007: 0007-wxi-add-pcre-as-glib2-dep.patch Requires: libgsf >= 1.14.24-2 @@ -54,6 +56,8 @@ The libmsi1-devel package includes the header files for libmsi. %patch0003 -p1 %patch0004 -p1 %patch0005 -p1 +%patch0006 -p1 +%patch0007 -p1 %build %configure --enable-fast-install @@ -97,6 +101,9 @@ rm -f %{buildroot}%{_libdir}/*.la %changelog +* Wed Jun 22 2016 Fabiano Fidêncio - 0.95-5 +- Add libpcre as glib dependency + * Mon May 02 2016 Fabiano Fidêncio - 0.95-4 - Fix libvirt-glib's translations - Add adwaita-icon-theme