From b3a2363a2fe07f29337ef85e4ab41567e87575df Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Apr 12 2013 16:54:41 +0000 Subject: - 0.92.26 snapshot from upstream, fix f19 includes - Add x64 build support --- diff --git a/.gitignore b/.gitignore index 37a4d0e..c659966 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /msitools-0.91.tar.xz /msitools-0.92.tar.xz +/msitools-0.92.26-940f.tar.xz diff --git a/msitools.spec b/msitools.spec index 4a91941..7011d0e 100644 --- a/msitools.spec +++ b/msitools.spec @@ -1,11 +1,13 @@ +%define _version_suffix -940f + Name: msitools -Version: 0.92 -Release: 5%{?dist} +Version: 0.92.26 +Release: 1%{?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}.tar.xz +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}%{?_version_suffix}.tar.xz Requires: libgsf >= 1.14.24-2 @@ -17,10 +19,6 @@ BuildRequires: libgsf-devel BuildRequires: libuuid-devel BuildRequires: vala-tools -Patch1: 0001-glib2.wxi-add-a-GLIB_ARCH-to-workaround-697156.patch -Patch2: 0002-glib2.wxi-remove-obsolete-file.patch -Patch3: 0003-share-wxi-fix-a-few-more-wxi-for-f19.patch - %description msitools is a collection of utilities to inspect and create Windows Installer files. It is useful in a cross-compilation environment such @@ -43,11 +41,7 @@ Requires: libmsi1%{?_isa} = %{version}-%{release} The libmsi1-devel package includes the header files for libmsi. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - +%setup -q -n msitools-%{version}%{?_version_suffix} %build %configure --enable-fast-install @@ -75,7 +69,7 @@ rm -f %{buildroot}%{_libdir}/*.la %{_bindir}/wixl %{_bindir}/wixl-heat %{_datadir}/bash-completion/completions/msitools -%{_datadir}/wixl-%{version} +%{_datadir}/wixl-%{version}%{_version_suffix} %files -n libmsi1 -f %{name}.lang %doc COPYING.LIB @@ -91,6 +85,10 @@ rm -f %{buildroot}%{_libdir}/*.la %changelog +* Fri Apr 12 2013 Marc-André Lureau - 0.92.26-1 +- 0.92.26 snapshot from upstream, fix f19 includes +- Add x64 build support + * Thu Apr 11 2013 Marc-André Lureau - 0.92-5 - Forgot a patch diff --git a/sources b/sources index 4797f5c..77c4d4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d8a1297bcef600684e3a11a594d0ef4f msitools-0.92.tar.xz +affa61eb6f9ba879c3c2c729d833efaa msitools-0.92.26-940f.tar.xz