From 9aecc843a0a4a54ace5c3f35205b552451e0bdb8c4d361b1be2f817d44e79a91 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 4 Sep 2012 01:05:45 +0000 Subject: [PATCH] cppdb-0.3.1 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cppdb?expand=0&rev=5 --- cppdb-0.3.0.tar.bz2 | 3 -- cppdb-0.3.1.tar.bz2 | 3 ++ cppdb.changes | 9 ++++ cppdb.spec | 125 ++++++++++++++++++-------------------------- 4 files changed, 64 insertions(+), 76 deletions(-) delete mode 100644 cppdb-0.3.0.tar.bz2 create mode 100644 cppdb-0.3.1.tar.bz2 diff --git a/cppdb-0.3.0.tar.bz2 b/cppdb-0.3.0.tar.bz2 deleted file mode 100644 index e79717f..0000000 --- a/cppdb-0.3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66bc0b97aa7194d97898601603844575c22fd6571475ba9849e86d4ad7620e2b -size 643223 diff --git a/cppdb-0.3.1.tar.bz2 b/cppdb-0.3.1.tar.bz2 new file mode 100644 index 0000000..12904b3 --- /dev/null +++ b/cppdb-0.3.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d60eef5a732d8f84ef5e4a2845a8cefc543a6c75bf3782589c2cf6aa150b992e +size 251449 diff --git a/cppdb.changes b/cppdb.changes index 61ee879..c76467e 100644 --- a/cppdb.changes +++ b/cppdb.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Sep 3 23:11:51 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 0.3.1 +* Fixed bug #3536452: cppdb::transaction::~transaction() could + leak exception; and busy_timeout option was not working for + sqlite3 backend +* Fixed incorrect use of SQLITE_STATIC that could cause crash + ------------------------------------------------------------------- Sat Apr 14 15:44:21 UTC 2012 - adam@mizerski.pl diff --git a/cppdb.spec b/cppdb.spec index bad90b7..1e4c49a 100644 --- a/cppdb.spec +++ b/cppdb.spec @@ -15,16 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: cppdb %define sover 0 -Version: 0.3.0 +Version: 0.3.1 Release: 0 -License: MIT; BSL-1.0 +License: MIT ; BSL-1.0 Summary: Database-independent SQL connectivity library Url: http://cppcms.com/sql/cppdb/ Group: Development/Libraries/C and C++ -Source: http://sourceforge.net/projects/cppcms/files/cppdb/%{version}/cppdb-%{version}.tar.bz2 +Source: http://downloads.sf.net/cppcms/%name-%version.tar.bz2 BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -42,7 +43,7 @@ JDBC, ODBC and other connectivity libraries do. %package devel Summary: Development files for cppdb Group: Development/Libraries/C and C++ -Requires: libcppdb%{sover} = %{version} +Requires: libcppdb%sover = %version # The rest are plugins, no Requires needed. %description devel @@ -53,53 +54,53 @@ JDBC, ODBC and other connectivity libraries do. This package contains the development files (headers, link-time file references) for cppdb. -%package -n libcppdb%{sover} +%package -n libcppdb%sover Summary: Database-independent SQL connectivity library Group: System/Libraries -%description -n libcppdb%{sover} +%description -n libcppdb%sover CppDB is an SQL connectivity library that is designed to provide platform and Database independent connectivity API similarly to what JDBC, ODBC and other connectivity libraries do. -%package -n libcppdb_mysql%{sover} +%package -n libcppdb_mysql%sover Summary: MySQL database connector for the cppdb library Group: System/Libraries -%description -n libcppdb_mysql%{sover} +%description -n libcppdb_mysql%sover CppDB is an SQL connectivity library that is designed to provide platform and Database independent connectivity API similarly to what JDBC, ODBC and other connectivity libraries do. This package contains the MySQL database connector. -%package -n libcppdb_odbc%{sover} +%package -n libcppdb_odbc%sover Summary: unixODBC database connector for the cppdb library Group: System/Libraries -%description -n libcppdb_odbc%{sover} +%description -n libcppdb_odbc%sover CppDB is an SQL connectivity library that is designed to provide platform and Database independent connectivity API similarly to what JDBC, ODBC and other connectivity libraries do. This package contains the unixODBC database connector. -%package -n libcppdb_postgresql%{sover} +%package -n libcppdb_postgresql%sover Summary: PostgreSQL database connector for the cppdb library Group: System/Libraries -%description -n libcppdb_postgresql%{sover} +%description -n libcppdb_postgresql%sover CppDB is an SQL connectivity library that is designed to provide platform and Database independent connectivity API similarly to what JDBC, ODBC and other connectivity libraries do. This package contains the PostgreSQL database connector. -%package -n libcppdb_sqlite3-%{sover} +%package -n libcppdb_sqlite3-%sover Summary: SQLite3 database connector for the cppdb library Group: System/Libraries -%description -n libcppdb_sqlite3-%{sover} +%description -n libcppdb_sqlite3-%sover CppDB is an SQL connectivity library that is designed to provide platform and Database independent connectivity API similarly to what JDBC, ODBC and other connectivity libraries do. @@ -107,23 +108,11 @@ JDBC, ODBC and other connectivity libraries do. This package contains the SQLite3 database connector. %package doc -Summary: Documentation and examples for CppDB -Group: Documentation/Other -BuildArch: noarch - -%description doc -CppDB is an SQL connectivity library that is designed to provide -platform and Database independent connectivity API similarly to what -JDBC, ODBC and other connectivity libraries do. - -This package contains pdf documentation and examples. - -%package doc-html Summary: HTML documentation for CppDB Group: Documentation/HTML BuildArch: noarch -%description doc-html +%description doc CppDB is an SQL connectivity library that is designed to provide platform and Database independent connectivity API similarly to what JDBC, ODBC and other connectivity libraries do. @@ -134,71 +123,61 @@ This package contains HTML documentation. %setup -q %build -export CFLAGS='%{optflags}' -export CXXFLAGS='%{optflags}' -cmake -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ - -DODBC_BACKEND_INTERNAL=OFF -make %{?_smp_mflags} VERBOSE=1 +export CFLAGS="%optflags" +export CXXFLAGS="%optflags" +cmake -DCMAKE_INSTALL_PREFIX="%_prefix" -DLIBDIR="%_libdir" \ + -DODBC_BACKEND_INTERNAL="OFF"; +make %{?_smp_mflags}; %install -make install DESTDIR=%{buildroot} VERBOSE=1 -if [ "%{_lib}" != "lib" ]; then - mv %{buildroot}%{_prefix}/lib %{buildroot}%{_libdir} -fi -rm -f %{buildroot}%{_libdir}/*.a +b="%buildroot"; +make install DESTDIR="$b" +rm -f "$b/%_libdir"/*.a "$b/%_libdir"/libcppdb_*.so rm html/installdox -mkdir -p %{buildroot}%{_datadir}/doc/%{name} -cp -r html pdf examples %{buildroot}%{_datadir}/doc/%{name} -%fdupes -s %{buildroot}%{_datadir}/doc/%{name}/html +mkdir -p "$b/%_docdir/%name"; +cp -a html examples "$b/%_docdir/%name/"; +%fdupes -s %buildroot/%_docdir/%name -%post -n libcppdb%{sover} -p /sbin/ldconfig -%post -n libcppdb_mysql%{sover} -p /sbin/ldconfig -%post -n libcppdb_odbc%{sover} -p /sbin/ldconfig -%post -n libcppdb_postgresql%{sover} -p /sbin/ldconfig -%post -n libcppdb_sqlite3-%{sover} -p /sbin/ldconfig -%postun -n libcppdb%{sover} -p /sbin/ldconfig -%postun -n libcppdb_mysql%{sover} -p /sbin/ldconfig -%postun -n libcppdb_odbc%{sover} -p /sbin/ldconfig -%postun -n libcppdb_postgresql%{sover} -p /sbin/ldconfig -%postun -n libcppdb_sqlite3-%{sover} -p /sbin/ldconfig - -%files -%defattr(-,root,root) -%doc LICENSE_1_0.txt MIT.txt copyright.txt +%post -n libcppdb%sover -p /sbin/ldconfig +%post -n libcppdb_mysql%sover -p /sbin/ldconfig +%post -n libcppdb_odbc%sover -p /sbin/ldconfig +%post -n libcppdb_postgresql%sover -p /sbin/ldconfig +%post -n libcppdb_sqlite3-%sover -p /sbin/ldconfig +%postun -n libcppdb%sover -p /sbin/ldconfig +%postun -n libcppdb_mysql%sover -p /sbin/ldconfig +%postun -n libcppdb_odbc%sover -p /sbin/ldconfig +%postun -n libcppdb_postgresql%sover -p /sbin/ldconfig +%postun -n libcppdb_sqlite3-%sover -p /sbin/ldconfig %files devel %defattr(-,root,root) -%{_includedir}/cppdb -%{_libdir}/*.so +%doc LICENSE_1_0.txt MIT.txt copyright.txt +%_includedir/cppdb +%_libdir/libcppdb.so -%files -n libcppdb%{sover} +%files -n libcppdb%sover %defattr(-,root,root) -%{_libdir}/libcppdb.so.%{sover}* +%_libdir/libcppdb.so.%{sover}* -%files -n libcppdb_mysql%{sover} +%files -n libcppdb_mysql%sover %defattr(-,root,root) -%{_libdir}/libcppdb_mysql.so.%{sover}* +%_libdir/libcppdb_mysql.so.%{sover}* -%files -n libcppdb_odbc%{sover} +%files -n libcppdb_odbc%sover %defattr(-,root,root) -%{_libdir}/libcppdb_odbc.so.%{sover}* +%_libdir/libcppdb_odbc.so.%{sover}* -%files -n libcppdb_postgresql%{sover} +%files -n libcppdb_postgresql%sover %defattr(-,root,root) -%{_libdir}/libcppdb_postgresql.so.%{sover}* +%_libdir/libcppdb_postgresql.so.%{sover}* -%files -n libcppdb_sqlite3-%{sover} +%files -n libcppdb_sqlite3-%sover %defattr(-,root,root) -%{_libdir}/libcppdb_sqlite3.so.%{sover}* +%_libdir/libcppdb_sqlite3.so.%{sover}* %files doc %defattr(-,root,root) -%dir %{_datadir}/doc/%{name} -%{_datadir}/doc/%{name}/pdf -%{_datadir}/doc/%{name}/examples +%_docdir/%name -%files doc-html -%defattr(-,root,root) -%dir %{_datadir}/doc/%{name} -%{_datadir}/doc/%{name}/html +%changelog