rpms/msitools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add libepoxy (wxi and as gtk3 dep)

Browse Source
This commit is contained in:
Fabiano Fidêncio 2015-06-19 19:27:02 +02:00
parent 1bc835b2a3
commit 36c7977d6c
3 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
0001-wxi-add-libepoxy.wxi.patch Normal file
View File

@ -0,0 +1,49 @@
From 89ead8332ab03fcb40e3a18d71d0d9da1f2a090f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
Date: Fri, 19 Jun 2015 19:12:21 +0200
Subject: [PATCH 1/2] wxi: add libepoxy.wxi
---
data/Makefile.am | 1 +
data/wixl/libepoxy.wxi | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
create mode 100644 data/wixl/libepoxy.wxi
diff --git a/data/Makefile.am b/data/Makefile.am
index f42d962..aed5ced 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,6 +34,7 @@ dist_wxi_DATA = \
wixl/hicolor-icon-theme.wxi \
wixl/jasper.wxi \
wixl/libcacard.wxi \
+ wixl/libepoxy.wxi \
wixl/libffi.wxi \
wixl/libgcrypt.wxi \
wixl/libgpg-error.wxi \
diff --git a/data/wixl/libepoxy.wxi b/data/wixl/libepoxy.wxi
new file mode 100644
index 0000000..c15a052
--- /dev/null
+++ b/data/wixl/libepoxy.wxi
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <DirectoryRef Id="INSTALLDIR">
+ <Directory Id="dirA22A42337F76135BC4EA895EBCE82DDB" Name="bin">
+ <Component Win64="$(var.Win64)" Id="cmp6807DA99D2CA4CEF9F12AB8FE95452AF" Guid="*">
+ <File Id="fil0AE663249FAF801004F1DCEB5AB464D3" KeyPath="yes" Source="$(var.SourceDir)/bin/libepoxy-0.dll"/>
+ </Component>
+ </Directory>
+ </DirectoryRef>
+ </Fragment>
+ <Fragment>
+ <ComponentGroup Id="CG.libepoxy">
+ <ComponentRef Id="cmp6807DA99D2CA4CEF9F12AB8FE95452AF"/>
+ </ComponentGroup>
+ </Fragment>
+</Include>
--
2.4.4

32
0002-wxi-add-libepoxy-as-gtk3-dep.patch Normal file
View File

@ -0,0 +1,32 @@
From fcf95ff8dc4a7ff4b28f3b593dd2f54b368d7503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
Date: Fri, 19 Jun 2015 19:15:24 +0200
Subject: [PATCH 2/2] wxi: add libepoxy as gtk3 dep
---
data/wixl/gtk3.wxi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/wixl/gtk3.wxi b/data/wixl/gtk3.wxi
index 0808917..259f74d 100644
--- a/data/wixl/gtk3.wxi
+++ b/data/wixl/gtk3.wxi
@@ -3,6 +3,7 @@
<?require cairo.wxi?>
<?require gdk-pixbuf.wxi?>
<?require glib2.wxi?>
+<?require libepoxy.wxi?>
<?require pango.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
@@ -1226,6 +1227,7 @@
<ComponentGroupRef Id="CG.cairo"/>
<ComponentGroupRef Id="CG.gdk-pixbuf"/>
<ComponentGroupRef Id="CG.glib2"/>
+ <ComponentGroupRef Id="CG.libepoxy"/>
<ComponentGroupRef Id="CG.pango"/>
<ComponentRef Id="cmpC9962B6D4D6D6E322382AC6BDB0FBEAD"/>
<ComponentRef Id="cmpC5BC32F79EFCBD409B6E1D2CE4E60E62"/>
--
2.4.4

12
msitools.spec
View File

@ -2,13 +2,16 @@
Name: msitools
Version: 0.94
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Windows Installer tools
License: GPLv2+
URL: http://ftp.gnome.org/pub/GNOME/sources/%{name}
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}%{?_version_suffix}.tar.xz
Patch0001: 0001-wxi-add-libepoxy.wxi.patch
Patch0002: 0002-wxi-add-libepoxy-as-gtk3-dep.patch
Requires: libgsf >= 1.14.24-2
BuildRequires: glib2-devel
@ -43,6 +46,9 @@ The libmsi1-devel package includes the header files for libmsi.
%prep
%setup -q -n msitools-%{version}%{?_version_suffix}
%patch0001 -p1
%patch0002 -p1
%build
%configure --enable-fast-install
make %{?_smp_mflags} V=1
@ -85,6 +91,10 @@ rm -f %{buildroot}%{_libdir}/*.la
%changelog
* Fri Jun 19 2015 Fabiano Fidêncio <fidencio@redhat.com> - 0.94-2
- Add libepoxy.wxi
- Add libepoxy as gtk3 dep
* Tue Jun 16 2015 Fabiano Fidêncio <fidencio@redhat.com> - 0.94-1
- Upstream release 0.94