Skip to content

Commit 3724832

Browse files
trostenHery Ramilison
trosten
authored and
Hery Ramilison
committed
BUG#18518216 UNDESIRABLE MYSQL YUM REPO PACKAGING DEPENDENCIES
Relax deps between packages to require GA version or newer of corresponding major release. (cherry picked from commit 00458818f4e061cbf68ffaa3fe26c21cfda38dc9)
1 parent 34fb13f commit 3724832

File tree

3 files changed

+75
-69
lines changed

3 files changed

+75
-69
lines changed

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

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
%global license_type GPLv2
5959
%endif
6060

61+
%global min 5.7.9
62+
6163
Name: mysql-%{product_suffix}
6264
Summary: A very fast and reliable SQL database server
6365
Group: Applications/Databases
@@ -120,11 +122,11 @@ Requires: mecab-ipadic
120122
%if 0%{?commercial}
121123
Obsoletes: mysql-commercial-bench < 5.7.8
122124
Obsoletes: mysql-community-server < %{version}-%{release}
123-
Requires: mysql-commercial-client%{?_isa} = %{version}-%{release}
124-
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release}
125+
Requires: mysql-commercial-client%{?_isa} >= %{min}
126+
Requires: mysql-commercial-common%{?_isa} >= %{min}
125127
%else
126-
Requires: mysql-community-client%{?_isa} = %{version}-%{release}
127-
Requires: mysql-community-common%{?_isa} = %{version}-%{release}
128+
Requires: mysql-community-client%{?_isa} >= %{min}
129+
Requires: mysql-community-common%{?_isa} >= %{min}
128130
%endif
129131
Obsoletes: mysql-community-bench < 5.7.8
130132
Obsoletes: community-mysql-bench
@@ -168,9 +170,9 @@ Summary: MySQL database client applications and tools
168170
Group: Applications/Databases
169171
%if 0%{?commercial}
170172
Obsoletes: mysql-community-client < %{version}-%{release}
171-
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release}
173+
Requires: mysql-commercial-libs%{?_isa} >= %{min}
172174
%else
173-
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
175+
Requires: mysql-community-libs%{?_isa} >= %{min}
174176
%endif
175177
Obsoletes: mariadb
176178
Obsoletes: community-mysql < %{version}-%{release}
@@ -206,10 +208,10 @@ MySQL database server, and MySQL embedded server.
206208
Summary: Test suite for the MySQL database server
207209
Group: Applications/Databases
208210
%if 0%{?commercial}
209-
Requires: mysql-commercial-server%{?_isa} = %{version}-%{release}
211+
Requires: mysql-commercial-server%{?_isa} >= %{min}
210212
Obsoletes: mysql-community-test < %{version}-%{release}
211213
%else
212-
Requires: mysql-community-server%{?_isa} = %{version}-%{release}
214+
Requires: mysql-community-server%{?_isa} >= %{min}
213215
%endif
214216
Obsoletes: mariadb-test
215217
Obsoletes: community-mysql-test < %{version}-%{release}
@@ -226,9 +228,9 @@ Summary: Development header files and libraries for MySQL database client
226228
Group: Applications/Databases
227229
%if 0%{?commercial}
228230
Obsoletes: mysql-community-devel < %{version}-%{release}
229-
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release}
231+
Requires: mysql-commercial-libs%{?_isa} >= %{min}
230232
%else
231-
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
233+
Requires: mysql-community-libs%{?_isa} >= %{min}
232234
%endif
233235
Obsoletes: mariadb-devel
234236
Obsoletes: community-mysql-devel < %{version}-%{release}
@@ -245,9 +247,9 @@ Summary: Shared libraries for MySQL database client applications
245247
Group: Applications/Databases
246248
%if 0%{?commercial}
247249
Obsoletes: mysql-community-libs < %{version}-%{release}
248-
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release}
250+
Requires: mysql-commercial-common%{?_isa} >= %{min}
249251
%else
250-
Requires: mysql-community-common%{?_isa} = %{version}-%{release}
252+
Requires: mysql-community-common%{?_isa} >= %{min}
251253
%endif
252254
Obsoletes: mariadb-libs
253255
Obsoletes: community-mysql-libs < %{version}-%{release}
@@ -268,9 +270,9 @@ Provides: mysql-libs-compat = %{version}-%{release}
268270
Provides: mysql-libs-compat%{?_isa} = %{version}-%{release}
269271
%if 0%{?commercial}
270272
Obsoletes: mysql-community-libs-compat < %{version}-%{release}
271-
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release}
273+
Requires: mysql-commercial-libs%{?_isa} >= %{min}
272274
%else
273-
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
275+
Requires: mysql-community-libs%{?_isa} >= %{min}
274276
%endif
275277

