Hello community, here is the log from the commit of package mysql-connector-cpp for openSUSE:Factory checked in at 2013-03-14 15:20:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-connector-cpp (Old) and /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-cpp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-connector-cpp/mysql-connector-cpp.changes 2012-01-25 10:38:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new/mysql-connector-cpp.changes 2013-03-14 15:21:14.000000000 +0100 @@ -1,0 +2,17 @@ +Fri Mar 8 11:05:21 UTC 2013 - [email protected] + +- Fix library requirement for devel package due to wrong soversion + +------------------------------------------------------------------- +Wed Feb 13 18:20:22 UTC 2013 - [email protected] + +- update to 1.1.2, see + https://dev.mysql.com/doc/relnotes/connector-cpp/en/ccpp-news-1-1-1.html + https://dev.mysql.com/doc/relnotes/connector-cpp/en/ccpp-news-1-1-2.html +- libmysqlcppconn5 changed to libmysqlcppconn6 (number bump) +- spec file cleanup +- removed patch for driver/mysql_art_resultset.cpp from + mysql-connector-cpp-1.1.0-gcc44.patch +- added mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch + +------------------------------------------------------------------- Old: ---- mysql-connector-c++-1.1.0.tar.bz2 New: ---- mysql-connector-c++-1.1.2.tar.bz2 mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-connector-cpp.spec ++++++ --- /var/tmp/diff_new_pack.U8ElTG/_old 2013-03-14 15:21:20.000000000 +0100 +++ /var/tmp/diff_new_pack.U8ElTG/_new 2013-03-14 15:21:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mysql-connector-cpp # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,25 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: mysql-connector-cpp +Version: 1.1.2 +Release: 0 Summary: MySQL Connector/C++: Standardized database driver for C++ development License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/C and C++ -Version: 1.1.0 -Release: 0 Url: http://dev.mysql.com/downloads/connector/ -# http://dev.mysql.com/get/Downloads/Connector-C%2B%2B/mysql-connector-c%2B%2B-%{version}.tar.gz +# http://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-%%{version}.tar.gz Source: mysql-connector-c++-%{version}.tar.bz2 # PATCH-SUSE-INTEGRATION - mysql-connector-cpp-1.0.4-beta-cmake-paths-fix.patch [] [email protected] -- adjust some default paths Patch0: mysql-connector-cpp-1.1.0-cmake-paths-fix.patch # PATCH-UPSTREAM-FIX - mysql-connector-cpp-1.0.4-beta-gcc44.patch [ upstream#44931 ] [email protected] -- adding missing includes # http://bugs.mysql.com/44931 Patch1: mysql-connector-cpp-1.1.0-gcc44.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: boost-devel -BuildRequires: cmake +# PATCH-FEATURE-OPENSUSE - mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch [email protected] -- disable building tests and examples +Patch2: mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch +BuildRequires: boost-devel >= 1.34.0 +BuildRequires: cmake >= 2.6.2 BuildRequires: gcc-c++ BuildRequires: libmysqlclient-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description MySQL Connector/C++ is a MySQL database connector for C++ development. The @@ -54,9 +57,9 @@ * Shorter development times %package -n libmysqlcppconn-devel -Requires: libmysqlcppconn5 = %{version} Summary: Development files for MySQL Connector/C++ Group: Development/Libraries/C and C++ +Requires: libmysqlcppconn6 = %{version} %description -n libmysqlcppconn-devel MySQL Connector/C++ is a MySQL database connector for C++ development. The @@ -76,11 +79,11 @@ * Support of the object oriented programming paradigma * Shorter development times -%package -n libmysqlcppconn5 +%package -n libmysqlcppconn6 Summary: MySQL Connector/C++: Standardized database driver for C++ development Group: Development/Libraries/C and C++ -%description -n libmysqlcppconn5 +%description -n libmysqlcppconn6 MySQL Connector/C++ is a MySQL database connector for C++ development. The MySQL driver for C++ can be used to connect to MySQL from C++ applications. The driver mimics the JDBC 4.0 API. It implements a significant subset of JDBC 4.0. @@ -99,33 +102,37 @@ * Shorter development times %prep -%setup -n mysql-connector-c++-%{version} +%setup -q -n mysql-connector-c++-%{version} %patch0 %patch1 +%patch2 -p1 %build -cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIB_DIR=`basename %{_libdir}` -make %{?jobs:-j%jobs} LIBDIR=%{_libdir} +export CXXFLAGS="%optflags" +cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIB_DIR=%{_lib} \ + -DMYSQLCLIENT_STATIC_BINDING=0 \ + . +make %{?_smp_mflags} VERBOSE=1 +chmod -x examples/* %install -%makeinstall +%make_install rm -f %{buildroot}%{_libdir}/libmysqlcppconn-static.a -rm -f %{buildroot}/usr/[A-Z]* - -%clean -rm -rf %{buildroot} +rm -f %{buildroot}%{_prefix}/[A-Z]* -%post -n libmysqlcppconn5 -p /sbin/ldconfig +%post -n libmysqlcppconn6 -p /sbin/ldconfig -%postun -n libmysqlcppconn5 -p /sbin/ldconfig +%postun -n libmysqlcppconn6 -p /sbin/ldconfig %files -n libmysqlcppconn-devel %defattr(-,root,root) -%doc README ANNOUNCEMENT COPYING CHANGES -/usr/include/mysql-connector +%doc README ANNOUNCEMENT COPYING CHANGES examples +%{_includedir}/mysql-connector %{_libdir}/*.so -%files -n libmysqlcppconn5 +%files -n libmysqlcppconn6 %defattr(-,root,root) %{_libdir}/*.so.* ++++++ mysql-connector-c++-1.1.0.tar.bz2 -> mysql-connector-c++-1.1.2.tar.bz2 ++++++ ++++ 18722 lines of diff (skipped) ++++++ mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch ++++++ diff -rupN mysql-connector-c++-1.1.2/CMakeLists.txt mysql-connector-c++-1.1.2_mod/CMakeLists.txt --- mysql-connector-c++-1.1.2/CMakeLists.txt 2013-01-24 16:45:15.000000000 +0100 +++ mysql-connector-c++-1.1.2_mod/CMakeLists.txt 2013-02-13 21:35:51.503045611 +0100 @@ -291,11 +291,6 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/ ADD_SUBDIRECTORY(cppconn) ADD_SUBDIRECTORY(driver) -ADD_SUBDIRECTORY(examples) -ADD_SUBDIRECTORY(test) -ADD_SUBDIRECTORY(test/framework) -ADD_SUBDIRECTORY(test/CJUnitTestsPort) -ADD_SUBDIRECTORY(test/unit) IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") # see also README ++++++ mysql-connector-cpp-1.1.0-gcc44.patch ++++++ --- /var/tmp/diff_new_pack.U8ElTG/_old 2013-03-14 15:21:20.000000000 +0100 +++ /var/tmp/diff_new_pack.U8ElTG/_new 2013-03-14 15:21:20.000000000 +0100 @@ -1,15 +1,3 @@ -Index: driver/mysql_art_resultset.cpp -=================================================================== ---- driver/mysql_art_resultset.cpp.orig -+++ driver/mysql_art_resultset.cpp -@@ -23,6 +23,7 @@ - */ - - #include <sstream> -+#include <stdio.h> - #include <math.h> - #include <stdio.h> - Index: driver/mysql_resultbind.cpp =================================================================== --- driver/mysql_resultbind.cpp.orig -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
