packages/obs-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!3 delete the Provides of obs-cloud-uploader to simply the package

Browse Source 
Merge pull request !3 from hy/master
This commit is contained in:
openeuler-ci-bot 2020-03-15 15:14:31 +08:00 committed by Gitee
commit 0f767d6ac3
1 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
obs-server.spec
View File

@ -2,7 +2,7 @@
Name: obs-server
Version: 2.10.1
Release: lp151.23.2
Release: lp151.23.3
Summary: The Open Build Service -- Server Component
License: GPL-2.0-only OR GPL-3.0-only
URL: http://www.openbuildservice.org
@ -20,7 +20,7 @@ Requires: build >= 20191114, perl-BSSolv >= 0.36, perl(Date::Parse), diffu
Requires: createrepo_c, dpkg, yum, perl-Compress-Zlib, perl-File-Sync >= 0.10, perl-JSON-XS
Requires: perl-Net-SSLeay, perl-Socket-MsgHdr, perl-XML-Parser, perl-XML-Simple, perl-YAML-LibYAML
Requires: cpio, curl, perl-Compress-Zlib, perl-TimeDate, screen, psmisc, bash, binutils, bsdtar
Requires: util-linux >= 2.16, aws-cli, azure-cli, python-ec2uploadimg, osc
Requires: util-linux >= 2.16, osc
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
@ -35,8 +35,6 @@ Obsoletes: obs-worker
Provides: obs-worker
Obsoletes: obs-tests-appliance
Provides: obs-tests-appliance
Obsoletes: obs-cloud-uploader
Provides: obs-cloud-uploader
Obsoletes: obs-utils
Provides: obs-utils
Recommends: cron, logrotate, obs-service-download_url, obs-service-verify_file, openslp, lvm2
@ -99,6 +97,10 @@ else
echo "" > $RPM_BUILD_ROOT/srv/www/obs/api/last_deploy
fi
rm -rf $RPM_BUILD_ROOT/%{_unitdir}/obsclouduploadserver.service
rm -rf $RPM_BUILD_ROOT/%{_unitdir}/obsclouduploadworker.service
rm -rf $RPM_BUILD_ROOT/usr/sbin/rcobsclouduploadserver
rm -rf $RPM_BUILD_ROOT/usr/sbin/rcobsclouduploadworker
rm -rf $RPM_BUILD_ROOT/srv/www/obs/api/spec
if ! test -L $RPM_BUILD_ROOT/usr/lib/obs/server/build; then
@ -106,12 +108,6 @@ if ! test -L $RPM_BUILD_ROOT/usr/lib/obs/server/build; then
exit 1
fi
install -m 755 $RPM_BUILD_DIR/open-build-service-%version/dist/clouduploader.rb $RPM_BUILD_ROOT/%{_bindir}/clouduploader
mkdir -p $RPM_BUILD_ROOT/etc/obs/cloudupload
install -m 644 $RPM_BUILD_DIR/open-build-service-%version/dist/ec2utils.conf.example $RPM_BUILD_ROOT/etc/obs/cloudupload/.ec2utils.conf
mkdir -p $RPM_BUILD_ROOT/etc/obs/cloudupload/.aws
install -m 644 $RPM_BUILD_DIR/open-build-service-%version/dist/aws_credentials.example $RPM_BUILD_ROOT/etc/obs/cloudupload/.aws/credentials
cd $RPM_BUILD_ROOT/srv/www/obs/api/public/assets/webui2/
ln -sf application-*.js application.js
ln -sf webui2-*.css webui2.css
@ -184,8 +180,6 @@ exit 0
%systemd_preun obsnotifyforward.service
%systemd_preun obsredis.service
%systemd_preun obsworker.service
%systemd_preun obsclouduploadworker.service
%systemd_preun obsclouduploadserver.service
%preun -n obs-common
%systemd_preun obsstoragesetup.service
@ -209,8 +203,6 @@ exit 0
%systemd_post obsnotifyforward.service
%systemd_post obsredis.service
%systemd_post obsworker.service
%systemd_post obsclouduploadworker.service
%systemd_post obsclouduploadserver.service
%posttrans
[ -d /srv/obs ] || install -d -o obsrun -g obsrun /srv/obs
@ -237,8 +229,6 @@ fi
%systemd_postun_with_restart obsnotifyforward.service
%systemd_postun_with_restart obsredis.service
%systemd_postun_with_restart obsworker.service
%systemd_postun_with_restart obsclouduploadworker.service
%systemd_postun_with_restart obsclouduploadserver.service
%verifyscript -n obs-server
%verify_permissions
rmdir /srv/obs 2> /dev/null || :
@ -332,8 +322,6 @@ fi
%{_unitdir}/obsnotifyforward.service
%{_unitdir}/obsredis.service
%{_unitdir}/obsworker.service
%{_unitdir}/obsclouduploadworker.service
%{_unitdir}/obsclouduploadserver.service
%{_sbindir}/obs_admin
%{_sbindir}/obs_serverstatus
%{_sbindir}/obsscheduler
@ -352,17 +340,9 @@ fi
%{_sbindir}/rcobsnotifyforward
%{_sbindir}/rcobsredis
%{_sbindir}/rcobsworker
%{_sbindir}/rcobsclouduploadworker
%{_sbindir}/rcobsclouduploadserver
%{_sbindir}/rcobsscheduler
%{_sbindir}/rcobsservice
%{_bindir}/obs_productconvert
%{_bindir}/clouduploader
%dir /etc/obs
%dir /etc/obs/cloudupload
%dir /etc/obs/cloudupload/.aws
%config(noreplace) /etc/obs/cloudupload/.aws/credentials
%config /etc/obs/cloudupload/.ec2utils.conf
%config(noreplace) /usr/lib/obs/server/BSConfig.pm
%config(noreplace) /etc/slp.reg.d/*
%config(noreplace) /etc/logrotate.d/obs-source_service
@ -493,6 +473,9 @@ usermod -a -G docker obsservicerun
%{_sbindir}/rcobsstoragesetup
%changelog
* Sun Mar 15 2020 hy-euler <eulerstoragemt@huawei.com> - 2.10.1-lp151.23.3
- delete the Provides of obs-cloud-uploader which provides the tools for upload images to the cloud
* Sat Mar 14 2020 hy-euler <eulerstoragemt@huawei.com> - 2.10.1-lp151.23.2
- delete the use of %{fillup_and_insserv} and %check, it is not necessary