Hello community, here is the log from the commit of package mysql-connector-cpp for openSUSE:Factory checked in at 2013-04-17 22:34:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-03-14 15:36:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new/mysql-connector-cpp.changes 2013-04-17 22:34:06.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Apr 17 15:43:40 CEST 2013 - [email protected] + +- Compatibility Obsoletes/Provides + +------------------------------------------------------------------- +Wed Apr 3 12:34:30 UTC 2013 - [email protected] + +- Merge with package by Tomas Chvatal (to make it work with LO) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-connector-cpp.spec ++++++ --- /var/tmp/diff_new_pack.vib90D/_old 2013-04-17 22:34:09.000000000 +0200 +++ /var/tmp/diff_new_pack.vib90D/_new 2013-04-17 22:34:09.000000000 +0200 @@ -36,6 +36,8 @@ BuildRequires: cmake >= 2.6.2 BuildRequires: gcc-c++ BuildRequires: libmysqlclient-devel +Obsoletes: mysql-connector-c++ < %{version} +Provides: mysql-connector-c++ = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,6 +62,8 @@ Summary: Development files for MySQL Connector/C++ Group: Development/Libraries/C and C++ Requires: libmysqlcppconn6 = %{version} +Obsoletes: mysql-connector-c++-devel < %{version} +Provides: mysql-connector-c++-devel = %{version} %description -n libmysqlcppconn-devel MySQL Connector/C++ is a MySQL database connector for C++ development. The @@ -103,14 +107,25 @@ %prep %setup -q -n mysql-connector-c++-%{version} -%patch0 +%patch0 -p1 %patch1 %patch2 -p1 %build export CXXFLAGS="%optflags" cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_C_FLAGS:STRING="%{optflags}" \ + -DCMAKE_CXX_FLAGS:STRING="%{optflags}" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DBUILD_SHARED_LIBS=ON \ +%if %{_lib} == lib64 + -DLIB_SUFFIX=64 \ +%endif + -DMYSQLCPPCONN_GCOV_ENABLE=ON \ + -DMYSQLCPPCONN_ICU_ENABLE=OFF \ + -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \ -DCMAKE_INSTALL_LIB_DIR=%{_lib} \ -DMYSQLCLIENT_STATIC_BINDING=0 \ . @@ -129,7 +144,7 @@ %files -n libmysqlcppconn-devel %defattr(-,root,root) %doc README ANNOUNCEMENT COPYING CHANGES examples -%{_includedir}/mysql-connector +%{_includedir}/* %{_libdir}/*.so %files -n libmysqlcppconn6 ++++++ mysql-connector-cpp-1.1.0-cmake-paths-fix.patch ++++++ --- /var/tmp/diff_new_pack.vib90D/_old 2013-04-17 22:34:09.000000000 +0200 +++ /var/tmp/diff_new_pack.vib90D/_new 2013-04-17 22:34:09.000000000 +0200 @@ -1,44 +1,73 @@ -Index: cppconn/CMakeLists.txt -=================================================================== ---- cppconn/CMakeLists.txt.orig -+++ cppconn/CMakeLists.txt -@@ -69,4 +69,4 @@ SET(MYSQLCPPCONN_INSTALL_HEADERS - sqlstring.h - warning.h) - --INSTALL(FILES ${MYSQLCPPCONN_INSTALL_HEADERS} DESTINATION include/cppconn) -+INSTALL(FILES ${MYSQLCPPCONN_INSTALL_HEADERS} DESTINATION include/mysql-connector/cppconn) -Index: driver/CMakeLists.txt -=================================================================== ---- driver/CMakeLists.txt.orig -+++ driver/CMakeLists.txt -@@ -23,6 +23,9 @@ - - LINK_DIRECTORIES(${MYSQLCPPCONN_BOOST_LIBRARY_DIRS}) - -+IF(NOT DEFINED CMAKE_INSTALL_LIB_DIR) -+ SET(CMAKE_INSTALL_LIB_DIR lib) -+ENDIF(NOT DEFINED CMAKE_INSTALL_LIB_DIR) +diff -urN mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt +--- mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 ++++ mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200 +@@ -55,7 +55,7 @@ + + SET(MYSQLCPPCONN_INSTALL_HEADERS + build_config.h +- config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/config.h + connection.h + datatype.h + driver.h +diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt +--- mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 ++++ mysql-connector-c++-1.1.0/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200 +@@ -26,6 +26,9 @@ INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}) INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn) -@@ -271,8 +274,8 @@ IF(WIN32) ++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}) ++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn) ++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi) + INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}) + MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}") + +@@ -149,20 +152,22 @@ + nativeapi/native_statement_wrapper.h + nativeapi/mysql_native_resultset_wrapper.h + nativeapi/native_resultset_wrapper.h +- ../cppconn/warning.h +- ../cppconn/statement.h +- ../cppconn/sqlstring.h +- ../cppconn/resultset_metadata.h +- ../cppconn/resultset.h +- ../cppconn/prepared_statement.h +- ../cppconn/parameter_metadata.h +- ../cppconn/metadata.h +- ../cppconn/exception.h +- ../cppconn/driver.h +- ../cppconn/datatype.h +- ../cppconn/connection.h +- ../cppconn/config.h +- ../cppconn/build_config.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h + + ) + +@@ -271,8 +276,8 @@ ) ELSE(WIN32) INSTALL(TARGETS mysqlcppconn mysqlcppconn-static - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIB_DIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIB_DIR} ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} ) ENDIF(WIN32) -@@ -282,7 +285,7 @@ SET(MYSQLCPPCONN_SPECIFIC_INSTALL_HEADER - mysql_connection.h - mysql_driver.h) - --INSTALL(FILES ${MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS} DESTINATION include) -+INSTALL(FILES ${MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS} DESTINATION include/mysql-connector) - - - MESSAGE(STATUS "Configuring driver") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
