Attachment 946398 Details for Bug 1152155 – refactor autoreconf handling

[patch] refactor autoreconf handling

0002-Refactor-autoreconf-handling.patch (text/plain), 2.61 KB, created by David King on 2014-10-13 13:52:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David King

Created: 2014-10-13 13:52:54 UTC

Size: 2.61 KB

patch

obsolete

>From e6bc27284e1eb6a6388b73b8eaa4c10f52f9881e Mon Sep 17 00:00:00 2001
>From: David King <amigadave@amigadave.com>
>Date: Thu, 9 Oct 2014 13:56:35 +0100
>Subject: [PATCH 2/2] Refactor autoreconf handling
>
>Additionally, preserve timestamps when installing files.
>---
> mingw-gtk3.spec | 24 ++++++++++++++++++------
> 1 file changed, 18 insertions(+), 6 deletions(-)
>
>diff --git a/mingw-gtk3.spec b/mingw-gtk3.spec
>index 29c6ef1..1a337f1 100644
>--- a/mingw-gtk3.spec
>+++ b/mingw-gtk3.spec
>@@ -4,6 +4,11 @@
> # first two digits of version
> %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
> 
>+# Only enable if using patches that touches configure.ac,
>+# Makefile.am or other build system related files
>+#
>+%define enable_autoreconf 1
>+
> Name:           mingw-gtk3
> Version:        3.14.2
> Release:        1%{?dist}
>@@ -58,8 +63,12 @@ BuildRequires:  gtk2
> # Native one for gdk-pixbuf-csource
> BuildRequires:  gdk-pixbuf2-devel
> 
>-# Used by autoreconf.
>-BuildRequires:  autoconf automake libtool gobject-introspection-devel
>+%if 0%{?enable_autoreconf}
>+BuildRequires:  autoconf
>+BuildRequires:  automake
>+BuildRequires:  gobject-introspection-devel
>+BuildRequires:  libtool
>+%endif
> 
> 
> %description
>@@ -107,10 +116,12 @@ This package contains the MinGW Windows cross compiled GTK+ 3 library.
> %prep
> %setup -q -n gtk+-%{version}
> %patch0 -p1 -b .extract_strings
>-autoreconf --install --force
> 
> 
> %build
>+%if 0%{?enable_autoreconf}
>+autoreconf --install --force
>+%endif
> %mingw_configure \
>   --enable-gtk2-dependency \
>   --disable-cups
>@@ -119,7 +130,7 @@ autoreconf --install --force
> 
> 
> %install
>-%mingw_make install DESTDIR=$RPM_BUILD_ROOT
>+%mingw_make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
> 
> rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/charset.alias
> rm -f $RPM_BUILD_ROOT/%{mingw64_libdir}/charset.alias
>@@ -156,8 +167,8 @@ rm -f $RPM_BUILD_ROOT%{mingw64_datadir}/icons/hicolor/*/apps/*.png
> # Install the gtk.immodules file
> mkdir -p $RPM_BUILD_ROOT%{mingw32_sysconfdir}/gtk-3.0/
> mkdir -p $RPM_BUILD_ROOT%{mingw64_sysconfdir}/gtk-3.0/
>-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{mingw32_sysconfdir}/gtk-3.0/
>-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{mingw64_sysconfdir}/gtk-3.0/
>+install -pm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{mingw32_sysconfdir}/gtk-3.0/
>+install -pm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{mingw64_sysconfdir}/gtk-3.0/
> 
> %mingw_find_lang %{name} --all-name
> 
>@@ -275,6 +286,7 @@ fi
> %changelog
> * Thu Oct 09 2014 David King <amigadave@amigadave.com> - 3.14.2-1
> - Update to 3.14.2
>+- Refactor autoreconf handling
> 
> * Tue Sep 23 2014 Erik van Pienbroek <epienbro@fedoraproject.org> - 3.14.0-1
> - Update to 3.14.0
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 1152155: 946397 | 946398 | 946748 | 946749