diff options
Diffstat (limited to 'mysql55/mysql-connector-odbc.spec.diff')
| -rw-r--r-- | mysql55/mysql-connector-odbc.spec.diff | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/mysql55/mysql-connector-odbc.spec.diff b/mysql55/mysql-connector-odbc.spec.diff new file mode 100644 index 0000000..a747c1f --- /dev/null +++ b/mysql55/mysql-connector-odbc.spec.diff @@ -0,0 +1,81 @@ +--- mysql-connector-odbc.spec.nodsc 2012-02-05 18:05:03.000000000 +0100 ++++ mysql-connector-odbc.spec 2012-05-25 10:52:32.488766083 +0200 +@@ -1,5 +1,12 @@ ++# Sets %%pkg_name to 'mysql-connector-odbc' if we build for scl. ++%{?scl:%scl_package mysql-connector-odbc} ++# If we don't build for scl, then pkg_name is empty. ++# This way, we can always use %%pkg_name for 'mysql-connector-odbc', be it scl build or not. ++%{!?scl:%global pkg_name mysql-connector-odbc} ++# %%{name} then references to either 'mysql-connector-odbc' (not in scl) or '%%{?scl:%scl_prefix}mysql-connector-odbc' (in scl). ++ + Summary: ODBC driver for MySQL +-Name: mysql-connector-odbc ++Name: %{?scl_prefix}mysql-connector-odbc + Version: 5.1.10 + Release: 1%{?dist} + Group: System Environment/Libraries +@@ -11,7 +18,7 @@ License: GPLv2 with exceptions + # 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/odbc/ +-Source0: %{name}-%{version}-src.tar.gz ++Source0: %{pkg_name}-%{version}-src.tar.gz + + # mysql-connector-odbc expects to be able to get at a bunch of utility + # functions inside libmysqlclient. Now that we are restricting what symbols +@@ -26,7 +33,8 @@ Patch1: myodbc-add-mysys.patch + Patch2: myodbc-shutdown.patch + Patch3: myodbc-64bit.patch + +-BuildRequires: mysql-devel unixODBC-devel ++BuildRequires: %{?scl:%scl_prefix}mysql-devel ++BuildRequires: unixODBC-devel + BuildRequires: automake autoconf libtool libtool-ltdl-devel + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +@@ -34,7 +42,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version + An ODBC (rev 3) driver for MySQL, for use with unixODBC. + + %prep +-%setup -q -n %{name}-%{version}-src ++%setup -q -n %{pkg_name}-%{version}-src + + tar xfz %{SOURCE1} + +@@ -56,13 +64,16 @@ automake -a + automake + autoconf + ++%{?scl:scl enable %scl - << \EOF} + %configure \ + --disable-gui \ + --with-unixODBC \ + --with-unixODBC-libs=%{_libdir} \ + --with-odbc-ini=/etc/odbc.ini \ + --with-mysql-includes=%{_includedir}/mysql \ +- --with-mysql-libs=%{_libdir}/mysql ++ --with-mysql-libs=%{_libdir}/mysql \ ++ --with-mysql-path=%{_prefix} ++%{?scl:EOF} + + export tagname=CC + make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} +@@ -80,12 +91,12 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/myodbc-i + rm -f $RPM_BUILD_ROOT%{_libdir}/libmyodbc5.*a + + # makefile thinks it should install docs in totally wrong place +-rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/COPYING +-rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/README +-rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/README.debug +-rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/ChangeLog +-rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/INSTALL +-rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/Licenses_for_Third-Party_Components.txt ++rm -f $RPM_BUILD_ROOT%{_datadir}/mysql-connector-odbc/COPYING ++rm -f $RPM_BUILD_ROOT%{_datadir}/mysql-connector-odbc/README ++rm -f $RPM_BUILD_ROOT%{_datadir}/mysql-connector-odbc/README.debug ++rm -f $RPM_BUILD_ROOT%{_datadir}/mysql-connector-odbc/ChangeLog ++rm -f $RPM_BUILD_ROOT%{_datadir}/mysql-connector-odbc/INSTALL ++rm -f $RPM_BUILD_ROOT%{_datadir}/mysql-connector-odbc/Licenses_for_Third-Party_Components.txt + + %clean + rm -rf $RPM_BUILD_ROOT |