From cf023f126e4021a3f2965c9068932a5fc175ee2755250cd3fea3ae4989a38116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Mon, 1 Dec 2014 10:13:30 +0000
Subject: [PATCH] Accepting request 263220 from
 home:jengelh:branches:server:database

- Account for changes in libtool 2.4.3: remove ACLOCAL_AMFLAGS
  and explicit libtoolize call.
- Replace $RPM_BUILD_ROOT by macro (fits with the other macros used)

OBS-URL: https://build.opensuse.org/request/show/263220
OBS-URL: https://build.opensuse.org/package/show/server:database/unixODBC?expand=0&rev=34
---
 unixODBC.changes |  7 +++++++
 unixODBC.spec    | 25 +++++++++++++------------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/unixODBC.changes b/unixODBC.changes
index 2393321..63f2196 100644
--- a/unixODBC.changes
+++ b/unixODBC.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 27 10:40:29 UTC 2014 - jengelh@inai.de
+
+- Account for changes in libtool 2.4.3: remove ACLOCAL_AMFLAGS
+  and explicit libtoolize call.
+- Replace $RPM_BUILD_ROOT by macro (fits with the other macros used)
+
 -------------------------------------------------------------------
 Mon Sep  8 07:51:54 UTC 2014 - jengelh@inai.de
 
diff --git a/unixODBC.spec b/unixODBC.spec
index b0a4e0f..194ac11 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -17,9 +17,6 @@
 
 
 Name:           unixODBC
-BuildRequires:  bison
-BuildRequires:  gcc-c++
-BuildRequires:  libtool
 Version:        2.3.2
 Release:        0
 Summary:        ODBC driver manager with some drivers included
@@ -43,6 +40,10 @@ Patch13:        %{name}-2.3.1-uninitialized.patch
 Patch15:        %{name}-2.3.1-bison.patch
 Patch16:        %{name}-2.3.1-declarations.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  automake
+BuildRequires:  bison
+BuildRequires:  gcc-c++
+BuildRequires:  libtool
 
 %package devel
 Summary:        Includes for ODBC Development
@@ -89,12 +90,12 @@ Authors:
 install -m 644 %{S:1} .
 
 %build
+perl -i -pe 's{^ACLOCAL_AMFLAGS.*}{}' Makefile.am
 export -n LANG LINGUAS LC_ALL
 rm -rf libltdl
-libtoolize --ltdl
 autoreconf --force --install
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CFLAGS="%optflags -fno-strict-aliasing"
+export CXXFLAGS="%optflags -fno-strict-aliasing"
 %configure \
 	    --prefix=%{_prefix} \
 	    --mandir=%{_mandir} \
@@ -108,13 +109,13 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 make
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT/usr/share/libtool
+install -d -m 755 "%buildroot/%_sysconfdir/%name"
+install -d -m 755 "%buildroot/%_libdir/%name"
+make DESTDIR="%buildroot" install
+rm -rf "%buildroot/%_datadir/libtool"
 # packaged in gui-gtk
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libmimerS.*
-rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la
+rm -f "%buildroot/%_libdir"/libmimerS.*
+rm -f "%buildroot/%_libdir/%name"/*.la
 
 %post -p /sbin/ldconfig