The package rpms/msitools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/msitools.git/commit/?id=5189498b8....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit bfc01cdf31f20542ea695f9f0993878e51485649
Author: Daniel P. Berrang <berrange(a)redhat.com>
Date: Tue Feb 19 17:07:05 2019 +0000
Add back compat patches for Fedora 29
Signed-off-by: Daniel P. Berrang <berrange(a)redhat.com>
diff --git a/0001-Revert-wixl-fix-outdated-component-references-for-op.patch
b/0001-Revert-wixl-fix-outdated-component-references-for-op.patch
new file mode 100644
index 0000000..63b64e7
--- /dev/null
+++ b/0001-Revert-wixl-fix-outdated-component-references-for-op.patch
@@ -0,0 +1,34 @@
+From 2072e37f3d892b3de72dcaf666f7335427c8a043 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange(a)redhat.com>
+Date: Wed, 13 Feb 2019 14:34:58 +0000
+Subject: [PATCH 1/4] Revert "wixl: fix outdated component references for
+ openssl"
+
+This reverts commit a0babd1d6c2f22c3503fb37f37017906c50c60c7.
+---
+ data/wixl/openssl.wxi | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/data/wixl/openssl.wxi b/data/wixl/openssl.wxi
+index dc73432..ea3752e 100644
+--- a/data/wixl/openssl.wxi
++++ b/data/wixl/openssl.wxi
+@@ -59,9 +59,13 @@
+ <ComponentRef Id="cmp180069515EEF84E3D64434B53E32E2EF"/>
+ <ComponentRef Id="cmp78BC9637069A326E7860F7EDB381EF4C"/>
+ <ComponentRef Id="cmpF4AC5E1C8B8F52A9E82B6D444415195E"/>
++ <ComponentRef Id="cmp51EE25AA42FF1DCF63BC0701D92F38DF"/>
++ <ComponentRef Id="cmpC79B3522CE340E81091DFF33CE2D4F52"/>
+ <ComponentRef Id="cmpF3B98883A02530C5B7BE078B77A99EDD"/>
+- <ComponentRef Id="cmp395C7C6526C74892B8DDBA6FFD21F7A3"/>
+- <ComponentRef Id="cmp7CAB2ADC32B44CD4B4DB6AF40C4E601C"/>
++ <ComponentRef Id="cmp190CBC844CCD760C7D16A8E9394F990E"/>
++ <ComponentRef Id="cmp10823BB121D6DE4B1D37550D1F26F019"/>
++ <ComponentRef Id="cmp538527FD8935FED93D2E66881FFEBDEE"/>
++ <ComponentRef Id="cmp1914CA413F712D03ECF9A7AF1F97E0E9"/>
+ <ComponentRef Id="cmp227F1DE4BB99FCD6BCF1AE825C00875B"/>
+ <ComponentRef Id="cmp2E54F8C4A1D93038E7927F172A186E21"/>
+ </ComponentGroup>
+--
+2.20.1
+
diff --git a/0002-Revert-wixl-update-for-openssl-1.1-series.patch
b/0002-Revert-wixl-update-for-openssl-1.1-series.patch
new file mode 100644
index 0000000..cb520b9
--- /dev/null
+++ b/0002-Revert-wixl-update-for-openssl-1.1-series.patch
@@ -0,0 +1,74 @@
+From db94426a36959af5fe6fcda7c586cd21acf34b87 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange(a)redhat.com>
+Date: Wed, 13 Feb 2019 14:35:08 +0000
+Subject: [PATCH 2/4] Revert "wixl: update for openssl 1.1 series"
+
+This reverts commit d89d98fcbd8742f444978a40eb92853f79955b10.
+---
+ data/wixl/openssl.wxi | 36 ++++++++++++++++++++----------------
+ 1 file changed, 20 insertions(+), 16 deletions(-)
+
+diff --git a/data/wixl/openssl.wxi b/data/wixl/openssl.wxi
+index ea3752e..9aa931a 100644
+--- a/data/wixl/openssl.wxi
++++ b/data/wixl/openssl.wxi
+@@ -5,24 +5,10 @@
+ <DirectoryRef Id="INSTALLDIR">
+ <Directory Id="dirFB106BD26A5512624D152E1AE91311A5"
Name="bin">
+ <Component Win64="$(var.Win64)"
Id="cmp180069515EEF84E3D64434B53E32E2EF" Guid="*">
+- <?if $(var.Win64) = "yes"?>
+- <File Id="fil69C36901606A417E9E83EC70D1BE5216"
KeyPath="yes"
Source="$(var.SourceDir)/bin/libcrypto-1_1-x64.dll"/>
+- <?else?>
+- <File Id="fil69C36901606A417E9E83EC70D1BE5216"
KeyPath="yes" Source="$(var.SourceDir)/bin/libcrypto-1_1.dll"/>
+- <?endif?>
++ <File Id="filF246A0BB8301C4720D03942B4C7BA289"
KeyPath="yes" Source="$(var.SourceDir)/bin/libcrypto-10.dll"/>
+ </Component>
+ <Component Win64="$(var.Win64)"
Id="cmp78BC9637069A326E7860F7EDB381EF4C" Guid="*">
+- <?if $(var.Win64) = "yes"?>
+- <File Id="fil484753D5C92047DDAB492981DE4F6F5D"
KeyPath="yes" Source="$(var.SourceDir)/bin/libssl-1_1-x64.dll"/>
+- <?else?>
+- <File Id="fil484753D5C92047DDAB492981DE4F6F5D"
KeyPath="yes" Source="$(var.SourceDir)/bin/libssl-1_1.dll"/>
+- <?endif?>
+- </Component>
+- <Component Win64="$(var.Win64)"
Id="cmp395C7C6526C74892B8DDBA6FFD21F7A3" Guid="*">
+- <File Id="filC2F467A974504B50AEABE12358B930E7"
KeyPath="yes" Source="$(var.SourceDir)/bin/make-dummy-cert"/>
+- </Component>
+- <Component Win64="$(var.Win64)"
Id="cmp7CAB2ADC32B44CD4B4DB6AF40C4E601C" Guid="*">
+- <File Id="fil64A9A7E5238B40809519518423F98A04"
KeyPath="yes" Source="$(var.SourceDir)/bin/c_rehash"/>
++ <File Id="fil1A5B56C61D6C2137CE2B9BF16C510048"
KeyPath="yes" Source="$(var.SourceDir)/bin/libssl-10.dll"/>
+ </Component>
+ </Directory>
+ <Directory Id="dir4E367092058C305C8D4A39EA27BB2FE9"
Name="etc">
+@@ -34,11 +20,29 @@
+ <Component Win64="$(var.Win64)"
Id="cmpF4AC5E1C8B8F52A9E82B6D444415195E" Guid="*">
+ <File Id="fil92C36E70F9FD6288DBB69D80F59DCFD3"
KeyPath="yes"
Source="$(var.SourceDir)/etc/pki/tls/certs/Makefile"/>
+ </Component>
++ <Component Win64="$(var.Win64)"
Id="cmp51EE25AA42FF1DCF63BC0701D92F38DF" Guid="*">
++ <File Id="fil4ECDE8BF72A4B179006F58175D500678"
KeyPath="yes"
Source="$(var.SourceDir)/etc/pki/tls/certs/make-dummy-cert"/>
++ </Component>
+ </Directory>
+ <Directory Id="dir41A7BA1ECA217B267001D6C667CDA303"
Name="misc">
++ <Component Win64="$(var.Win64)"
Id="cmpC79B3522CE340E81091DFF33CE2D4F52" Guid="*">
++ <File Id="filFE341124787DB99FE63D7FE53F069F33"
KeyPath="yes" Source="$(var.SourceDir)/etc/pki/tls/misc/CA"/>
++ </Component>
+ <Component Win64="$(var.Win64)"
Id="cmpF3B98883A02530C5B7BE078B77A99EDD" Guid="*">
+ <File Id="fil3371D8AAA32C7E5720A6BFDB1FA157D3"
KeyPath="yes" Source="$(var.SourceDir)/etc/pki/tls/misc/CA.pl"/>
+ </Component>
++ <Component Win64="$(var.Win64)"
Id="cmp190CBC844CCD760C7D16A8E9394F990E" Guid="*">
++ <File Id="fil56573F782B198F089006988E56A2FDC8"
KeyPath="yes" Source="$(var.SourceDir)/etc/pki/tls/misc/c_hash"/>
++ </Component>
++ <Component Win64="$(var.Win64)"
Id="cmp10823BB121D6DE4B1D37550D1F26F019" Guid="*">
++ <File Id="filE2605C9FD1B54943EB75E918E5AAAF3F"
KeyPath="yes" Source="$(var.SourceDir)/etc/pki/tls/misc/c_info"/>
++ </Component>
++ <Component Win64="$(var.Win64)"
Id="cmp538527FD8935FED93D2E66881FFEBDEE" Guid="*">
++ <File Id="filD6292C99C5FA763F88632B21325F09B2"
KeyPath="yes"
Source="$(var.SourceDir)/etc/pki/tls/misc/c_issuer"/>
++ </Component>
++ <Component Win64="$(var.Win64)"
Id="cmp1914CA413F712D03ECF9A7AF1F97E0E9" Guid="*">
++ <File Id="filEB3FDB654D06431F28296F4D99F065C4"
KeyPath="yes" Source="$(var.SourceDir)/etc/pki/tls/misc/c_name"/>
++ </Component>
+ <Component Win64="$(var.Win64)"
Id="cmp227F1DE4BB99FCD6BCF1AE825C00875B" Guid="*">
+ <File Id="fil9FDCC7B3E5AD0709F2E5CBA6544A552F"
KeyPath="yes" Source="$(var.SourceDir)/etc/pki/tls/misc/tsget"/>
+ </Component>
+--
+2.20.1
+
diff --git a/0003-Add-missing-dep-on-gcc-for-openssl.patch
b/0003-Add-missing-dep-on-gcc-for-openssl.patch
new file mode 100644
index 0000000..1d4fde0
--- /dev/null
+++ b/0003-Add-missing-dep-on-gcc-for-openssl.patch
@@ -0,0 +1,30 @@
+From 022fe814f8256d53d3b6d8e0b53d9937027be71a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange(a)redhat.com>
+Date: Wed, 13 Feb 2019 15:43:51 +0000
+Subject: [PATCH 3/4] Add missing dep on gcc for openssl
+
+---
+ data/wixl/openssl.wxi | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/data/wixl/openssl.wxi b/data/wixl/openssl.wxi
+index 9aa931a..70ca301 100644
+--- a/data/wixl/openssl.wxi
++++ b/data/wixl/openssl.wxi
+@@ -1,4 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
++<?require gcc.wxi?>
+ <?require zlib.wxi?>
+ <Include
xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+@@ -60,6 +61,7 @@
+ <Fragment>
+ <ComponentGroup Id="CG.openssl">
+ <ComponentGroupRef Id="CG.zlib"/>
++ <ComponentGroupRef Id="CG.gcc"/>
+ <ComponentRef Id="cmp180069515EEF84E3D64434B53E32E2EF"/>
+ <ComponentRef Id="cmp78BC9637069A326E7860F7EDB381EF4C"/>
+ <ComponentRef Id="cmpF4AC5E1C8B8F52A9E82B6D444415195E"/>
+--
+2.20.1
+
diff --git a/0004-Remove-spice-dep-on-json-which-doesn-t-exist-in-f29-.patch
b/0004-Remove-spice-dep-on-json-which-doesn-t-exist-in-f29-.patch
new file mode 100644
index 0000000..d47fc45
--- /dev/null
+++ b/0004-Remove-spice-dep-on-json-which-doesn-t-exist-in-f29-.patch
@@ -0,0 +1,32 @@
+From 7f9d0efe3f9dcd9477bb126359540ed3b88350dd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange(a)redhat.com>
+Date: Wed, 13 Feb 2019 15:51:21 +0000
+Subject: [PATCH 4/4] Remove spice dep on json which doesn't exist in f29 tree
+
+---
+ data/wixl/spice-glib.wxi | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/wixl/spice-glib.wxi b/data/wixl/spice-glib.wxi
+index 8debe63..c33a57e 100644
+--- a/data/wixl/spice-glib.wxi
++++ b/data/wixl/spice-glib.wxi
+@@ -6,7 +6,6 @@
+ <?require libjpeg-turbo.wxi?>
+ <?require opus.wxi?>
+ <?require orc.wxi?>
+-<?require json-glib.wxi?>
+ <?require hicolor-icon-theme.wxi?>
+ <Include
xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+@@ -97,7 +96,6 @@
+ <ComponentGroupRef Id="CG.pixman"/>
+ <ComponentGroupRef Id="CG.libjpeg-turbo"/>
+ <ComponentGroupRef Id="CG.opus"/>
+- <ComponentGroupRef Id="CG.json-glib"/>
+ <ComponentGroupRef Id="CG.hicolor-icon-theme"/>
+ <!-- from spice -->
+ <ComponentRef Id="cmp102591AAF331792A897FB24554275832"/>
+--
+2.20.1
+
diff --git a/msitools.spec b/msitools.spec
index 4de5e71..c8b88fc 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -19,6 +19,10 @@ License: GPLv2+
URL:
http://ftp.gnome.org/pub/GNOME/sources/%{name}
Source0:
http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{versi...
+Patch1: 0001-Revert-wixl-fix-outdated-component-references-for-op.patch
+Patch2: 0002-Revert-wixl-update-for-openssl-1.1-series.patch
+Patch3: 0003-Add-missing-dep-on-gcc-for-openssl.patch
+Patch4: 0004-Remove-spice-dep-on-json-which-doesn-t-exist-in-f29-.patch
Requires: libgsf >= 1.14.24-2
BuildRequires: glib2-devel
@@ -220,6 +224,10 @@ The libmsi1-devel package includes the header files for libmsi.
%prep
%setup -q -n msitools-%{version}%{?_version_suffix}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
%configure --enable-fast-install
commit 5189498b8221910294ccf685da016cd78c3df04d
Author: Daniel P. Berrang <berrange(a)redhat.com>
Date: Tue Feb 19 16:43:14 2019 +0000
Enable wxi validation duringn build
The Koschei service will perform automated rebuilds periodically and
thus report FTBFS whenever some mingw package changes in a way that will
break the wxi files.
Signed-off-by: Daniel P. Berrang <berrange(a)redhat.com>
diff --git a/msitools.spec b/msitools.spec
index e7652fd..4de5e71 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -1,8 +1,18 @@
#define _version_suffix
+# The mingw* RPMs are noarch, and the wxi data files are
+# arch independant, so it is a waste of CPU cycles to run
+# validation on all arches. Just run on x86_64 since that
+# has the fastest Fedora builders.
+%ifarch x86_64
+%define with_validate 1
+%else
+%define with_validate 0
+%endif
+
Name: msitools
Version: 0.99
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Windows Installer tools
License: GPLv2+
@@ -20,6 +30,173 @@ BuildRequires: libuuid-devel
BuildRequires: vala
BuildRequires: bison
+%if %{with_validate}
+BuildRequires: perl
+BuildRequires: perl-XML-XPath
+BuildRequires: mingw32-adwaita-icon-theme
+BuildRequires: mingw64-adwaita-icon-theme
+BuildRequires: mingw32-atk
+BuildRequires: mingw64-atk
+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
+BuildRequires: mingw64-dlfcn
+BuildRequires: mingw32-expat
+BuildRequires: mingw64-expat
+BuildRequires: mingw32-fontconfig
+BuildRequires: mingw64-fontconfig
+BuildRequires: mingw32-freetype
+BuildRequires: mingw64-freetype
+BuildRequires: mingw32-gcc-c++
+BuildRequires: mingw64-gcc-c++
+BuildRequires: mingw32-gcc
+BuildRequires: mingw64-gcc
+BuildRequires: mingw32-gdk-pixbuf
+BuildRequires: mingw64-gdk-pixbuf
+BuildRequires: mingw32-gettext
+BuildRequires: mingw64-gettext
+BuildRequires: mingw32-glib2
+BuildRequires: mingw64-glib2
+BuildRequires: mingw32-glib-networking
+BuildRequires: mingw64-glib-networking
+BuildRequires: mingw32-gmp
+BuildRequires: mingw64-gmp
+BuildRequires: mingw32-gnutls
+BuildRequires: mingw64-gnutls
+BuildRequires: mingw32-gsm
+BuildRequires: mingw64-gsm
+BuildRequires: mingw32-gstreamer1-plugins-bad-free
+BuildRequires: mingw64-gstreamer1-plugins-bad-free
+BuildRequires: mingw32-gstreamer1-plugins-base
+BuildRequires: mingw64-gstreamer1-plugins-base
+BuildRequires: mingw32-gstreamer1-plugins-good
+BuildRequires: mingw64-gstreamer1-plugins-good
+BuildRequires: mingw32-gstreamer1
+BuildRequires: mingw64-gstreamer1
+BuildRequires: mingw32-gstreamer-plugins-bad-free
+BuildRequires: mingw64-gstreamer-plugins-bad-free
+BuildRequires: mingw32-gstreamer-plugins-base
+BuildRequires: mingw64-gstreamer-plugins-base
+BuildRequires: mingw32-gstreamer-plugins-good
+BuildRequires: mingw64-gstreamer-plugins-good
+BuildRequires: mingw32-gstreamer
+BuildRequires: mingw64-gstreamer
+BuildRequires: mingw32-gtk2
+BuildRequires: mingw64-gtk2
+BuildRequires: mingw32-gtk3
+BuildRequires: mingw64-gtk3
+BuildRequires: mingw32-gtk-vnc2
+BuildRequires: mingw64-gtk-vnc2
+BuildRequires: mingw32-gtk-vnc
+BuildRequires: mingw64-gtk-vnc
+BuildRequires: mingw32-gvnc
+BuildRequires: mingw64-gvnc
+BuildRequires: mingw32-harfbuzz
+BuildRequires: mingw64-harfbuzz
+BuildRequires: mingw32-hicolor-icon-theme
+BuildRequires: mingw64-hicolor-icon-theme
+BuildRequires: mingw32-icu
+BuildRequires: mingw64-icu
+BuildRequires: mingw32-ilmbase
+BuildRequires: mingw64-ilmbase
+BuildRequires: mingw32-jasper
+BuildRequires: mingw64-jasper
+BuildRequires: mingw32-json-glib
+BuildRequires: mingw64-json-glib
+BuildRequires: mingw32-libepoxy
+BuildRequires: mingw64-libepoxy
+BuildRequires: mingw32-libffi
+BuildRequires: mingw64-libffi
+BuildRequires: mingw32-libgcrypt
+BuildRequires: mingw64-libgcrypt
+BuildRequires: mingw32-libgovirt
+BuildRequires: mingw64-libgovirt
+BuildRequires: mingw32-libgpg-error
+BuildRequires: mingw64-libgpg-error
+BuildRequires: mingw32-libidn2
+BuildRequires: mingw64-libidn2
+BuildRequires: mingw32-libjpeg-turbo
+BuildRequires: mingw64-libjpeg-turbo
+BuildRequires: mingw32-libogg
+BuildRequires: mingw64-libogg
+BuildRequires: mingw32-libpng
+BuildRequires: mingw64-libpng
+BuildRequires: mingw32-libsoup
+BuildRequires: mingw64-libsoup
+BuildRequires: mingw32-libssh2
+BuildRequires: mingw64-libssh2
+BuildRequires: mingw32-libtasn1
+BuildRequires: mingw64-libtasn1
+BuildRequires: mingw32-libtheora
+BuildRequires: mingw64-libtheora
+BuildRequires: mingw32-libtiff
+BuildRequires: mingw64-libtiff
+BuildRequires: mingw32-libusbx
+BuildRequires: mingw64-libusbx
+BuildRequires: mingw32-libvirt-glib
+BuildRequires: mingw64-libvirt-glib
+BuildRequires: mingw32-libvirt
+BuildRequires: mingw64-libvirt
+BuildRequires: mingw32-libvorbis
+BuildRequires: mingw64-libvorbis
+BuildRequires: mingw32-libxml2
+BuildRequires: mingw64-libxml2
+BuildRequires: mingw32-nettle
+BuildRequires: mingw64-nettle
+BuildRequires: mingw32-nspr
+BuildRequires: mingw64-nspr
+BuildRequires: mingw32-OpenEXR
+BuildRequires: mingw64-OpenEXR
+BuildRequires: mingw32-openssl
+BuildRequires: mingw64-openssl
+BuildRequires: mingw32-opus
+BuildRequires: mingw64-opus
+BuildRequires: mingw32-orc
+BuildRequires: mingw64-orc
+BuildRequires: mingw32-p11-kit
+BuildRequires: mingw64-p11-kit
+BuildRequires: mingw32-pango
+BuildRequires: mingw64-pango
+BuildRequires: mingw32-pcre
+BuildRequires: mingw64-pcre
+BuildRequires: mingw32-pixman
+BuildRequires: mingw64-pixman
+BuildRequires: mingw32-portablexdr
+BuildRequires: mingw64-portablexdr
+BuildRequires: mingw32-readline
+BuildRequires: mingw64-readline
+BuildRequires: mingw32-rest
+BuildRequires: mingw64-rest
+BuildRequires: mingw32-SDL
+BuildRequires: mingw64-SDL
+BuildRequires: mingw32-speex
+BuildRequires: mingw64-speex
+BuildRequires: mingw32-spice-glib
+BuildRequires: mingw64-spice-glib
+BuildRequires: mingw32-spice-gtk3
+BuildRequires: mingw64-spice-gtk3
+BuildRequires: mingw32-sqlite
+BuildRequires: mingw64-sqlite
+BuildRequires: mingw32-termcap
+BuildRequires: mingw64-termcap
+BuildRequires: mingw32-usbredir
+BuildRequires: mingw64-usbredir
+BuildRequires: mingw32-wavpack
+BuildRequires: mingw64-wavpack
+BuildRequires: mingw32-win-iconv
+BuildRequires: mingw64-win-iconv
+BuildRequires: mingw32-winpthreads
+BuildRequires: mingw64-winpthreads
+BuildRequires: mingw32-zlib
+BuildRequires: mingw64-zlib
+%endif
+
%description
msitools is a collection of utilities to inspect and create Windows
Installer files. It is useful in a cross-compilation environment such
@@ -57,6 +234,11 @@ rm -f %{buildroot}%{_libdir}/*.la
%find_lang %{name}
+%if %{with_validate}
+%check
+make -C data check-wxi
+%endif
+
%ldconfig_scriptlets -n libmsi1
%files
@@ -85,6 +267,9 @@ rm -f %{buildroot}%{_libdir}/*.la
%changelog
+* Tue Feb 19 2019 Daniel P. Berrang <berrange(a)redhat.com> - 0.99-2
+- Validate wxi files during build
+
* Fri Feb 15 2019 Marc-Andr Lureau <marcandre.lureau(a)redhat.com> - 0.99-1
- new version
commit cad0717305a28fe1454f5ae792a83f90a796da93
Author: Marc-Andr Lureau <marcandre.lureau(a)redhat.com>
Date: Fri Feb 15 11:27:57 2019 +0100
Add BuildRequires: bison
Signed-off-by: Marc-Andr Lureau <marcandre.lureau(a)redhat.com>
diff --git a/msitools.spec b/msitools.spec
index bbffa33..e7652fd 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -18,6 +18,7 @@ BuildRequires: libgcab1-devel >= 0.2
BuildRequires: libgsf-devel
BuildRequires: libuuid-devel
BuildRequires: vala
+BuildRequires: bison
%description
msitools is a collection of utilities to inspect and create Windows
commit 3390dc1458974f7f8260300bc00f90aea87e51ae
Author: Marc-Andr Lureau <marcandre.lureau(a)redhat.com>
Date: Fri Feb 15 11:12:16 2019 +0100
new version 0.99
Signed-off-by: Marc-Andr Lureau <marcandre.lureau(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 6921526..0d9719d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/msitools-0.96.tar.xz
/msitools-0.97.tar.xz
/msitools-0.98.tar.xz
+/msitools-0.99.tar.xz
diff --git a/msitools.spec b/msitools.spec
index dd13fb5..bbffa33 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -1,8 +1,8 @@
#define _version_suffix
Name: msitools
-Version: 0.98
-Release: 3%{?dist}
+Version: 0.99
+Release: 1%{?dist}
Summary: Windows Installer tools
License: GPLv2+
@@ -84,6 +84,9 @@ rm -f %{buildroot}%{_libdir}/*.la
%changelog
+* Fri Feb 15 2019 Marc-Andr Lureau <marcandre.lureau(a)redhat.com> - 0.99-1
+- new version
+
* Mon Feb 04 2019 Kalev Lember <klember(a)redhat.com> - 0.98-3
- Update BRs for vala packaging changes
diff --git a/sources b/sources
index 1330679..56612f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (msitools-0.98.tar.xz) =
4f15a2a191d0cf6f6425669b9cb384df90fc871cb3985a91e1655cced4293f0f39b3e49297bd39a5725e6815fcce16f751471bc83becb0ae24805ed341d921e1
+SHA512 (msitools-0.99.tar.xz) =
29c6006591cdf9f8dec1a19c398fbb719879275de43d880ca4cc9fa8b8985021064523050eab4ca68d1c243603070a5d56102cd792d4dc78e75b1bdca08b2247
commit 857a9de03393e2fab8d5cf2414abf54353043616
Author: Kalev Lember <klember(a)redhat.com>
Date: Mon Feb 4 13:11:51 2019 +0100
Update BRs for vala packaging changes
diff --git a/msitools.spec b/msitools.spec
index fdf8bc6..dd13fb5 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -2,7 +2,7 @@
Name: msitools
Version: 0.98
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Windows Installer tools
License: GPLv2+
@@ -17,7 +17,7 @@ BuildRequires: intltool
BuildRequires: libgcab1-devel >= 0.2
BuildRequires: libgsf-devel
BuildRequires: libuuid-devel
-BuildRequires: vala-tools
+BuildRequires: vala
%description
msitools is a collection of utilities to inspect and create Windows
@@ -84,6 +84,9 @@ rm -f %{buildroot}%{_libdir}/*.la
%changelog
+* Mon Feb 04 2019 Kalev Lember <klember(a)redhat.com> - 0.98-3
+- Update BRs for vala packaging changes
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.98-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 4c7fa9d01211f04c969f30c5cffd7893d1e37c87
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 1 11:38:17 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/msitools.spec b/msitools.spec
index 2e07a6b..fdf8bc6 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -2,7 +2,7 @@
Name: msitools
Version: 0.98
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Windows Installer tools
License: GPLv2+
@@ -84,6 +84,9 @@ rm -f %{buildroot}%{_libdir}/*.la
%changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.98-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Thu Aug 02 2018 Victor Toso <victortoso(a)redhat.com> - 0.98-1
- Update to 0.98
commit 0b45a749d8548e99251efa8052bece4dfc92ca68
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Tue Jan 22 18:40:27 2019 +0100
Remove obsolete ldconfig scriptlets
References:
https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/msitools.spec b/msitools.spec
index 62606cd..2e07a6b 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -56,8 +56,7 @@ rm -f %{buildroot}%{_libdir}/*.la
%find_lang %{name}
-%post -n libmsi1 -p /sbin/ldconfig
-%postun -n libmsi1 -p /sbin/ldconfig
+%ldconfig_scriptlets -n libmsi1
%files
%doc COPYING NEWS README TODO