276278
%description libs-compat
@@ -282,9 +284,9 @@ Summary: MySQL embedded library
282284
Group: Applications/Databases
283285
%if 0%{?commercial}
284286
Obsoletes: mysql-community-embedded < %{version}-%{release}
285-
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release}
287+
Requires: mysql-commercial-common%{?_isa} >= %{min}
286288
%else
287-
Requires: mysql-community-common%{?_isa} = %{version}-%{release}
289+
Requires: mysql-community-common%{?_isa} >= %{min}
288290
%endif
289291
Obsoletes: mariadb-embedded
290292
Obsoletes: community-mysql-embedded < %{version}-%{release}
@@ -309,9 +311,9 @@ Summary: MySQL embedded compat library
309311
Group: Applications/Databases
310312
%if 0%{?commercial}
311313
Obsoletes: mysql-community-embedded-compat < %{version}-%{release}
312-
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release}
314+
Requires: mysql-commercial-common%{?_isa} >= %{min}
313315
%else
314-
Requires: mysql-community-common%{?_isa} = %{version}-%{release}
316+
Requires: mysql-community-common%{?_isa} >= %{min}
315317
%endif
316318

317319
%description embedded-compat
@@ -323,11 +325,11 @@ Summary: Development header files and libraries for MySQL as an embeddabl
323325
Group: Applications/Databases
324326
%if 0%{?commercial}
325327
Obsoletes: mysql-community-embedded-devel < %{version}-%{release}
326-
Requires: mysql-commercial-devel%{?_isa} = %{version}-%{release}
327-
Requires: mysql-commercial-embedded%{?_isa} = %{version}-%{release}
328+
Requires: mysql-commercial-devel%{?_isa} >= %{min}
329+
Requires: mysql-commercial-embedded%{?_isa} >= %{min}
328330
%else
329-
Requires: mysql-community-devel%{?_isa} = %{version}-%{release}
330-
Requires: mysql-community-embedded%{?_isa} = %{version}-%{release}
331+
Requires: mysql-community-devel%{?_isa} >= %{min}
332+
Requires: mysql-community-embedded%{?_isa} >= %{min}
331333
%endif
332334
Obsoletes: mariadb-embedded-devel
333335
Obsoletes: community-mysql-embedded-devel < %{version}-%{release}

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

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@
9393
%global license_type GPLv2
9494
%endif
9595

