Hello community,

here is the log from the commit of package mysql-connector-c++ for 
openSUSE:Factory checked in at 2012-12-05 14:00:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-c++ (Old)
 and      /work/SRC/openSUSE:Factory/.mysql-connector-c++.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mysql-connector-c++", Maintainer is ""

Changes:
--------
New Changes file:

--- /dev/null   2012-11-30 12:21:47.308011256 +0100
+++ 
/work/SRC/openSUSE:Factory/.mysql-connector-c++.new/mysql-connector-c++.changes 
    2012-12-05 14:00:36.000000000 +0100
@@ -0,0 +1,21 @@
+-------------------------------------------------------------------
+Thu Nov 29 10:50:48 UTC 2012 - [email protected]
+
+- Change the license to proper one. Thanks to babelworx for the
+  info.
+
+-------------------------------------------------------------------
+Thu Nov 22 17:43:37 UTC 2012 - [email protected]
+
+- Less docs than anticipated.
+
+-------------------------------------------------------------------
+Thu Nov 22 13:16:33 UTC 2012 - [email protected]
+
+- Require mysql-devel on devel pkg. Install docs.
+
+-------------------------------------------------------------------
+Thu Nov 22 12:55:14 UTC 2012 - [email protected]
+
+- Initial commit. Used in libreoffice.
+

New:
----
  mysql-connector-c++-1.1.0-disable-tests.patch
  mysql-connector-c++-1.1.0-fix-cmake.patch
  mysql-connector-c++-1.1.1.tar.gz
  mysql-connector-c++.changes
  mysql-connector-c++.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mysql-connector-c++.spec ++++++
#
# spec file for package mysql-connector-c++
#
# Copyright (c) 2012 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

%define libname libmysqlcppconn6
Name:           mysql-connector-c++
Summary:        MySQL database connector for C++ (mimics JDBC 4.0 API)
Version:        1.1.1
Release:        0
Group:          Productivity/Databases/Clients
License:        SUSE-GPL-2.0-with-FLOSS-exception
Url:            http://dev.mysql.com/downloads/connector/cpp/
Source:         %{name}-%{version}.tar.gz
Patch0:         mysql-connector-c++-1.1.0-fix-cmake.patch
Patch1:         mysql-connector-c++-1.1.0-disable-tests.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
BuildRequires:  pkgconfig
BuildRequires:  cmake
BuildRequires:  boost-devel
BuildRequires:  openssl-devel
BuildRequires:  mysql-devel
BuildRequires:  gcc-c++

%description
MySQL Connector/C++ is a MySQL database connector for C++. It lets you develop 
applications in C++ that connect to the MySQL Server.

%package -n %{libname}
License:        SUSE-GPL-2.0-with-FLOSS-exception
Summary:        MySQL database connector for C++ (mimics JDBC 4.0 API)
Group:          Productivity/Databases/Clients

%description -n %{libname}
MySQL Connector/C++ is a MySQL database connector for C++. It lets you develop 
applications in C++ that connect to the MySQL Server.

%package devel
License:        SUSE-GPL-2.0-with-FLOSS-exception
Requires:       %{libname} = %{version}
Requires:       mysql-devel
Summary:        Files for Developing with %{name}
Group:          Development/Libraries/C and C++

%description devel
Includes and definitions for developing with the %{name} library.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
cmake \
        -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

make %{?_smp_mflags}

%install
make DESTDIR=%{buildroot} install

# broken docs install
rm -rf 
%{buildroot}/usr/{ANNOUNCEMENT,COPYING,INSTALL,Licenses_for_Third-Party_Components.txt,README}
# static lib :/
rm -rf %{buildroot}%{_libdir}/*.a

%clean
rm -rf $RPM_BUILD_ROOT

%post -n %{libname} -p /sbin/ldconfig

%postun -n %{libname} -p /sbin/ldconfig

%files -n %{libname}
%defattr(-,root,root,-)
%doc ANNOUNCEMEN* COPYING README CHANGES Licenses_for_Third-Party_Components.txt
%{_libdir}/*.so.6*

%files devel
%defattr(-,root,root,-)
%{_includedir}/cppconn
%{_includedir}/*.h
%{_libdir}/*.so

%changelog
++++++ mysql-connector-c++-1.1.0-disable-tests.patch ++++++
diff -urNad mysql-connector-c++-1.0.6~r754~/CMakeLists.txt 
mysql-connector-c++-1.0.6~r754/CMakeLists.txt
--- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt      2009-08-20 
22:25:35.000000000 +0200
+++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt       2009-08-20 
22:25:57.000000000 +0200
@@ -241,10 +241,6 @@
 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-c++-1.1.0-fix-cmake.patch ++++++
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)
+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 lib${LIB_SUFFIX}
+               ARCHIVE DESTINATION lib${LIB_SUFFIX}
        )
 ENDIF(WIN32)
 
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to