Skip to content

Commit 3cab0d6

Browse files
trostentrosten
committed
Merge branch 'mysql-5.5' into mysql-5.6
2 parents 7b179af + 4a3f1c1 commit 3cab0d6

3 files changed

Lines changed: 67 additions & 61 deletions

File tree

‎packaging/rpm-fedora/mysql.spec.in‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
%global license_type GPLv2
5555
%endif
5656

57+
%global min 5.6.10
58+
5759
Name: mysql-%{product_suffix}
5860
Summary: A very fast and reliable SQL database server
5961
Group: Applications/Databases
@@ -113,10 +115,10 @@ Requires: shadow-utils
113115
Requires: net-tools
114116
%if 0%{?commercial}
115117
Obsoletes: mysql-community-server < %{version}-%{release}
116-
Requires: mysql-commercial-client%{?_isa} = %{version}-%{release}
118+
Requires: mysql-commercial-client%{?_isa} >= %{min}
117119
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release}
118120
%else
119-
Requires: mysql-community-client%{?_isa} = %{version}-%{release}
121+
Requires: mysql-community-client%{?_isa} >= %{min}
120122
Requires: mysql-community-common%{?_isa} = %{version}-%{release}
121123
%endif
122124
Obsoletes: mariadb-server
@@ -158,9 +160,9 @@ Summary: MySQL database client applications and tools
158160
Group: Applications/Databases
159161
%if 0%{?commercial}
160162
Obsoletes: mysql-community-client < %{version}-%{release}
161-
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release}
163+
Requires: mysql-commercial-libs%{?_isa} >= %{min}
162164
%else
163-
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
165+
Requires: mysql-community-libs%{?_isa} >= %{min}
164166
%endif
165167
Obsoletes: mariadb
166168
Obsoletes: community-mysql < %{version}-%{release}
@@ -196,10 +198,10 @@ MySQL database server, and MySQL embedded server.
196198
Summary: Test suite for the MySQL database server
197199
Group: Applications/Databases
198200
%if 0%{?commercial}
199-
Requires: mysql-commercial-server%{?_isa} = %{version}-%{release}
201+
Requires: mysql-commercial-server%{?_isa} >= %{min}
200202
Obsoletes: mysql-community-test < %{version}-%{release}
201203
%else
202-
Requires: mysql-community-server%{?_isa} = %{version}-%{release}
204+
Requires: mysql-community-server%{?_isa} >= %{min}
203205
%endif
204206
Obsoletes: mariadb-test
205207
Obsoletes: community-mysql-test < %{version}-%{release}
@@ -217,9 +219,9 @@ Summary: MySQL benchmark suite
217219
Group: Applications/Databases
218220
%if 0%{?commercial}
219221
Obsoletes: mysql-community-bench < %{version}-%{release}
220-
Requires: mysql-commercial-server%{?_isa} = %{version}-%{release}
222+
Requires: mysql-commercial-server%{?_isa} >= %{min}
221223
%else
222-
Requires: mysql-community-server%{?_isa} = %{version}-%{release}
224+
Requires: mysql-community-server%{?_isa} >= %{min}
223225
%endif
224226
Obsoletes: mariadb-bench
225227
Obsoletes: community-mysql-bench < %{obs_ver}
@@ -236,9 +238,9 @@ Summary: Development header files and libraries for MySQL database client
236238
Group: Applications/Databases
237239
%if 0%{?commercial}
238240
Obsoletes: mysql-community-devel < %{version}-%{release}
239-
Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release}
241+
Requires: mysql-commercial-libs%{?_isa} >= %{min}
240242
%else
241-
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
243+
Requires: mysql-community-libs%{?_isa} >= %{min}
242244
%endif
243245
Obsoletes: mariadb-devel
244246
Obsoletes: community-mysql-devel < %{obs_ver}
@@ -255,9 +257,9 @@ Summary: Shared libraries for MySQL database client applications
255257
Group: Applications/Databases
256258
%if 0%{?commercial}
257259
Obsoletes: mysql-community-libs < %{version}-%{release}
258-
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release}
260+
Requires: mysql-commercial-common%{?_isa} >= %{min}
259261
%else
260-
Requires: mysql-community-common%{?_isa} = %{version}-%{release}
262+
Requires: mysql-community-common%{?_isa} >= %{min}
261263
%endif
262264
Obsoletes: mariadb-libs
263265
Obsoletes: community-mysql-libs < %{version}-%{release}
@@ -301,11 +303,11 @@ Summary: Development header files and libraries for MySQL as an embeddabl
301303
Group: Applications/Databases
302304
%if 0%{?commercial}
303305
Obsoletes: mysql-community-embedded-devel < %{version}-%{release}
304-
Requires: mysql-commercial-devel%{?_isa} = %{version}-%{release}
305-
Requires: mysql-commercial-embedded%{?_isa} = %{version}-%{release}
306+
Requires: mysql-commercial-devel%{?_isa} >= %{min}
307+
Requires: mysql-commercial-embedded%{?_isa} >= %{min}
306308
%else
307-
Requires: mysql-community-devel%{?_isa} = %{version}-%{release}
308-
Requires: mysql-community-embedded%{?_isa} = %{version}-%{release}
309+
Requires: mysql-community-devel%{?_isa} >= %{min}
310+
Requires: mysql-community-embedded%{?_isa} >= %{min}
309311
%endif
310312
Obsoletes: mariadb-embedded-devel
311313
Obsoletes: community-mysql-embedded-devel < %{version}-%{release}

‎packaging/rpm-oel/mysql.spec.in‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@
8181
%global license_type GPLv2
8282
%endif
8383

84+
%global min 5.6.10
85+
8486
Name: mysql-%{product_suffix}
8587
Summary: A very fast and reliable SQL database server
8688
Group: Applications/Databases
@@ -159,11 +161,11 @@ Requires: net-tools
159161
Provides: MySQL-server-advanced%{?_isa} = %{version}-%{release}
160162
Obsoletes: MySQL-server-advanced < %{version}-%{release}
161163
Obsoletes: mysql-community-server < %{version}-%{release}
162-
Requires: mysql-commercial-client%{?_isa} = %{version}-%{release}
164+
Requires: mysql-commercial-client%{?_isa} >= %{min}
163165
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release}
164166
%else
165167
Provides: MySQL-server%{?_isa} = %{version}-%{release}
166-
Requires: mysql-community-client%{?_isa} = %{version}-%{release}
168+
Requires: mysql-community-client%{?_isa} >= %{min}
167169
Requires: mysql-community-common%{?_isa} = %{version}-%{release}
168170
%endif
169171
Obsoletes: MySQL-server < %{version}-%{release}
@@ -212,10 +214,10 @@ Group: Applications/Databases
212214
Provides: MySQL-client-advanced%{?_isa} = %{version}-%{release}
213215
Obsoletes: MySQL-client-advanced < %{version}-%{release}
214216
Obsoletes: mysql-community-client < %{version}-%{release}
215-
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release}
217+
Requires: mysql-commercial-libs%{?_isa} >= %{min}
216218
%else
217219
Provides: MySQL-client%{?_isa} = %{version}-%{release}
218-
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
220+
Requires: mysql-community-libs%{?_isa} >= %{min}
219221
%endif
220222
Obsoletes: MySQL-client < %{version}-%{release}
221223
Obsoletes: mariadb
@@ -237,7 +239,7 @@ Obsoletes: mysql-community-common < %{version}-%{release}
237239
%endif
238240
Provides: mysql-common = %{version}-%{release}
239241
Provides: mysql-common%{?_isa} = %{version}-%{release}
240-
%{?el5:Requires: mysql%{?_isa} = %{version}-%{release}}
242+
%{?el5:Requires: mysql%{?_isa} >= %{min}}
241243

242244
%description common
243245
This packages contains common files needed by MySQL client library,
@@ -251,10 +253,10 @@ Group: Applications/Databases
251253
Provides: MySQL-test-advanced%{?_isa} = %{version}-%{release}
252254
Obsoletes: MySQL-test-advanced < %{version}-%{release}
253255
Obsoletes: mysql-community-test < %{version}-%{release}
254-
Requires: mysql-commercial-server%{?_isa} = %{version}-%{release}
256+
Requires: mysql-commercial-server%{?_isa} >= %{min}
255257
%else
256258
Provides: MySQL-test%{?_isa} = %{version}-%{release}
257-
Requires: mysql-community-server%{?_isa} = %{version}-%{release}
259+
Requires: mysql-community-server%{?_isa} >= %{min}
258260
%endif
259261
Obsoletes: MySQL-test < %{version}-%{release}
260262
Obsoletes: mysql-test < %{version}-%{release}
@@ -272,9 +274,9 @@ Summary: MySQL benchmark suite
272274
Group: Applications/Databases
273275
%if 0%{?commercial}
274276
Obsoletes: mysql-community-bench < %{version}-%{release}
275-
Requires: mysql-commercial-server%{?_isa} = %{version}-%{release}
277+
Requires: mysql-commercial-server%{?_isa} >= %{min}
276278
%else
277-
Requires: mysql-community-server%{?_isa} = %{version}-%{release}
279+
Requires: mysql-community-server%{?_isa} >= %{min}
278280
%endif
279281
Obsoletes: mariadb-bench
280282
Obsoletes: community-mysql-bench < %{version}-%{release}
@@ -293,10 +295,10 @@ Group: Applications/Databases
293295
Provides: MySQL-devel-advanced%{?_isa} = %{version}-%{release}
294296
Obsoletes: MySQL-devel-advanced < %{version}-%{release}
295297
Obsoletes: mysql-community-devel < %{version}-%{release}
296-
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release}
298+
Requires: mysql-commercial-libs%{?_isa} >= %{min}
297299
%else
298300
Provides: MySQL-devel%{?_isa} = %{version}-%{release}
299-
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
301+
Requires: mysql-community-libs%{?_isa} >= %{min}
300302
%endif
301303
Obsoletes: MySQL-devel < %{version}-%{release}
302304
Obsoletes: mysql-devel < %{version}-%{release}
@@ -316,10 +318,10 @@ Group: Applications/Databases
316318
Provides: MySQL-shared-advanced%{?_isa} = %{version}-%{release}
317319
Obsoletes: MySQL-shared-advanced < %{version}-%{release}
318320
Obsoletes: mysql-community-libs < %{version}-%{release}
319-
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release}
321+
Requires: mysql-commercial-common%{?_isa} >= %{min}
320322
%else
321323
Provides: MySQL-shared%{?_isa} = %{version}-%{release}
322-
Requires: mysql-community-common%{?_isa} = %{version}-%{release}
324+
Requires: mysql-community-common%{?_isa} >= %{min}
323325
%endif
324326
Obsoletes: MySQL-shared < %{version}-%{release}
325327
Obsoletes: mysql-libs < %{version}-%{release}
@@ -343,10 +345,10 @@ Provides: mysql-libs-compat%{?_isa} = %{version}-%{release}
343345
Provides: MySQL-shared-compat-advanced%{?_isa} = %{version}-%{release}
344346
Obsoletes: MySQL-shared-compat-advanced < %{version}-%{release}
345347
Obsoletes: mysql-community-libs-compat < %{version}-%{release}
346-
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release}
348+
Requires: mysql-commercial-libs%{?_isa} >= %{min}
347349
%else
348350
Provides: MySQL-shared-compat%{?_isa} = %{version}-%{release}
349-
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
351+
Requires: mysql-community-libs%{?_isa} >= %{min}
350352
%endif
351353
Obsoletes: MySQL-shared-compat < %{version}-%{release}
352354
%if 0%{?rhel} > 5
@@ -393,11 +395,11 @@ Summary: Development header files and libraries for MySQL as an embeddabl
393395
Group: Applications/Databases
394396
%if 0%{?commercial}
395397
Obsoletes: mysql-community-embedded-devel < %{version}-%{release}
396-
Requires: mysql-commercial-devel%{?_isa} = %{version}-%{release}
397-
Requires: mysql-commercial-embedded%{?_isa} = %{version}-%{release}
398+
Requires: mysql-commercial-devel%{?_isa} >= %{min}
399+
Requires: mysql-commercial-embedded%{?_isa} >= %{min}
398400
%else
399-
Requires: mysql-community-devel%{?_isa} = %{version}-%{release}
400-
Requires: mysql-community-embedded%{?_isa} = %{version}-%{release}
401+
Requires: mysql-community-devel%{?_isa} >= %{min}
402+
Requires: mysql-community-embedded%{?_isa} >= %{min}
401403
%endif
402404
Obsoletes: mariadb-embedded-devel
403405
Obsoletes: mysql-embedded-devel < %{version}-%{release}
@@ -413,13 +415,13 @@ the embedded version of the MySQL server.
413415
Summary: Convenience package for easy upgrades of MySQL package set
414416
Group: Applications/Databases
415417
%if 0%{?commercial}
416-
Requires: mysql-commercial-client%{?_isa} = %{version}-%{release}
417-
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release}
418-
Requires: mysql-commercial-libs-compat%{?_isa} = %{version}-%{release}
418+
Requires: mysql-commercial-client%{?_isa} >= %{min}
419+
Requires: mysql-commercial-libs%{?_isa} >= %{min}
420+
Requires: mysql-commercial-libs-compat%{?_isa} >= %{min}
419421
%else
420-
Requires: mysql-community-client%{?_isa} = %{version}-%{release}
421-
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
422-
Requires: mysql-community-libs-compat%{?_isa} = %{version}-%{release}
422+
Requires: mysql-community-client%{?_isa} >= %{min}
423+
Requires: mysql-community-libs%{?_isa} >= %{min}
424+
Requires: mysql-community-libs-compat%{?_isa} >= %{min}
423425
%endif
424426

425427
%description -n mysql

‎packaging/rpm-sles/mysql.spec.in‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
%{?sles12: %global systemd 1}
6767
%{!?_tmpfilesdir: %global _tmpfilesdir /usr/lib/tmpfiles.d}
6868

69+
%global min 5.6.10
70+
6971
Name: mysql-%{product_suffix}
7072
Summary: A very fast and reliable SQL database server
7173
Group: Applications/Databases
@@ -136,12 +138,12 @@ Requires: perl-base
136138
Provides: MySQL-server-advanced = %{version}-%{release}
137139
Obsoletes: MySQL-server-advanced < %{version}-%{release}
138140
Obsoletes: mysql-community-server < %{version}-%{release}
139-
Requires: mysql-commercial-client = %{version}-%{release}
140-
Requires: mysql-commercial-common = %{version}-%{release}
141+
Requires: mysql-commercial-client >= %{min}
142+
Requires: mysql-commercial-common >= %{min}
141143
%else
142144
Provides: MySQL-server = %{version}-%{release}
143-
Requires: mysql-community-client = %{version}-%{release}
144-
Requires: mysql-community-common = %{version}-%{release}
145+
Requires: mysql-community-client >= %{min}
146+
Requires: mysql-community-common >= %{min}
145147
%endif
146148
Obsoletes: MySQL-server < %{version}-%{release}
147149
Obsoletes: mysql < %{version}-%{release}
@@ -189,10 +191,10 @@ Group: Applications/Databases
189191
Provides: MySQL-client-advanced = %{version}-%{release}
190192
Obsoletes: MySQL-client-advanced < %{version}-%{release}
191193
Obsoletes: mysql-community-client < %{version}-%{release}
192-
Requires: mysql-commercial-libs = %{version}-%{release}
194+
Requires: mysql-commercial-libs >= %{min}
193195
%else
194196
Provides: MySQL-client = %{version}-%{release}
195-
Requires: mysql-community-libs = %{version}-%{release}
197+
Requires: mysql-community-libs >= %{min}
196198
%endif
197199
Obsoletes: MySQL-client < %{version}-%{release}
198200
Provides: mysql-client = %{version}-%{release}
@@ -224,10 +226,10 @@ Group: Applications/Databases
224226
Provides: MySQL-test-advanced = %{version}-%{release}
225227
Obsoletes: MySQL-test-advanced < %{version}-%{release}
226228
Obsoletes: mysql-community-test < %{version}-%{release}
227-
Requires: mysql-commercial-server = %{version}-%{release}
229+
Requires: mysql-commercial-server >= %{min}
228230
%else
229231
Provides: MySQL-test = %{version}-%{release}
230-
Requires: mysql-community-server = %{version}-%{release}
232+
Requires: mysql-community-server >= %{min}
231233
%endif
232234
Obsoletes: MySQL-test < %{version}-%{release}
233235
Obsoletes: mysql-test < %{version}-%{release}
@@ -245,9 +247,9 @@ Summary: MySQL benchmark suite
245247
Group: Applications/Databases
246248
%if 0%{?commercial}
247249
Obsoletes: mysql-community-bench < %{version}-%{release}
248-
Requires: mysql-commercial-server = %{version}-%{release}
250+
Requires: mysql-commercial-server >= %{min}
249251
%else
250-
Requires: mysql-community-server = %{version}-%{release}
252+
Requires: mysql-community-server >= %{min}
251253
%endif
252254
Obsoletes: mariadb-bench
253255
Obsoletes: community-mysql-bench < %{version}-%{release}
@@ -266,10 +268,10 @@ Group: Applications/Databases
266268
Provides: MySQL-devel-advanced = %{version}-%{release}
267269
Obsoletes: MySQL-devel-advanced < %{version}-%{release}
268270
Obsoletes: mysql-community-devel < %{version}-%{release}
269-
Requires: mysql-commercial-libs = %{version}-%{release}
271+
Requires: mysql-commercial-libs >= %{min}
270272
%else
271273
Provides: MySQL-devel = %{version}-%{release}
272-
Requires: mysql-community-libs = %{version}-%{release}
274+
Requires: mysql-community-libs >= %{min}
273275
%endif
274276
Obsoletes: MySQL-devel < %{version}-%{release}
275277
Obsoletes: mysql-devel < %{version}-%{release}
@@ -290,10 +292,10 @@ Group: Applications/Databases
290292
Provides: MySQL-shared-advanced = %{version}-%{release}
291293
Obsoletes: MySQL-shared-advanced < %{version}-%{release}
292294
Obsoletes: mysql-community-libs < %{version}-%{release}
293-
Requires: mysql-commercial-common = %{version}-%{release}
295+
Requires: mysql-commercial-common >= %{min}
294296
%else
295297
Provides: MySQL-shared = %{version}-%{release}
296-
Requires: mysql-community-common = %{version}-%{release}
298+
Requires: mysql-community-common >= %{min}
297299
%endif
298300
Obsoletes: MySQL-shared < %{version}-%{release}
299301
Obsoletes: mysql-libs < %{version}-%{release}
@@ -316,10 +318,10 @@ Group: Applications/Databases
316318
Provides: MySQL-embedded-advanced = %{version}-%{release}
317319
Obsoletes: MySQL-embedded-advanced < %{version}-%{release}
318320
Obsoletes: mysql-community-embedded < %{version}-%{release}
319-
Requires: mysql-commercial-common = %{version}-%{release}
321+
Requires: mysql-commercial-common >= %{min}
320322
%else
321323
Provides: MySQL-embedded = %{version}-%{release}
322-
Requires: mysql-community-common = %{version}-%{release}
324+
Requires: mysql-community-common >= %{min}
323325
%endif
324326
Obsoletes: mariadb-embedded
325327
Obsoletes: MySQL-embedded < %{version}-%{release}
@@ -343,11 +345,11 @@ Summary: Development header files and libraries for MySQL as an embeddabl
343345
Group: Applications/Databases
344346
%if 0%{?commercial}
345347
Obsoletes: mysql-community-embedded-devel < %{version}-%{release}
346-
Requires: mysql-commercial-devel = %{version}-%{release}
347-
Requires: mysql-commercial-embedded = %{version}-%{release}
348+
Requires: mysql-commercial-devel >= %{min}
349+
Requires: mysql-commercial-embedded >= %{min}
348350
%else
349-
Requires: mysql-community-devel = %{version}-%{release}
350-
Requires: mysql-community-embedded = %{version}-%{release}
351+
Requires: mysql-community-devel >= %{min}
352+
Requires: mysql-community-embedded >= %{min}
351353
%endif
352354
Obsoletes: mariadb-embedded-devel
353355
Obsoletes: mysql-embedded-devel < %{version}-%{release}

0 commit comments

Comments
 (0)