spec: cleanup

Several cleanup changes:
* The acinclude.m4 does not seem to be needed anymore.  I actually
don't know why it was originally added (very long time ago) but
now even 'autoreconf' works fine — so lets see what will happen.
* Don't autoreconf as it is not needed.
* Trim lines.

Version: 09.03.0100-1
This commit is contained in:
Pavel Raiskup 2013-12-19 18:23:25 +01:00
parent 9bc3f1f715
commit 100981b87a

View File

@ -8,17 +8,6 @@ URL: http://psqlodbc.projects.postgresql.org/
Source0: http://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-%{version}.tar.gz Source0: http://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-%{version}.tar.gz
# CAUTION: acinclude.m4 has to be kept in sync with package's aclocal.m4.
# This is a kluge that ought to go away, but upstream currently isn't
# shipping their custom macros anywhere except in aclocal.m4. (The macros
# actually come from the Postgres source tree, but we haven't got that
# available while building this RPM.) To generate: in psqlodbc source tree,
# aclocal -I . -I $PGSRC/config
# then strip aclocal.m4 down to just the PGAC macros.
# BUT: as of 09.01.0200, configure.ac hasn't been updated to use latest
# PG macros, so keep using the previous version of acinclude.m4.
Source1: acinclude.m4
BuildRequires: unixODBC-devel BuildRequires: unixODBC-devel
BuildRequires: libtool automake autoconf postgresql-devel BuildRequires: libtool automake autoconf postgresql-devel
BuildRequires: openssl-devel krb5-devel pam-devel zlib-devel readline-devel BuildRequires: openssl-devel krb5-devel pam-devel zlib-devel readline-devel
@ -30,29 +19,16 @@ BuildRequires: openssl-devel krb5-devel pam-devel zlib-devel readline-devel
This package includes the driver needed for applications to access a This package includes the driver needed for applications to access a
PostgreSQL system via ODBC (Open Database Connectivity). PostgreSQL system via ODBC (Open Database Connectivity).
%prep %prep
%setup -q -n psqlodbc-%{version} %setup -q -n psqlodbc-%{version}
# Some missing macros. Courtesy Owen Taylor <otaylor@redhat.com>.
cp -p %{SOURCE1} .
# Use build system's libtool.m4, not the one in the package.
rm -f libtool.m4 config/libtool.m4
libtoolize --force --copy
aclocal -I .
automake --add-missing --copy
autoconf
autoheader
%build %build
%configure --with-unixodbc --disable-dependency-tracking %configure --with-unixodbc --disable-dependency-tracking
make %{?_smp_mflags}
make
%install %install
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Provide the old library name "psqlodbc.so" as a symlink, # Provide the old library name "psqlodbc.so" as a symlink,
@ -66,7 +42,7 @@ popd
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%attr(755,root,root) %{_libdir}/psqlodbcw.so %{_libdir}/psqlodbcw.so
%{_libdir}/psqlodbc.so %{_libdir}/psqlodbc.so
%doc license.txt readme.txt docs/* %doc license.txt readme.txt docs/*