From 1f0aeae6e6f2f73b7a6ccdd945ded2a8021ec69b0cdb3fd79cfbeb99d2cd7f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 14 Apr 2012 19:40:29 +0000 Subject: [PATCH] Accepting request 113574 from home:etamPL:branches:devel:libraries:c_c++ update to 0.3.0 OBS-URL: https://build.opensuse.org/request/show/113574 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cppdb?expand=0&rev=4 --- cppdb-0.0.3.tar.xz | 3 - cppdb-0.3.0.tar.bz2 | 3 + cppdb-postgres.diff | 17 ---- cppdb.changes | 11 +++ cppdb.spec | 189 +++++++++++++++++++++++++++----------------- 5 files changed, 130 insertions(+), 93 deletions(-) delete mode 100644 cppdb-0.0.3.tar.xz create mode 100644 cppdb-0.3.0.tar.bz2 delete mode 100644 cppdb-postgres.diff diff --git a/cppdb-0.0.3.tar.xz b/cppdb-0.0.3.tar.xz deleted file mode 100644 index 8ca3774..0000000 --- a/cppdb-0.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd3c446a2fb842b5597a92053221194e11cfe234669ac99fd445ad888c745f47 -size 68024 diff --git a/cppdb-0.3.0.tar.bz2 b/cppdb-0.3.0.tar.bz2 new file mode 100644 index 0000000..e79717f --- /dev/null +++ b/cppdb-0.3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66bc0b97aa7194d97898601603844575c22fd6571475ba9849e86d4ad7620e2b +size 643223 diff --git a/cppdb-postgres.diff b/cppdb-postgres.diff deleted file mode 100644 index 0cf78c4..0000000 --- a/cppdb-postgres.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: cppdb-0.0.3/CMakeLists.txt -=================================================================== ---- cppdb-0.0.3.orig/CMakeLists.txt -+++ cppdb-0.0.3/CMakeLists.txt -@@ -160,7 +160,7 @@ endif() - - if(NOT DISABLE_PQ) - find_library(PQ_LIB pq) -- find_path(PQ_PATH libpq-fe.h PATH_SUFFIXES postgresql) -+ find_path(PQ_PATH libpq-fe.h PATH_SUFFIXES postgresql pgsql) - if(PQ_LIB AND PQ_PATH) - include_directories(${PQ_PATH}) - if(PQ_BACKEND_INTERNAL) diff --git a/cppdb.changes b/cppdb.changes index 8d11a5a..61ee879 100644 --- a/cppdb.changes +++ b/cppdb.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Apr 14 15:44:21 UTC 2012 - adam@mizerski.pl + +- update to 0.3.0 + - changes: http://cppcms.com/sql/cppdb/changelog.html +- removed cppdb-postgres.diff - fixed upstream +- specfile improvements + - added doc and doc-html subpackages + - updated license information + - general cleanup + ------------------------------------------------------------------- Sun Nov 6 20:03:16 UTC 2011 - jengelh@medozas.de diff --git a/cppdb.spec b/cppdb.spec index 6f012ea..bad90b7 100644 --- a/cppdb.spec +++ b/cppdb.spec @@ -15,21 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -Name: cppdb -%define sover 0 -Summary: Database-independent SQL connectivity library -Version: 0.0.3 -Release: 0 -URL: http://art-blog.no-ip.info/sql/cppdb/ -License: MIT/Boost -Group: Development/Libraries/C and C++ +Name: cppdb +%define sover 0 +Version: 0.3.0 +Release: 0 +License: MIT; BSL-1.0 +Summary: Database-independent SQL connectivity library +Url: http://cppcms.com/sql/cppdb/ +Group: Development/Libraries/C and C++ -#DL-URL: http://downloads.sf.net/cppcms/cppdb-0.0.3.tar.bz2 -Source: %name-%version.tar.xz -Patch1: cppdb-postgres.diff -BuildRoot: %_tmppath/%name-%version-build -BuildRequires: cmake, gcc-c++, libmysqlclient-devel, postgresql-devel -BuildRequires: pkgconfig(sqlite3), unixODBC-devel, xz +Source: http://sourceforge.net/projects/cppcms/files/cppdb/%{version}/cppdb-%{version}.tar.bz2 +BuildRequires: cmake +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: libmysqlclient-devel +BuildRequires: postgresql-devel +BuildRequires: unixODBC-devel +BuildRequires: pkgconfig(sqlite3) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description CppDB is an SQL connectivity library that is designed to provide @@ -37,9 +40,9 @@ platform and Database independent connectivity API similarly to what JDBC, ODBC and other connectivity libraries do. %package devel -Summary: Development files for cppdb -Group: Development/Libraries/C and C++ -Requires: libcppdb%sover = %version +Summary: Development files for cppdb +Group: Development/Libraries/C and C++ +Requires: libcppdb%{sover} = %{version} # The rest are plugins, no Requires needed. %description devel @@ -50,112 +53,152 @@ JDBC, ODBC and other connectivity libraries do. This package contains the development files (headers, link-time file references) for cppdb. -%package -n libcppdb%sover -Summary: Database-independent SQL connectivity library -Group: System/Libraries +%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 -Summary: MySQL database connector for the cppdb library -Group: System/Libraries +%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 -Summary: unixODBC database connector for the cppdb library -Group: System/Libraries +%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 -Summary: PostgreSQL database connector for the cppdb library -Group: System/Libraries +%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 -Summary: SQLite3 database connector for the cppdb library -Group: System/Libraries +%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. 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 +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 HTML documentation. + %prep %setup -q -%patch -P 1 -p1 %build -cmake -DCMAKE_INSTALL_PREFIX="%_prefix" \ - -DCMAKE_CFLAGS="%optflags" -DCMAKE_CXXFLAGS="%optflags" \ - -DBUILD_STATIC_LIBRARIES=false; -make %{?_smp_mflags}; +export CFLAGS='%{optflags}' +export CXXFLAGS='%{optflags}' +cmake -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DODBC_BACKEND_INTERNAL=OFF +make %{?_smp_mflags} VERBOSE=1 %install -b="%buildroot"; -make install DESTDIR="%buildroot"; -if [ "%_libdir" != "%_prefix/lib" ]; then - mkdir -p "$b/%_libdir"; - mv "$b/%_prefix/lib"/*.so* "$b/%_libdir/"; - rm -f "$b/%_prefix/lib"/*.a; -else - rm -f "$b/%_libdir"/*.a; -fi; +make install DESTDIR=%{buildroot} VERBOSE=1 +if [ "%{_lib}" != "lib" ]; then + mv %{buildroot}%{_prefix}/lib %{buildroot}%{_libdir} +fi +rm -f %{buildroot}%{_libdir}/*.a -%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 +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 + +%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 %files devel %defattr(-,root,root) -%_includedir/cppdb -%_libdir/*.so +%{_includedir}/cppdb +%{_libdir}/*.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 + +%files doc-html +%defattr(-,root,root) +%dir %{_datadir}/doc/%{name} +%{_datadir}/doc/%{name}/html