diff --git a/obs-server.spec b/obs-server.spec index 5571831d42befaf2842f92de1ed770b45c0cc16d..3359c0a2511ae654c167786b11ee659ec8d69908 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -6,7 +6,7 @@ Name: obs-server Version: 2.10.15 -Release: 8 +Release: 9 Summary: The Open Build Service -- Server Component License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org @@ -146,6 +146,9 @@ cd - [-d $RPM_BUILD_ROOT/etc/sysconfig] || mkdir -p $RPM_BUILD_ROOT/etc/sysconfig install -m 0644 dist/sysconfig.obs-server $RPM_BUILD_ROOT/etc/sysconfig/obs-server +mv $RPM_BUILD_ROOT/srv/www/obs/api/app/assets/images/icons $RPM_BUILD_ROOT/srv/www/obs/api/app/assets +ln -sf /srv/www/obs/api/app/assets/icons $RPM_BUILD_ROOT/srv/www/obs/api/app/assets/images/icons + %if %{do_check} %check export DESTDIR=$RPM_BUILD_ROOT @@ -214,8 +217,6 @@ exit 0 %systemd_preun obsnotifyforward.service %systemd_preun obsredis.service %systemd_preun obsworker.service -semanage fcontext -d "/srv/obs(/.*)?" -semanage fcontext -d "/srv/obs/events(/.*)?" %preun -n obs-common %systemd_preun obsstoragesetup.service @@ -239,13 +240,15 @@ semanage fcontext -d "/srv/obs/events(/.*)?" %systemd_post obsnotifyforward.service %systemd_post obsredis.service %systemd_post obsworker.service -semanage fcontext -a -t var_lib_t "/srv/obs(/.*)?" -semanage fcontext -a -t uuidd_var_run_t "/srv/obs/events(/.*)?" +Obs_Context=`ls -l -Z /srv | grep obs | awk '{print $5}' | awk -F: '{print $3}'` +if [[ $Obs_Context != "var_lib_t" ]];then + semanage fcontext -a -t var_lib_t "/srv/obs(/.*)?" +fi +Events_Context=`ls -l -Z /srv/obs | grep events | awk '{print $5}' | awk -F: '{print $3}'` +if [[ $Events_Context != "uuidd_var_run_t" ]];then + semanage fcontext -a -t uuidd_var_run_t "/srv/obs/events(/.*)?" +fi restorecon -Rv /srv/obs/ -cd /usr/lib64/obs-api/ruby/3.0.0/bin -ls | awk '{print $1}' | for line in `xargs`;do chmod 755 $line;done -cd - - %posttrans [ -d /srv/obs ] || install -d -o obsrun -g obsrun /srv/obs @@ -336,6 +339,10 @@ if [ -e %{_rundir}/start_obs-api-support.target ];then rm %{_rundir}/start_obs-api-support.target fi +cd /usr/lib64/obs-api/ruby/3.0.0/bin +ls | awk '{print $1}' | for line in `xargs`;do chmod 755 $line;done +cd - > /dev/null + %postun -n obs-api %systemd_postun_with_restart %{obs_api_support_scripts} %systemd_postun_with_restart httpd @@ -496,6 +503,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/obsstoragesetup %changelog +* Thu May 23 2024 Ge Wang - 2.10.15-9 +- Fix update failure + * Mon Dec 4 2023 liyanan - 2.10.15-8 - Fix obs-server install error