96+
%global min 5.7.9
97+
9698
Name: mysql-%{product_suffix}
9799
Summary: A very fast and reliable SQL database server
98100
Group: Applications/Databases
@@ -175,12 +177,12 @@ Obsoletes: mysql-commercial-bench < 5.7.8
175177
Provides: MySQL-server-advanced%{?_isa} = %{version}-%{release}
176178
Obsoletes: MySQL-server-advanced < %{version}-%{release}
177179
Obsoletes: mysql-community-server < %{version}-%{release}
178-
Requires: mysql-commercial-client%{?_isa} = %{version}-%{release}
179-
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release}
180+
Requires: mysql-commercial-client%{?_isa} >= %{min}
181+
Requires: mysql-commercial-common%{?_isa} >= %{min}
180182
%else
181183
Provides: MySQL-server%{?_isa} = %{version}-%{release}
182-
Requires: mysql-community-client%{?_isa} = %{version}-%{release}
183-
Requires: mysql-community-common%{?_isa} = %{version}-%{release}
184+
Requires: mysql-community-client%{?_isa} >= %{min}
185+
Requires: mysql-community-common%{?_isa} >= %{min}
184186
%endif
185187
Obsoletes: mysql-community-bench < 5.7.8
186188
Obsoletes: community-mysql-bench
@@ -232,10 +234,10 @@ Group: Applications/Databases
232234
Provides: MySQL-client-advanced%{?_isa} = %{version}-%{release}
233235
Obsoletes: MySQL-client-advanced < %{version}-%{release}
234236
Obsoletes: mysql-community-client < %{version}-%{release}
235-
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release}
237+
Requires: mysql-commercial-libs%{?_isa} >= %{min}
236238
%else
237239
Provides: MySQL-client%{?_isa} = %{version}-%{release}
238-
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
240+
Requires: mysql-community-libs%{?_isa} >= %{min}
239241
%endif
240242
Obsoletes: MySQL-client < %{version}-%{release}
241243
Obsoletes: mariadb
@@ -257,7 +259,7 @@ Obsoletes: mysql-community-common < %{version}-%{release}
257259
%endif
258260
Provides: mysql-common = %{version}-%{release}
259261
Provides: mysql-common%{?_isa} = %{version}-%{release}
260-
%{?el5:Requires: mysql%{?_isa} = %{version}-%{release}}
262+
%{?el5:Requires: mysql%{?_isa} >= %{min}}
261263

262264
%description common
263265
This packages contains common files needed by MySQL client library,
@@ -271,10 +273,10 @@ Group: Applications/Databases
271273
Provides: MySQL-test-advanced%{?_isa} = %{version}-%{release}
272274
Obsoletes: MySQL-test-advanced < %{version}-%{release}
273275
Obsoletes: mysql-community-test < %{version}-%{release}
274-
Requires: mysql-commercial-server%{?_isa} = %{version}-%{release}
276+
Requires: mysql-commercial-server%{?_isa} >= %{min}
275277
%else
276278
Provides: MySQL-test%{?_isa} = %{version}-%{release}
277-
Requires: mysql-community-server%{?_isa} = %{version}-%{release}
279+
Requires: mysql-community-server%{?_isa} >= %{min}
278280
%endif
279281
Obsoletes: MySQL-test < %{version}-%{release}
280282
Obsoletes: mysql-test < %{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
@@ -366,10 +368,10 @@ Group: Applications/Databases
366368
Provides: MySQL-embedded-advanced%{?_isa} = %{version}-%{release}
367369
Obsoletes: MySQL-embedded-advanced < %{version}-%{release}
368370
Obsoletes: mysql-community-embedded < %{version}-%{release}
369-
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release}
371+
Requires: mysql-commercial-common%{?_isa} >= %{min}
370372
%else
371373
Provides: MySQL-embedded%{?_isa} = %{version}-%{release}
372-
Requires: mysql-community-common%{?_isa} = %{version}-%{release}
374+
Requires: mysql-community-common%{?_isa} >= %{min}
373375
%endif
374376
Obsoletes: mariadb-embedded
375377
Obsoletes: MySQL-embedded < %{version}-%{release}
@@ -395,9 +397,9 @@ Summary: MySQL embedded compat library
395397
Group: Applications/Databases
396398
%if 0%{?commercial}
397399
Obsoletes: mysql-community-embedded-compat < %{version}-%{release}
398-
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release}
400+
Requires: mysql-commercial-common%{?_isa} >= %{min}
399401
%else
400-
Requires: mysql-community-common%{?_isa} = %{version}-%{release}
402+
Requires: mysql-community-common%{?_isa} >= %{min}
401403
%endif
402404

