0.97-2: Add a patch to fix spice packaging

This commit is contained in:
Marc-André Lureau 2017-07-31 14:00:35 +02:00
parent 3898bee3f6
commit 19529493f2
2 changed files with 64 additions and 1 deletions

View File

@ -0,0 +1,57 @@
From 4b0f1727b78de0b21d97400aefcc96def9531b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Mon, 31 Jul 2017 13:55:00 +0200
Subject: [PATCH] wxi: update spice-glib to ship with gstvideo
---
data/wixl/spice-glib.wxi | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/data/wixl/spice-glib.wxi b/data/wixl/spice-glib.wxi
index 6c921ff..ac9f360 100644
--- a/data/wixl/spice-glib.wxi
+++ b/data/wixl/spice-glib.wxi
@@ -6,6 +6,7 @@
<?require libjpeg-turbo.wxi?>
<?require celt051.wxi?>
<?require opus.wxi?>
+<?require orc.wxi?>
<?require hicolor-icon-theme.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
@@ -35,6 +36,9 @@
<Component Win64="$(var.Win64)" Id="cmp93FAE555B2F925E239C97B777E49DB05" Guid="*">
<File Id="fil99891F7CDB47EF478CE6AD8F7FE84996" KeyPath="yes" Source="$(var.SourceDir)/bin/libgsttag-1.0-0.dll"/>
</Component>
+ <Component Win64="$(var.Win64)" Id="cmp64B9B34C8CDDC860E1091D916AD18974" Guid="*">
+ <File Id="filD084197A284B069DC169CC8A9FB52E1B" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstvideo-1.0-0.dll"/>
+ </Component>
<!-- gst-plugins-good -->
</Directory> <!-- INSTALLDIR/bin -->
@@ -100,9 +104,6 @@
<ComponentRef Id="cmpD9079AE5EA50B2FAF0D89AA30A612B73"/>
<ComponentRef Id="cmpF49F1DE553A3EB7F69C116932A799ADF"/>
- <!-- from gstreamer1 (lib) -->
- <ComponentRef Id="cmp0ACFE00C63B8A3232D2DEB869037D87C"/>
-
<!-- from gstreamer1-plugins-base (bin) -->
<ComponentRef Id="cmp41BC989F8EA49BB2E49028C69193B3BB"/>
<ComponentRef Id="cmpD6B03E1492CA64AF46E4C18AEFBDC51E"/>
@@ -111,10 +112,12 @@
<ComponentRef Id="cmp93FAE555B2F925E239C97B777E49DB05"/>
<!-- from gstreamer1-plugins-base (lib) -->
+ <ComponentGroupRef Id="CG.orc"/>
<ComponentRef Id="cmpDBE70B8247EC74A22BC700164134F68A"/>
<ComponentRef Id="cmp4B0C983D765E7C44897E9143F454A027"/>
<ComponentRef Id="cmp8F07634CD23193CA1415D2F0F473FDC3"/>
<ComponentRef Id="cmp577891EDF25587C451F9CD9ADEC17950"/>
+ <ComponentRef Id="cmp64B9B34C8CDDC860E1091D916AD18974"/>
<!-- from gstreamer1-plugins-good (lib) -->
<ComponentRef Id="cmp6E40650EE781D7A31FD8621801955090"/>
--
2.14.0.rc0.1.g40ca67566

View File

@ -2,7 +2,7 @@
Name: msitools
Version: 0.97
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Windows Installer tools
License: GPLv2+
@ -19,6 +19,8 @@ BuildRequires: libgsf-devel
BuildRequires: libuuid-devel
BuildRequires: vala-tools
Patch0001: 0001-wxi-update-spice-glib-to-ship-with-gstvideo.patch
%description
msitools is a collection of utilities to inspect and create Windows
Installer files. It is useful in a cross-compilation environment such
@ -42,6 +44,7 @@ The libmsi1-devel package includes the header files for libmsi.
%prep
%setup -q -n msitools-%{version}%{?_version_suffix}
%patch0001 -p1
%build
%configure --enable-fast-install
@ -85,6 +88,9 @@ rm -f %{buildroot}%{_libdir}/*.la
%changelog
* Mon Jul 31 2017 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.97-2
- Add a patch to fix spice packaging
* Mon Jul 31 2017 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.97-1
- Upstream release 0.97