From 10e5712e614d8eb8e47e176d81e41155865761ab480a5299d08e15236f58e448 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 14 Feb 2012 18:02:16 +0000 Subject: [PATCH] Accepting request 103979 from devel:libraries:c_c++ Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/103979 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdbi-drivers?expand=0&rev=8 --- libdbi-drivers.changes | 6 ++++++ libdbi-drivers.spec | 24 ++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/libdbi-drivers.changes b/libdbi-drivers.changes index fe45c5f..6c2913f 100644 --- a/libdbi-drivers.changes +++ b/libdbi-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 1 01:54:59 UTC 2012 - jengelh@medozas.de + +- Remove redundant tags/sections per specfile guideline suggestions +- Parallel building using %_smp_mflags + ------------------------------------------------------------------- Thu Jan 12 11:30:42 UTC 2012 - coolo@suse.com diff --git a/libdbi-drivers.spec b/libdbi-drivers.spec index 29e229d..8563538 100644 --- a/libdbi-drivers.spec +++ b/libdbi-drivers.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define special -1 Summary: Database drivers for libdbi @@ -40,10 +41,6 @@ libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl. Drivers are distributed separately from the library itself. -_Original_Vendor: Neon Goat Productions -_Original_Packager: David A. Parker - - %package dbd-mysql Summary: MySQL driver for libdbi Group: Development/Libraries @@ -96,27 +93,29 @@ does not require recompilation or rewriting source code. %setup -q -n %{name}-%{version}%{special} %build -CFLAGS="$RPM_OPT_FLAGS" %configure \ +%configure \ --with-mysql \ - --with-mysql-incdir=/usr/include/mysql \ + --with-mysql-incdir=%_includedir/mysql \ --with-mysql-libdir=%{_libdir}/mysql \ --with-pgsql \ - --with-pgsql-incdir=/usr/include/pgsql \ + --with-pgsql-incdir=%_includedir/pgsql \ --with-pgsql-libdir=%{_libdir} \ %if 0%{?suse_version} == 910 --with-sqlite \ - --with-sqlite-incdir=/usr/include \ + --with-sqlite-incdir=%_includedir \ --with-sqlite-libdir=%{_libdir} \ %else --with-sqlite3 \ - --with-sqlite3-incdir=/usr/include \ + --with-sqlite3-incdir=%_includedir \ --with-sqlite3-libdir=%{_libdir} \ %endif - --with-dbi-incdir=/usr/include/dbi \ + --with-dbi-incdir=%_includedir/dbi \ --with-dbi-libdir=%{_libdir} \ --disable-static \ --disable-docs -make AM_CFLAGS="$RPM_OPT_FLAGS" +# Broken upstream code overrides CFLAGS !:-[. Since AM_CFLAGS is unused in +# the source, we can hack there to get our flags in... +make %{?_smp_mflags} AM_CFLAGS="%optflags" %install make DESTDIR=$RPM_BUILD_ROOT install @@ -153,9 +152,6 @@ make DESTDIR=$RPM_BUILD_ROOT install %endif -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig