[mysql-connector-java] Fix FTBFS.

Alexander Kurtakov akurtakov at fedoraproject.org
Mon Aug 12 13:34:03 UTC 2013


commit 1905c722a21eb765743473e29e77b0cda569ccf0
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Aug 12 16:33:52 2013 +0300

    Fix FTBFS.

 mysql-connector-java.spec |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index b89c862..ed12419 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -8,7 +8,7 @@
 Summary:    Official JDBC driver for MySQL
 Name:       mysql-connector-java
 Version:    5.1.25
-Release:    2%{?dist}
+Release:    3%{?dist}
 Epoch:      1 
 
 # MySQL FLOSS Exception
@@ -36,8 +36,6 @@ Source0:            %{name}-%{version}.tar.gz
 # Patch to build with JDBC 4.1/Java 7
 Patch0:             %{name}-jdbc-4.1.patch
 
-BuildRoot:          %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 %if ! %{gcj_support}
 BuildArch:          noarch
 %endif
@@ -64,8 +62,6 @@ Requires:           java >= 1:1.6.0
 Requires:           jta >= 1.0
 Requires:           slf4j
 Requires:               jpackage-utils
-Requires(post):         jpackage-utils
-Requires(postun):       jpackage-utils
 
 %description
 MySQL Connector/J is a native Java driver that converts JDBC (Java Database
@@ -124,11 +120,10 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 src/doc/sources/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 sed -i 's/>@.*</>%{version}</' $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
-%add_to_maven_depmap mysql %{name} %{version} JPP %{name}
+%add_maven_depmap
 
 
 %post
-%update_maven_depmap
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
@@ -137,7 +132,6 @@ fi
 %endif
 
 %postun
-%update_maven_depmap
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
@@ -145,9 +139,6 @@ then
 fi
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(0644,root,root,0755)
 %doc CHANGES COPYING docs
@@ -159,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 12 2013 Alexander Kurtakov <akurtako at redhat.com> 1:5.1.25-3
+- Fix FTBFS.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.1.25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list