diff --git a/baselibs.conf b/baselibs.conf index 371d607..5335cde 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libdbi1 +libdbi3 libdbi-devel requires -libdbi- - requires "libdbi1- = " + requires "libdbi3- = " diff --git a/libdbi-0.9.0.g23.tar.xz b/libdbi-0.9.0.g23.tar.xz new file mode 100644 index 0000000..da330f2 --- /dev/null +++ b/libdbi-0.9.0.g23.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8c882f81a67c391ad7a9129666801ed961dcf370d2b57b1792b1360a4bc929f +size 100924 diff --git a/libdbi-0.9.0.tar.gz b/libdbi-0.9.0.tar.gz deleted file mode 100644 index 2c5bf06..0000000 --- a/libdbi-0.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dafb6cdca524c628df832b6dd0bf8fabceb103248edb21762c02d3068fca4503 -size 1194284 diff --git a/libdbi.changes b/libdbi.changes index 4ae9911..6a8c77d 100644 --- a/libdbi.changes +++ b/libdbi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 17 14:55:28 UTC 2014 - jengelh@inai.de + +- Update to git snapshot 0.9.0+git23 +* api: offer DATETIME fields also as a "struct tm" + ------------------------------------------------------------------- Tue Sep 3 13:53:28 UTC 2013 - jengelh@inai.de diff --git a/libdbi.spec b/libdbi.spec index 48b9f7b..f122328 100644 --- a/libdbi.spec +++ b/libdbi.spec @@ -1,7 +1,7 @@ # # spec file for package libdbi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,33 @@ Name: libdbi -%define lname libdbi1 -Version: 0.9.0 +%define lname libdbi3 +Version: 0.9.0.g23 +#Snapshot: libdbi-0.9.0-23-gef3e376 Release: 0 Summary: Database Independent Abstraction Layer for C License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Url: http://libdbi.sf.net/ +URL: http://libdbi.sf.net/ -Source: http://downloads.sf.net/libdbi/%name-%version.tar.gz +#Source: http://downloads.sf.net/libdbi/%name-%version.tar.gz +Source: %name-%version.tar.xz Source2: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %_tmppath/%name-%version-build +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: pkgconfig +BuildRequires: xz +%define build_doc 1 +%if %build_doc +# Only needed when doc is not already prebuilt +BuildRequires: docbook-dsssl-stylesheets +BuildRequires: openjade +BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-jadetex +BuildRequires: texlive-pdftex-bin +%endif %description libdbi implements a database-independent abstraction layer in C, @@ -36,11 +51,11 @@ similar to the DBI/DBD layer in Perl. Writing one generic set of code, programmers can leverage the power of multiple databases and multiple simultaneous database connections by using this framework. -%package -n %{lname} +%package -n %lname Summary: Database Independent Abstraction Layer for C Group: System/Libraries -%description -n %{lname} +%description -n %lname libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl. Writing one generic set of code, programmers can leverage the power of multiple databases and @@ -49,39 +64,38 @@ multiple simultaneous database connections by using this framework. %package devel Summary: Development files for libdbi (Database Independent Abstraction Layer for C) Group: Development/Libraries/C and C++ -Requires: %{lname} = %{version} +Requires: %lname = %version %description devel The libdbi-devel package contains the header files and documentation needed to develop applications with libdbi. %prep -%setup -q -sed -i s,\-O20,\-O3,g configure +%setup -qn %name %build -%configure --disable-docs --disable-static +autoreconf -fi +sed -i s,\-O20,\-O3,g configure +%configure --disable-static --docdir="%_docdir/%name" make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -rm %buildroot/%{_libdir}/libdbi.la -rm README.win32 +make install DESTDIR="%buildroot" +rm README.win32 "%buildroot/%_libdir/libdbi.la" -%files -n %{lname} +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig + +%files -n %lname %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README* -%{_libdir}/libdbi.so.* +%_libdir/libdbi.so.3* %files devel %defattr(-,root,root) -%doc TODO doc/programmers-guide.pdf doc/programmers-guide/ doc/driver-guide.pdf doc/driver-guide/ %_includedir/dbi/ -%{_libdir}/libdbi.so +%_libdir/libdbi.so %_libdir/pkgconfig/dbi.pc - -%post -n %{lname} -p /sbin/ldconfig - -%postun -n %{lname} -p /sbin/ldconfig +%_docdir/%name/ %changelog