Fix exec permission in ruby/2.5.0/bin, change require to mariadb-server

This commit is contained in:
lingsheng 2021-09-23 18:58:18 +08:00
parent 6fad18b9a6
commit 90a70c39e8

View File

@ -19,7 +19,7 @@
%global rack_version 2.0.8
Name: obs-bundled-gems
Version: 2.10.1
Release: 2
Release: 3
Summary: The Open Build Service -- Bundled Gems
License: GPL-2.0-only OR GPL-3.0-only
URL: http://www.openbuildservice.org
@ -38,7 +38,7 @@ denpendent gems, and add them to spec file.
Summary: Holding dependencies required to run the OBS frontend
Requires: build >= 20170315
Requires: memcached >= 1.4
Requires: mariadb
Requires: mariadb-server
Requires: obs-bundled-gems = %{version}
Requires: sphinx >= 2.1.8
Requires: perl(GD)
@ -117,8 +117,8 @@ for bin in %{buildroot}%_libdir/obs-api/ruby/*/bin/*; do
sed -i -e 's,/usr/bin/env ruby.ruby2.5,/usr/bin/ruby.ruby2.5,' $bin
done
# remove exec bit from all other files still containing /usr/bin/env - mostly helper scripts
find %{buildroot} -type f -print0 | xargs -0 grep -l /usr/bin/env | while read file; do
# remove exec bit from all other files still containing /usr/bin/env except ruby/2.5.0/bin - mostly helper scripts
find %{buildroot} -type f -print0 | xargs -0 grep -l /usr/bin/env | grep -v ruby/2.5.0/bin| while read file; do
chmod a-x $file
done
@ -132,6 +132,9 @@ done
%doc README
%changelog
* Thu Sep 23 2021 lingsheng <lingsheng@huawei.com> 2.10.1-3
- Fix exec permission in ruby/2.5.0/bin, change require to mariadb-server
* Wed Jun 9 2021 zhaomengchao <zhaomengchao3@huawei.com> 2.10.1-2
- fix obs-bundled-gems compilation failed.