[mysql-connector-c++] update to 1.1.0 from bzr snapshot 895 (for Workbench 5.2.28)

[Remi Collet]

commit 61c2dfe7dae48a6f671cc1eadeca4a055fb5ceaf
Author: remi <fedora at famillecollet.com>
Date:   Tue Sep 21 18:30:13 2010 +0200

    update to 1.1.0 from bzr snapshot 895 (for Workbench 5.2.28)

 .gitignore               |    1 +
 mysql-connector-c++.spec |   25 +++++++++++++++++++------
 sources                  |    2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 498be68..287af2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 mysql-connector-c++-bzr888.tgz
+/mysql-connector-c++-bzr895.tgz
diff --git a/mysql-connector-c++.spec b/mysql-connector-c++.spec
index e078fe1..b2e0d16 100644
--- a/mysql-connector-c++.spec
+++ b/mysql-connector-c++.spec
@@ -1,10 +1,14 @@
-%global bzr 888
+%global bzr 895
 
 
 Summary:    MySQL database connector for C++
 Name:       mysql-connector-c++
 Version:    1.1.0
-Release:    0.2.bzr%{?bzr}%{?dist}
+%if 0%{?bzr}
+Release:    0.3.bzr%{?bzr}%{?dist}
+%else
+Release:    1%{?dist}
+%endif
 Group:      System Environment/Libraries
 License:    GPLv2 with exceptions
 
@@ -12,14 +16,17 @@ License:    GPLv2 with exceptions
 URL:        http://forge.mysql.com/wiki/Connector_C++
 
 %if 0%{?bzr}
-# bzr branch -r 888 lp:~mysql/mysql-connector-cpp/trunk mysql-connector-c++-1.1.0
+# 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++-bzr888.tgz --exclude .bzr mysql-connector-c++-1.1.0
+# tar czf mysql-connector-c++-bzr895.tgz --exclude .bzr mysql-connector-c++-1.1.0
 # rm -rf mysql-connector-c++-1.1.0
-Source0:    mysql-connector-c++-bzr%{bzr}.tgz
+Source0:    %{name}-bzr%{bzr}.tgz
 %else
-Source0:    http://dev.mysql.com/get/Downloads/Connector-C++/%{name}-%{version}.tar.gz
+# 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
@@ -101,6 +108,9 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/libmysqlcppconn-static.a
 %exclude %{_prefix}/COPYING
 %exclude %{_prefix}/README
+%if 0%{?bzr} == 0
+%exclude %{_prefix}/ANNOUNCEMENT
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -111,6 +121,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 20 2010 Remi Collet <Fedora at famillecollet.com> 1.1.0-0.3.bzr895
+- update to 1.1.0 from bzr snapshot 895 (for Workbench 5.2.28)
+
 * Mon Aug 09 2010 Remi Collet <Fedora at famillecollet.com> 1.1.0-0.2.bzr888
 - Changes from review (#622272)
 
diff --git a/sources b/sources
index 8a983d4..94f3bc3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6dc4f8c40b374ab2aa27fffedc4d584  mysql-connector-c++-bzr888.tgz
+ef824818419b8fb0f1396e37ce040d7a  mysql-connector-c++-bzr895.tgz