[packages/lua-dbi] simplify cflags; pass cc,cflags,ldflags; verbose files; md5 to source
glen
glen at pld-linux.org
Sat Feb 8 12:15:42 CET 2014
commit c008260c1f44ff59c3ada0ba14100227504699f2
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Feb 8 13:15:37 2014 +0200
simplify cflags; pass cc,cflags,ldflags; verbose files; md5 to source
lua-dbi.spec | 39 ++++++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 15 deletions(-)
---
diff --git a/lua-dbi.spec b/lua-dbi.spec
index b93e6f2..aa05d2c 100644
--- a/lua-dbi.spec
+++ b/lua-dbi.spec
@@ -1,22 +1,25 @@
-%define luaver 5.1
-%define lualibdir %{_libdir}/lua/%{luaver}
-%define luapkgdir %{_datadir}/lua/%{luaver}
-
+# TODO
+# - subpackage for each driver
+%define luaver 5.1
+%define lualibdir %{_libdir}/lua/%{luaver}
+%define luapkgdir %{_datadir}/lua/%{luaver}
Summary: Database interface library for Lua
Name: lua-dbi
Version: 0.5
Release: 1
License: MIT
Group: Development/Libraries
-URL: http://code.google.com/p/luadbi
Source0: http://luadbi.googlecode.com/files/luadbi.%{version}.tar.gz
+# Source0-md5: ede2b003aadddc151aac87050c3d926e
+URL: http://code.google.com/p/luadbi
Patch1: %{name}-0.5-pgsql_transaction.patch
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
BuildRequires: lua51-devel
BuildRequires: mysql-devel
+BuildRequires: postgresql-backend-devel
BuildRequires: postgresql-devel
-BuildRequires: postgresql-backend-devel
+BuildRequires: sed >= 4.0
BuildRequires: sqlite3-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
LuaDBI is a database interface library for Lua. It is designed to
@@ -28,20 +31,24 @@ Currently LuaDBI supports DB2, Oracle, MySQL, PostgreSQL and SQLite
databases with native database drivers.
%prep
-%setup -q -c
+%setup -qc
%patch1 -p1
find . -name \*.[ch] -print -exec chmod -x '{}' \;
sed -i -e '1d' DBI.lua
+%{__sed} -i -e 's,-O2,$(EXTRA_CFLAGS),' Makefile
+
%build
-%{__make} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/lua51 -I. -I/usr/include/mysql/ -I/usr/include/postgresql/internal/ -I/usr/include/postgresql/server/" COMMON_LDFLAGS="-llua51 -shared"
+%{__make} \
+ LIBDIR="%{_libdir}" \
+ CC="%{__cc}" \
+ EXTRA_CFLAGS="%{rpmcflags} %{rpmcppflags} -I/usr/include/lua51 -I/usr/include/postgresql/internal -I/usr/include/postgresql/server"
+ COMMON_LDFLAGS="%{rpmldflags} -llua51 -shared"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{luapkgdir}
-install -d $RPM_BUILD_ROOT%{lualibdir}
-
-cp -p *.so $RPM_BUILD_ROOT%{lualibdir}
+install -d $RPM_BUILD_ROOT{%{luapkgdir},%{lualibdir}}
+install -p *.so $RPM_BUILD_ROOT%{lualibdir}
cp -p *.lua $RPM_BUILD_ROOT%{luapkgdir}
%clean
@@ -50,5 +57,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc README COPYING
-%{lualibdir}/*.so
-%{luapkgdir}/*.lua
+%{lualibdir}/dbdmysql.so
+%{lualibdir}/dbdpostgresql.so
+%{lualibdir}/dbdsqlite3.so
+%{luapkgdir}/DBI.lua
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lua-dbi.git/commitdiff/c008260c1f44ff59c3ada0ba14100227504699f2
More information about the pld-cvs-commit
mailing list