Attachment 745668 Details for Bug 961283 – Slightly better fix.

[patch] Slightly better fix.

0001-spec-configure.in-Makefile.am-s-move-to-up2date-auto.patch (text/plain), 3.67 KB, created by Pavel Raiskup on 2013-05-09 13:39:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Raiskup

Created: 2013-05-09 13:39:13 UTC

Size: 3.67 KB

patch

obsolete

>From 4b4424d8c0c4099aad17dc2b298a40d3437b942a Mon Sep 17 00:00:00 2001
>From: Pavel Raiskup <praiskup@redhat.com>
>Date: Thu, 9 May 2013 12:23:00 +0200
>Subject: [PATCH] spec,configure.in,Makefile.am's: move to up2date autotools
>
>Resolves: #961283
>Version: 1:1.2.10-39
>---
> glib-1.2.10-newer-autotools.patch | 25 +++++++++++++++++++++++++
> glib.spec                         | 28 ++++++++++++----------------
> 2 files changed, 37 insertions(+), 16 deletions(-)
> create mode 100644 glib-1.2.10-newer-autotools.patch
>
>diff --git a/glib-1.2.10-newer-autotools.patch b/glib-1.2.10-newer-autotools.patch
>new file mode 100644
>index 0000000..3964a52
>--- /dev/null
>+++ b/glib-1.2.10-newer-autotools.patch
>@@ -0,0 +1,25 @@
>+diff --git a/configure.in b/configure.in
>+index 8ee9339..1af5350 100644
>+--- a/configure.in
>++++ b/configure.in
>+@@ -15,6 +15,7 @@ cflags_set=${CFLAGS+set}
>+ # we rewrite this file
>+ rm -f glibconfig-sysdefs.h
>+ 
>++m4_define(AC_DIVERSION_NOTICE,1)
>+ dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
>+ dnl are available for $ac_help expansion (don't we all *love* autoconf?)
>+ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
>+diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
>+index fbbfc52..0eaf75b 100644
>+--- a/gmodule/Makefile.am
>++++ b/gmodule/Makefile.am
>+@@ -44,7 +44,7 @@ libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
>+ libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
>+ 
>+ noinst_PROGRAMS = testgmodule
>+-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
>++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
>+ testgmodule_LDADD = libgmodule.la @G_MODULE_LIBS@
>+ 
>+ .PHONY: files release
>diff --git a/glib.spec b/glib.spec
>index 9887d90..8add20f 100644
>--- a/glib.spec
>+++ b/glib.spec
>@@ -2,13 +2,13 @@ Summary:	A library of handy utility functions
> Name:		glib
> Epoch:		1
> Version:	1.2.10
>-Release:	38%{?dist}
>+Release:	39%{?dist}
> License:	LGPLv2+
> Group:		System Environment/Libraries
> URL:		http://www.gtk.org/
> Source:		ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
> BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
>-BuildRequires:	automake14 autoconf213
>+BuildRequires:	automake autoconf
> BuildRequires:	libtool
> 
> # Suppress warnings about varargs macros for -pedantic
>@@ -20,6 +20,8 @@ Patch4: glib-1.2.10-no_undefined.patch
> Patch5: glib-1.2.10-multilib.patch
> # Fix unused direct shared library dependency on libgmodule for libgthread
> Patch6: glib-1.2.10-unused-dep.patch
>+# allow build with up2date autotools
>+Patch7: glib-1.2.10-newer-autotools.patch
> 
> 
> %description
>@@ -39,7 +41,7 @@ Requires: pkgconfig
> 
> 
> %prep
>-%setup -q 
>+%setup -q
> 
> %patch1 -p1 -b .isowarning
> %patch2 -p1 -b .gcc34
>@@ -47,23 +49,14 @@ Requires: pkgconfig
> %patch4 -p1 -b .no_undefined
> %patch5 -p1 -b .multilib
> %patch6 -p1 -b .unused-dep
>+%patch7 -p1 -b .newer-autotools
> 
>-# The original config.{guess,sub} do not work on x86_64
>-#
>-# The following /usr/lib cannot be %%_libdir !!
>-cp -p /usr/lib/rpm/config.{guess,sub} .
>-
>-#cp -f %{_datadir}/aclocal/libtool.m4 .
>-#libtoolize --copy --force
>-automake-1.4
>-#aclocal-1.4
>-autoconf-2.13
>-autoheader-2.13
>-
>+rm acinclude.m4 # this is just about old libtool (covered by autoreconf)
>+autoreconf -vi
> 
> %build
> LIBTOOL=%{_bindir}/libtool \
>-%configure --disable-static
>+%configure --disable-static --enable-silent-rules
> 
> make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
> 
>@@ -114,6 +107,9 @@ rm -rf %{buildroot}
> %{_datadir}/aclocal/*
> 
> %changelog
>+* Thu May 09 2013 Pavel Raiskup <praiskup@redhat.com> - 1:1.2.10-39
>+- migrate to use up2date autotools (#961283)
>+
> * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.10-38
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 961283: 745612 | 745668