diff --git a/obs-server.spec b/obs-server.spec index 50fd040f4cffa4f6a8fea0bd45fa47ebf6630df1..4f4f5d32f62f49cf981a5825b11ec2e2122a2ed2 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -6,7 +6,7 @@ Name: obs-server Version: 2.10.15 -Release: 6 +Release: 7 Summary: The Open Build Service -- Server Component License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org @@ -104,11 +104,10 @@ bundle --local --path %_libdir/obs-api/ cd - make sed -i '/c.blacklist_keys = \[/d' src/api/config/initializers/airbrake.rb -#rm -rf src/api/app/assets/stylesheets/webui2/webui2.css.scss +sed -i 's/rails/\/usr\/lib64\/obs-api\/ruby\/3.0.0\/bin\/rails/g' dist/systemd/obs-sphinx.service %install export DESTDIR=$RPM_BUILD_ROOT -perl -p -i -e 's/^APACHE_VHOST_CONF=.*/APACHE_VHOST_CONF=obs-apache2.conf/' Makefile.include perl -p -i -e 's/^APACHE_USER=.*/APACHE_USER=apache/' Makefile.include perl -p -i -e 's/^APACHE_GROUP=.*/APACHE_GROUP=apache/' Makefile.include perl -p -i -e 's/^APACHE_CONFDIR=.*/APACHE_CONFDIR=\/etc\/httpd/' Makefile.include @@ -120,15 +119,6 @@ perl -p -i -e 's/^OBS_RUBY_VERSION=.*/OBS_RUBY_VERSION=3.0.0/' Makefile.include sed -i '2401s/$jobstatus/#$jobstatus/' src/backend/bs_repserver sed -i 's/createkey({ %$cgi/#createkey({ %$cgi/g' src/backend/bs_srcserver -mkdir -p src/api/app/assets/config -pushd src/api/app/assets/config -cat << EOF > manifest.js -//= link_tree ../images -//= link_directory ../ -//= link_directory ../ -EOF -#javascripts.js stylesheets.css -popd export OBS_VERSION="%{version}" DESTDIR=$RPM_BUILD_ROOT make install FILLUPDIR=/var/adm/fillup-templates if [ -f %{_sourcedir}/open-build-service.obsinfo ]; then @@ -148,6 +138,11 @@ if ! test -L $RPM_BUILD_ROOT/usr/lib/obs/server/build; then exit 1 fi +cd $RPM_BUILD_ROOT/srv/www/obs/api/public/assets/webui/ +ln -sf application-*.js application.js +ln -sf webui2-*.css webui2.css +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 @@ -176,6 +171,7 @@ make -C src/api test make -C dist test %endif + %pre getent passwd obsservicerun >/dev/null || \ /usr/sbin/useradd -r -g obsrun -d /usr/lib/obs -s /sbin/nologin \ @@ -246,6 +242,9 @@ semanage fcontext -d "/srv/obs/events(/.*)?" semanage fcontext -a -t var_lib_t "/srv/obs(/.*)?" semanage fcontext -a -t uuidd_var_run_t "/srv/obs/events(/.*)?" 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 @@ -497,6 +496,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/obsstoragesetup %changelog +* Wed Jun 28 2023 Ge Wang - 2.10.15-7 +- fix obs-clockwork service start failure + * Thu Jun 15 2023 Ge Wang - 2.10.15-6 - Replace src package with commit a39f185b53492d2207e9b2c0437fd7d407b864f3