403405
%description embedded-compat
@@ -410,11 +412,11 @@ Summary: Development header files and libraries for MySQL as an embeddabl
410412
Group: Applications/Databases
411413
%if 0%{?commercial}
412414
Obsoletes: mysql-community-embedded-devel < %{version}-%{release}
413-
Requires: mysql-commercial-devel%{?_isa} = %{version}-%{release}
414-
Requires: mysql-commercial-embedded%{?_isa} = %{version}-%{release}
415+
Requires: mysql-commercial-devel%{?_isa} >= %{min}
416+
Requires: mysql-commercial-embedded%{?_isa} >= %{min}
415417
%else
416-
Requires: mysql-community-devel%{?_isa} = %{version}-%{release}
417-
Requires: mysql-community-embedded%{?_isa} = %{version}-%{release}
418+
Requires: mysql-community-devel%{?_isa} >= %{min}
419+
Requires: mysql-community-embedded%{?_isa} >= %{min}
418420
%endif
419421
Obsoletes: mariadb-embedded-devel
420422
Obsoletes: mysql-embedded-devel < %{version}-%{release}
@@ -430,13 +432,13 @@ the embedded version of the MySQL server.
430432
Summary: Convenience package for easy upgrades of MySQL package set
431433
Group: Applications/Databases
432434
%if 0%{?commercial}
433-
Requires: mysql-commercial-client%{?_isa} = %{version}-%{release}
434-
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release}
435-
Requires: mysql-commercial-libs-compat%{?_isa} = %{version}-%{release}
435+
Requires: mysql-commercial-client%{?_isa} >= %{min}
436+
Requires: mysql-commercial-libs%{?_isa} >= %{min}
437+
Requires: mysql-commercial-libs-compat%{?_isa} >= %{min}
436438
%else
437-
Requires: mysql-community-client%{?_isa} = %{version}-%{release}
438-
Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
439-
Requires: mysql-community-libs-compat%{?_isa} = %{version}-%{release}
439+
Requires: mysql-community-client%{?_isa} >= %{min}
440+
Requires: mysql-community-libs%{?_isa} >= %{min}
441+
Requires: mysql-community-libs-compat%{?_isa} >= %{min}
440442
%endif
441443

442444
%description -n mysql

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

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@
7171
%{?sles12: %global systemd 1}
7272
%{!?_tmpfilesdir: %global _tmpfilesdir /usr/lib/tmpfiles.d}
7373

