Skip to content

Commit e28b0d5

Browse files
trostendahlerlend
authored andcommitted
Bug#30272080 32 BIT MYSQL CLIENT AND 64 BIT MYSQL CLIENTS ARE CONFLICTING ON EL6
Problem: WL#13126 Dynamic linking of Protobuf did a noble thing by using standard filter in RPM spec for el6. However, due to problem with this kind of filtering and RPM file coloring: https://bugzilla.redhat.com/show_bug.cgi?id=983596 all files in RPM ends up with filecolor (none), while the correct filecolor is 2 (64 bits) or 1 (32 bits). This caused break in 32 bits to 64 bits upgrades. Fix: Revert to former, more simple filtering on el6. Change-Id: I3352baf8b8c4fae7249d9b925649284e043c2348
1 parent c87c011 commit e28b0d5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

packaging/rpm-oel/mysql.spec.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ Vendor: %{mysql_vendor}
102102
Source7: %{compatsrc}
103103
%endif
104104
Source10: https://downloads.sourceforge.net/boost/@[email protected]
105+
Source90: filter-provides.sh
106+
Source91: filter-requires.sh
105107
%if 0%{?rhel} >= 8
106108
BuildRequires: cmake >= 3.6.1
107109
BuildRequires: gcc
@@ -170,10 +172,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
170172
%global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so|%{_libdir}/mysql/private/.*)$
171173
%else
172174
# https://fedoraproject.org/wiki/EPEL:Packaging#Generic_Filtering_on_EPEL6
173-
# Patterns for sed, separated by semicolon. Do not quote it here, filter_setup will do that
174-
%filter_from_provides /libprotobuf/d;/perl.hostnames/d;/perl.lib::mtr/d;/perl.lib::v1/d;/perl.mtr_/d;/perl.My::/d
175-
%filter_from_requires /libprotobuf/d;/perl.hostnames/d;/perl.lib::mtr/d;/perl.lib::v1/d;/perl.mtr_/d;/perl.My::/d;/perl.GD/d
176-
%filter_setup
175+
%global __perl_provides %{SOURCE90}
176+
%global __perl_requires %{SOURCE91}
177177
%endif
178178

179179
%description

0 commit comments

Comments
 (0)