[mysql-connector-c++/f17] update to 1.1.1

Remi Collet remi at fedoraproject.org
Sat Aug 11 13:27:59 UTC 2012


commit ee435e79e7048ea62031b8ce0486bcab8ce34ca5
Author: remi <fedora at famillecollet.com>
Date:   Sat Aug 11 15:27:48 2012 +0200

    update to 1.1.1

 .gitignore               |    2 +
 mysql-connector-c++.spec |   50 ++++++++++++++++-----------------------------
 sources                  |    2 +-
 3 files changed, 21 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 287af2a..f90eba0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
+*spec~
 mysql-connector-c++-bzr888.tgz
 /mysql-connector-c++-bzr895.tgz
+/mysql-connector-c++-1.1.1.tar.gz
diff --git a/mysql-connector-c++.spec b/mysql-connector-c++.spec
index 64758ed..60cda93 100644
--- a/mysql-connector-c++.spec
+++ b/mysql-connector-c++.spec
@@ -1,33 +1,16 @@
-%global bzr 895
-
-
 Summary:    MySQL database connector for C++
 Name:       mysql-connector-c++
-Version:    1.1.0
-%if 0%{?bzr}
-Release:    0.8.bzr%{?bzr}%{?dist}
-%else
+Version:    1.1.1
 Release:    1%{?dist}
-%endif
 Group:      System Environment/Libraries
 License:    GPLv2 with exceptions
 
+URL:        http://dev.mysql.com/downloads/connector/cpp/
 
-URL:        http://forge.mysql.com/wiki/Connector_C++
-
-%if 0%{?bzr}
-# bzr branch -r 895 lp:~mysql/mysql-connector-cpp/trunk mysql-connector-c++-1.1.0
-# less mysql-connector-c++-1.1.0/driver/mysql_metadata.cpp 
-# check getDriverMajorVersion / getDriverMinorVersion / getDriverPatchVersion
-# tar czf mysql-connector-c++-bzr895.tgz --exclude .bzr mysql-connector-c++-1.1.0
-# rm -rf mysql-connector-c++-1.1.0
-Source0:    %{name}-bzr%{bzr}.tgz
-%else
 # Upstream has a mirror redirector for downloads, so the URL is hard to
 # represent statically.  You can get the tarball by following a link from
 # http://dev.mysql.com/downloads/connector/cpp
 Source0:    %{name}-%{version}.tar.gz
-%endif
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: cmake mysql-devel boost-devel
@@ -63,31 +46,31 @@ These are the files needed to compile programs using MySQL Connector/C++.
 %prep
 %setup -q
 
-%{__sed} -i -e 's/lib$/%{_lib}/' driver/CMakeLists.txt
-%{__chmod} -x examples/*.cpp examples/*.txt
+sed -i -e 's/lib$/%{_lib}/' driver/CMakeLists.txt
+chmod -x examples/*.cpp examples/*.txt
 
 # Save examples to keep directory clean (for doc)
-%{__mkdir} _doc_examples
-%{__cp} -pr examples _doc_examples
+mkdir _doc_examples
+cp -pr examples _doc_examples
 
 
 %build
 %{cmake} -DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=0
 
-%{__make}
+make
 
 
 %install
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
-%{__make} install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
 
 
 %check
 # for documentation purpose only (A MySQL server is required)
 # cd test
 # ./static_test tcp://127.0.0.1 user password test_database
-# Should output : Loops= 2 Tests=  592 Failures=   0
+# Should output : Loops= 2 Tests=  798 Failures=   0
 # ./driver_test tcp://127.0.0.1 user password test_database
 # Should output :  Loops= 2 Tests=  592 Failures=   0
 
@@ -103,14 +86,14 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCEMEN* COPYING README CHANGES
-%{_libdir}/libmysqlcppconn.so.*
+%doc ANNOUNCEMEN* COPYING README CHANGES Licenses_for_Third-Party_Components.txt
+%{_libdir}/libmysqlcppconn.so.6*
 %exclude %{_libdir}/libmysqlcppconn-static.a
+%exclude %{_prefix}/ANNOUNCEMENT
 %exclude %{_prefix}/COPYING
+%exclude %{_prefix}/INSTALL
+%exclude %{_prefix}/Licenses_for_Third-Party_Components.txt
 %exclude %{_prefix}/README
-%if 0%{?bzr} == 0
-%exclude %{_prefix}/ANNOUNCEMENT
-%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -121,6 +104,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug  8 2012 Remi Collet <remi at fedoraproject.org> - 1.1.1-1
+- version 1.1.1
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-0.8.bzr895
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 94f3bc3..9374cd1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef824818419b8fb0f1396e37ce040d7a  mysql-connector-c++-bzr895.tgz
+3f3134ac39a5d56fdd360f2ad0121a99  mysql-connector-c++-1.1.1.tar.gz


More information about the scm-commits mailing list