74+
%global min 5.7.9
75+
7476
Name: mysql-%{product_suffix}
7577
Summary: A very fast and reliable SQL database server
7678
Group: Applications/Databases
@@ -141,12 +143,12 @@ Obsoletes: mysql-commercial-bench < 5.7.8
141143
Provides: MySQL-server-advanced = %{version}-%{release}
142144
Obsoletes: MySQL-server-advanced < %{version}-%{release}
143145
Obsoletes: mysql-community-server < %{version}-%{release}
144-
Requires: mysql-commercial-client = %{version}-%{release}
145-
Requires: mysql-commercial-common = %{version}-%{release}
146+
Requires: mysql-commercial-client >= %{min}
147+
Requires: mysql-commercial-common >= %{min}
146148
%else
147149
Provides: MySQL-server = %{version}-%{release}
148-
Requires: mysql-community-client = %{version}-%{release}
149-
Requires: mysql-community-common = %{version}-%{release}
150+
Requires: mysql-community-client >= %{min}
151+
Requires: mysql-community-common >= %{min}
150152
%endif
151153
Obsoletes: mysql-community-bench < 5.7.8
152154
Obsoletes: community-mysql-bench
@@ -198,10 +200,10 @@ Group: Applications/Databases
198200
Provides: MySQL-client-advanced = %{version}-%{release}
199201
Obsoletes: MySQL-client-advanced < %{version}-%{release}
200202
Obsoletes: mysql-community-client < %{version}-%{release}
201-
Requires: mysql-commercial-libs = %{version}-%{release}
203+
Requires: mysql-commercial-libs >= %{min}
202204
%else
203205
Provides: MySQL-client = %{version}-%{release}
204-
Requires: mysql-community-libs = %{version}-%{release}
206+
Requires: mysql-community-libs >= %{min}
205207
%endif
206208
Obsoletes: MySQL-client < %{version}-%{release}
207209
Provides: mysql-client = %{version}-%{release}
@@ -233,10 +235,10 @@ Group: Applications/Databases
233235
Provides: MySQL-test-advanced = %{version}-%{release}
234236
Obsoletes: MySQL-test-advanced < %{version}-%{release}
235237
Obsoletes: mysql-community-test < %{version}-%{release}
236-
Requires: mysql-commercial-server = %{version}-%{release}
238+
Requires: mysql-commercial-server >= %{min}
237239
%else
238240
Provides: MySQL-test = %{version}-%{release}
239-
Requires: mysql-community-server = %{version}-%{release}
241+
Requires: mysql-community-server >= %{min}
240242
%endif
241243
Obsoletes: MySQL-test < %{version}-%{release}
242244
Obsoletes: mysql-test < %{version}-%{release}
@@ -255,10 +257,10 @@ Group: Applications/Databases
255257
Provides: MySQL-devel-advanced = %{version}-%{release}
256258
Obsoletes: MySQL-devel-advanced < %{version}-%{release}
257259
Obsoletes: mysql-community-devel < %{version}-%{release}
258-
Requires: mysql-commercial-libs = %{version}-%{release}
260+
Requires: mysql-commercial-libs >= %{min}
259261
%else
260262
Provides: MySQL-devel = %{version}-%{release}
261-
Requires: mysql-community-libs = %{version}-%{release}
263+
Requires: mysql-community-libs >= %{min}
262264
%endif
263265
Obsoletes: MySQL-devel < %{version}-%{release}
264266
Obsoletes: mysql-devel < %{version}-%{release}
@@ -279,10 +281,10 @@ Group: Applications/Databases
279281
Provides: MySQL-shared-advanced = %{version}-%{release}
280282
Obsoletes: MySQL-shared-advanced < %{version}-%{release}
281283
Obsoletes: mysql-community-libs < %{version}-%{release}
282-
Requires: mysql-commercial-common = %{version}-%{release}
284+
Requires: mysql-commercial-common >= %{min}
283285
%else
284286
Provides: MySQL-shared = %{version}-%{release}
285-
Requires: mysql-community-common = %{version}-%{release}
287+
Requires: mysql-community-common >= %{min}
286288
%endif
287289
Obsoletes: MySQL-shared < %{version}-%{release}
288290
Obsoletes: mysql-libs < %{version}-%{release}
@@ -303,10 +305,10 @@ Group: Applications/Databases
303305
Provides: MySQL-embedded-advanced = %{version}-%{release}
304306
Obsoletes: MySQL-embedded-advanced < %{version}-%{release}
305307
Obsoletes: mysql-community-embedded < %{version}-%{release}
306-
Requires: mysql-commercial-common = %{version}-%{release}
308+
Requires: mysql-commercial-common >= %{min}
307309
%else
308310
Provides: MySQL-embedded = %{version}-%{release}
309-
Requires: mysql-community-common = %{version}-%{release}
311+
Requires: mysql-community-common >= %{min}
310312
%endif
311313
Obsoletes: mariadb-embedded
312314
Obsoletes: MySQL-embedded < %{version}-%{release}
@@ -330,11 +332,11 @@ Summary: Development header files and libraries for MySQL as an embeddabl
330332
Group: Applications/Databases
331333
%if 0%{?commercial}
332334
Obsoletes: mysql-community-embedded-devel < %{version}-%{release}
333-
Requires: mysql-commercial-devel = %{version}-%{release}
334-
Requires: mysql-commercial-embedded = %{version}-%{release}
335+
Requires: mysql-commercial-devel >= %{min}
336+
Requires: mysql-commercial-embedded >= %{min}
335337
%else
336-
Requires: mysql-community-devel = %{version}-%{release}
337-
Requires: mysql-community-embedded = %{version}-%{release}
338+
Requires: mysql-community-devel >= %{min}
339+
Requires: mysql-community-embedded >= %{min}
338340
%endif
339341
Obsoletes: mariadb-embedded-devel
340342
Obsoletes: mysql-embedded-devel < %{version}-%{release}

0 commit comments

Comments
 (0)