From 470b18278653918dd6e5b42cd1bcc5c7d49f4944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Mu=C5=BEila?= Date: Wed, 24 Sep 2014 12:54:24 +0200 Subject: [PATCH] Initial version for 2.0.0 --- .gitignore | 1 + ...adb-connector-c-2.0.0-libdirectories.patch | 52 +++++++++++++ mariadb-connector-c.spec | 75 +++++++++++++++++++ sources | 1 + 4 files changed, 129 insertions(+) create mode 100644 mariadb-connector-c-2.0.0-libdirectories.patch create mode 100644 mariadb-connector-c.spec diff --git a/.gitignore b/.gitignore index e69de29..2aa920d 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/mariadb_client-2.0.0-src.tar.gz diff --git a/mariadb-connector-c-2.0.0-libdirectories.patch b/mariadb-connector-c-2.0.0-libdirectories.patch new file mode 100644 index 0000000..3621ea1 --- /dev/null +++ b/mariadb-connector-c-2.0.0-libdirectories.patch @@ -0,0 +1,52 @@ +diff -rup 1/mariadb_client-2.0.0-src/CMakeLists.txt 2/mariadb_client-2.0.0-src/CMakeLists.txt +--- 1/mariadb_client-2.0.0-src/CMakeLists.txt 2014-09-09 18:13:23.456049673 +0200 ++++ 2/mariadb_client-2.0.0-src/CMakeLists.txt 2014-09-09 18:34:34.016628405 +0200 +@@ -102,7 +102,7 @@ INCLUDE(cmake/SearchLibrary.cmake) + IF(WITH_EXTERNAL_ZLIB) + FIND_PACKAGE(ZLIB QUIET) + IF(${ZLIB_FOUND}) +- SET(LIBZ "-lz") ++ SET(LIBZ "z") + ENDIF() + ENDIF() + +diff -rup 1/mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt 2/mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt +--- 1/mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt 2014-09-09 18:13:23.440049728 +0200 ++++ 2/mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt 2014-09-09 18:03:26.991125238 +0200 +@@ -210,15 +210,15 @@ ENDIF() + + INSTALL(TARGETS + libmariadb mariadbclient +- RUNTIME DESTINATION "lib/mariadb" +- LIBRARY DESTINATION "lib/mariadb" +- ARCHIVE DESTINATION "lib/mariadb") ++ RUNTIME DESTINATION "${LIB_INSTALL_DIR}/mariadb" ++ LIBRARY DESTINATION "${LIB_INSTALL_DIR}/mariadb" ++ ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/mariadb") + IF(NOT WIN32 AND WITH_MYSQLCOMPAT) + INSTALL(FILES "${CMAKE_BINARY_DIR}/libmariadb/libmysql${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX}" +- DESTINATION lib/mariadb) ++ DESTINATION ${LIB_INSTALL_DIR}/mariadb) + ENDIF() + + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ +diff -rup 1/mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in 2/mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in +--- 1/mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in 2014-09-09 18:13:23.442049722 +0200 ++++ 2/mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in 2014-09-10 11:49:13.548395885 +0200 +@@ -3,10 +3,10 @@ + #include + #include + +-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include/mariadb" +-#define LIBS "-L@CMAKE_INSTALL_PREFIX@/lib/mariadb -lmariadb" \ ++#define INCLUDE "-I@INCLUDE_INSTALL_DIR@/mariadb" ++#define LIBS "-L@LIB_INSTALL_DIR@/mariadb -lmariadb" \ + "@extra_dynamic_LDFLAGS@" +-#define CFLAGS INCLUDE "@CMAKE_C_FLAGS@" ++#define CFLAGS INCLUDE " @CMAKE_C_FLAGS@" + #define VERSION "@MYSQL_CLIENT_VERSION@" + #define SOCKET "@MYSQL_UNIX_ADDR@" + #define PORT "@MYSQL_PORT@" diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec new file mode 100644 index 0000000..e4e1530 --- /dev/null +++ b/mariadb-connector-c.spec @@ -0,0 +1,75 @@ +Summary: The MariaDB Native Client library (C driver) +Name: mariadb-connector-c +Version: 2.0.0 +Release: 2%{?dist} + +License: LGPLv2+ +Group: Applications/Databases +Source: https://downloads.mariadb.org/f/client-native-2.0.0/src/mariadb_client-%{version}-src.tar.gz +Url: https://mariadb.org/en/ +BuildRequires: zlib-devel cmake + +#Patch0: fixes libdir paths on 64 bit systems +Patch0: mariadb-connector-c-2.0.0-libdirectories.patch + +%description +The MariaDB Native Client library (C driver) is used to connect applications +developed in C/C++ to MariaDB and MySQL databases. + +%package devel +Summary: Development files for mariadb-connector-c. +Group: Development/Libraries +Requires: mariadb-connector-c = %{version}-%{release} +BuildRequires: xmlto + +%description devel +Development files for mariadb-connector-c. + +%prep +%setup -q -n mariadb_client-%{version}-src +%patch0 -p2 -b .libdirectories + +%build +%cmake . -DMYSQL_UNIX_ADDR=/var/lib/mysql/mysql.sock -DWITH_EXTERNAL_ZLIB=ON + +make %{?_smp_mflags} + +pushd docs +%cmake . +make %{?_smp_mflags} +popd + +%install +make install DESTDIR=$RPM_BUILD_ROOT + +rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmariadbclient.a +rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmysqlclient.a + +rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/Makefile.am +rm -r /$RPM_BUILD_ROOT%{_includedir}/mariadb/CMakeFiles +rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/mysql_version.h.in +rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/Makefile +rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/CMakeLists.txt +rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/my_config.h.in +rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/cmake_install.cmake + +%files +%defattr(-,root,root,-) +%{_libdir}/mariadb/libmariadb.so.2 +%doc README COPYING.LIB + +%files devel +%defattr(-,root,root,-) +%{_bindir}/* +%{_libdir}/mariadb/libmariadb.so +%{_libdir}/mariadb/libmysqlclient_r.so +%{_libdir}/mariadb/libmysqlclient.so +%{_libdir}/mariadb/libmysql.so + +%{_includedir}/mariadb +%doc docs/html + +%changelog +* Tue Aug 26 2014 Matej Mužila - 2.0.0-2 +- Initial version for 2.0.0 + diff --git a/sources b/sources index e69de29..b4ed03f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +a233181e03d3c307668b4c722d881661 mariadb_client-2.0.0-src.tar.gz