summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-04-11 11:01:50 +0200
committerRemi Collet <remi@remirepo.net>2017-04-11 11:01:50 +0200
commit5673331630a3d1e9eddcde284f6611e4db7e0d57 (patch)
tree407523cf191bbcf6fb69e56a8a0e2d76019c3c78
parent87b6966cd3f67616ae731e9304b122524ee8528b (diff)
v5.5.55HEADmaster
-rw-r--r--.gitignore7
-rw-r--r--Makefile2
-rw-r--r--compat-mysql55.spec27
3 files changed, 13 insertions, 23 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/Makefile b/Makefile
index 1e65467..91b0fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
SRCDIR := $(shell pwd)
NAME := $(shell basename $(SRCDIR))
-include ../common/Makefile
+include ../../common/Makefile
diff --git a/compat-mysql55.spec b/compat-mysql55.spec
index 255ec09..5a2105d 100644
--- a/compat-mysql55.spec
+++ b/compat-mysql55.spec
@@ -1,11 +1,5 @@
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
-%global with_dtrace 1
-%else
-%global with_dtrace 0
-%endif
-
Name: compat-mysql55
-Version: 5.5.45
+Version: 5.5.55
Release: 1%{?dist}
Summary: MySQL shared libraries
Group: Applications/Databases
@@ -44,12 +38,8 @@ Patch19: mysql-file-contents.patch
Patch20: mysql-string-overflow.patch
Patch22: mysql-innodbwarn.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gperf, perl, readline-devel, openssl-devel
BuildRequires: gcc-c++, cmake, ncurses-devel, zlib-devel, libaio-devel
-%if %{with_dtrace}
-BuildRequires: systemtap-sdt-devel >= 1.3
-%endif
%description
@@ -137,9 +127,6 @@ cmake . -DBUILD_CONFIG=mysql_release \
-DMYSQL_DATADIR="/var/lib/mysql" \
-DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
-DENABLED_LOCAL_INFILE=ON \
-%if %{with_dtrace}
- -DENABLE_DTRACE=ON \
-%endif
-DWITH_READLINE=ON \
-DWITH_SSL=system \
-DWITH_ZLIB=system
@@ -148,8 +135,6 @@ make %{?_smp_mflags} VERBOSE=1
%install
-rm -rf $RPM_BUILD_ROOT
-
make DESTDIR=$RPM_BUILD_ROOT install
# List the installed tree for RPM package maintenance purposes.
@@ -192,17 +177,12 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/resolve_stack_dump
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/postinstall-solaris
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
%doc README COPYING README.mysql-license
%doc README.mysql-docs
%dir %{_libdir}/mysql
@@ -210,13 +190,16 @@ rm -rf $RPM_BUILD_ROOT
/etc/ld.so.conf.d/*
%files devel
-%defattr(-,root,root)
%{_includedir}/mysql
%{_libdir}/mysql/libmysqlclient.so
%{_libdir}/mysql/libmysqlclient_r.so
%changelog
+* Tue Apr 11 2017 Remi Collet <remi@remirepo.net> - 5.5.55-1
+- update to MySQL 5.5.55 Community Server GA
+ http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-55.html
+
* Fri Jul 24 2015 Remi Collet <RPMS@FamilleCollet.com> - 5.5.45-1
- update to 5.5.45