From 9377d79243904ce6bf8829c23357ee975f046e4d Mon Sep 17 00:00:00 2001 From: wangxiyuan Date: Tue, 24 Aug 2021 10:37:06 +0800 Subject: [PATCH] Correct structure --- openstack-swift.spec | 232 +++++++++++++++++++++++-------------------- 1 file changed, 125 insertions(+), 107 deletions(-) diff --git a/openstack-swift.spec b/openstack-swift.spec index 5a71e2b..71aedce 100644 --- a/openstack-swift.spec +++ b/openstack-swift.spec @@ -16,7 +16,7 @@ expensive equipment. Name: openstack-swift Version: 2.27.0 -Release: 2 +Release: 3 Summary: OpenStack Object Storage License: ASL 2.0 URL: https://docs.openstack.org/swift/latest/ @@ -77,23 +77,76 @@ BuildRequires: git-core BuildRequires: /usr/bin/pathfix.py BuildRequires: systemd -Obsoletes: openstack-swift-auth <= 1.4.0 # Required to compile translation files BuildRequires: python3-babel # Required to build docs: doxygen invokes actual code and its imports BuildRequires: python3-keystoneclient -Requires: python3-swift = %{version}-%{release} +Requires: openstack-swfit-proxy +Requires: openstack-swfit-account +Requires: openstack-swfit-container +Requires: openstack-swfit-object %description %{common_desc} +%package account +Summary: Account services for Swift + +Requires: openstack-swift-common = %{version}-%{release} +Requires: rsync >= 3.0 + +%description account +%{common_desc} + +This package contains the %{name} account server. + +%package container +Summary: Container services for Swift + +Requires: openstack-swift-common = %{version}-%{release} +Requires: rsync >= 3.0 + +%description container +%{common_desc} + +This package contains the %{name} container server. + +%package object +Summary: Object services for Swift + +Requires: openstack-swift-common = %{version}-%{release} +Requires: rsync >= 3.0 + +%description object +%{common_desc} + +This package contains the %{name} object server. + +%package proxy +Summary: A proxy server for Swift + +Requires: openstack-swift-common = %{version}-%{release} +Requires: python3-keystoneclient +Requires: python3-keystonemiddleware + +%description proxy +%{common_desc} + +This package contains the %{name} proxy server. + +%package common +Summary: Common files for Swift service +Requires: python3-swift = %{version}-%{release} + +%description common +%{common_desc} + +This package contains the common files for swift service. + %package -n python3-swift Summary: Python libraries for the OpenStack Object Storage (Swift) - -Provides: openstack-swift = %{version}-%{release} -Obsoletes: openstack-swift < %{version}-%{release} %{?python_provide:%python_provide python3-swift} Requires: python3-eventlet >= 0.25.0 @@ -119,52 +172,6 @@ Requires(pre): shadow-utils This package contains the %{name} Python library. -%package account -Summary: Account services for Swift - -Requires: python3-swift = %{version}-%{release} -Requires: rsync >= 3.0 - -%description account -%{common_desc} - -This package contains the %{name} account server. - -%package container -Summary: Container services for Swift - -Requires: python3-swift = %{version}-%{release} -Requires: rsync >= 3.0 - -%description container -%{common_desc} - -This package contains the %{name} container server. - -%package object -Summary: Object services for Swift - -Requires: python3-swift = %{version}-%{release} -Requires: rsync >= 3.0 - -%description object -%{common_desc} - -This package contains the %{name} object server. - -%package proxy -Summary: A proxy server for Swift - -Requires: python3-swift = %{version}-%{release} -Requires: python3-keystoneclient -Requires: python3-keystonemiddleware -Requires: python3-ceilometermiddleware - -%description proxy -%{common_desc} - -This package contains the %{name} proxy server. - %package -n python3-swift-tests Summary: Swift tests Requires: python3-swift = %{version}-%{release} @@ -406,63 +413,9 @@ exit 0 %post -n python3-swift /usr/bin/kill -HUP `cat /var/run/syslogd.pid 2>/dev/null` 2>/dev/null || : -%files -n python3-swift -f swift.lang +%files %defattr(-,root,root,-) %license LICENSE -%doc README.rst -%doc etc/*-sample -%{_mandir}/man5/dispersion.conf.5* -%{_mandir}/man1/swift-account-audit.1* -%{_mandir}/man1/swift-ring-builder-analyzer.1* -%{_mandir}/man1/swift-config.1* -%{_mandir}/man1/swift-dispersion-populate.1* -%{_mandir}/man1/swift-dispersion-report.1* -%{_mandir}/man1/swift-drive-audit.1* -%{_mandir}/man1/swift-form-signature.1* -%{_mandir}/man1/swift-get-nodes.1* -%{_mandir}/man1/swift-init.1* -%{_mandir}/man1/swift-oldies.1.* -%{_mandir}/man1/swift-orphans.1* -%{_mandir}/man1/swift-recon.1* -%{_mandir}/man1/swift-recon-cron.1* -%{_mandir}/man1/swift-ring-builder.1* -%{_mandir}/man1/swift-ring-composer.1* -%{_mandir}/man5/swift.conf.5* -%{_mandir}/man5/container-sync-realms.conf.5* -%{_tmpfilesdir}/openstack-swift.conf -%dir %attr(0755, swift, swift)%{_sysconfdir}/swift -%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/swift.conf -%config(noreplace) %{_sysconfdir}/rsyslog.d/openstack-swift.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-swift -%dir %{_localstatedir}/log/swift -%dir %attr(0755, swift, root) %{_localstatedir}/run/swift -%dir %attr(0755, swift, swift) %{_localstatedir}/cache/swift -%dir %attr(0755, swift, root) %{_sharedstatedir}/swift -%dir %{python3_sitelib}/swift -%{_bindir}/swift-account-audit -%{_bindir}/swift-config -%{_bindir}/swift-dispersion-populate -%{_bindir}/swift-dispersion-report -%{_bindir}/swift-drive-audit -%{_bindir}/swift-form-signature -%{_bindir}/swift-get-nodes -%{_bindir}/swift-init -%{_bindir}/swift-manage-shard-ranges -%{_bindir}/swift-oldies -%{_bindir}/swift-orphans -%{_bindir}/swift-recon -%{_bindir}/swift-recon-cron -%{_bindir}/swift-reconciler-enqueue -%{_bindir}/swift-ring-builder -%{_bindir}/swift-ring-builder-analyzer -%{_bindir}/swift-ring-composer -%{python3_sitelib}/swift -%{python3_sitelib}/swift-%{upstream_version}-py?.*.egg-info -%exclude %{python3_sitelib}/swift/test - -%files -n python3-swift-tests -%license LICENSE -%{python3_sitelib}/swift/test %files account %defattr(-,root,root,-) @@ -557,6 +510,68 @@ exit 0 %{_bindir}/swift-object-expirer %{_bindir}/swift-proxy-server +%files common +%defattr(-,root,root,-) +%license LICENSE +%doc README.rst +%doc etc/*-sample +%{_mandir}/man5/dispersion.conf.5* +%{_mandir}/man1/swift-account-audit.1* +%{_mandir}/man1/swift-ring-builder-analyzer.1* +%{_mandir}/man1/swift-config.1* +%{_mandir}/man1/swift-dispersion-populate.1* +%{_mandir}/man1/swift-dispersion-report.1* +%{_mandir}/man1/swift-drive-audit.1* +%{_mandir}/man1/swift-form-signature.1* +%{_mandir}/man1/swift-get-nodes.1* +%{_mandir}/man1/swift-init.1* +%{_mandir}/man1/swift-oldies.1.* +%{_mandir}/man1/swift-orphans.1* +%{_mandir}/man1/swift-recon.1* +%{_mandir}/man1/swift-recon-cron.1* +%{_mandir}/man1/swift-ring-builder.1* +%{_mandir}/man1/swift-ring-composer.1* +%{_mandir}/man5/swift.conf.5* +%{_mandir}/man5/container-sync-realms.conf.5* +%{_tmpfilesdir}/openstack-swift.conf +%dir %attr(0755, swift, swift)%{_sysconfdir}/swift +%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/swift.conf +%config(noreplace) %{_sysconfdir}/rsyslog.d/openstack-swift.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-swift +%dir %{_localstatedir}/log/swift +%dir %attr(0755, swift, root) %{_localstatedir}/run/swift +%dir %attr(0755, swift, swift) %{_localstatedir}/cache/swift +%dir %attr(0755, swift, root) %{_sharedstatedir}/swift +%dir %{python3_sitelib}/swift +%{_bindir}/swift-account-audit +%{_bindir}/swift-config +%{_bindir}/swift-dispersion-populate +%{_bindir}/swift-dispersion-report +%{_bindir}/swift-drive-audit +%{_bindir}/swift-form-signature +%{_bindir}/swift-get-nodes +%{_bindir}/swift-init +%{_bindir}/swift-manage-shard-ranges +%{_bindir}/swift-oldies +%{_bindir}/swift-orphans +%{_bindir}/swift-recon +%{_bindir}/swift-recon-cron +%{_bindir}/swift-reconciler-enqueue +%{_bindir}/swift-ring-builder +%{_bindir}/swift-ring-builder-analyzer +%{_bindir}/swift-ring-composer + +%files -n python3-swift -f swift.lang +%defattr(-,root,root,-) +%license LICENSE +%{python3_sitelib}/swift +%{python3_sitelib}/swift-%{upstream_version}-py?.*.egg-info +%exclude %{python3_sitelib}/swift/test + +%files -n python3-swift-tests +%license LICENSE +%{python3_sitelib}/swift/test + %if 0%{?with_doc} %files doc %defattr(-,root,root,-) @@ -565,6 +580,9 @@ exit 0 %endif %changelog +* Tue Aug 24 2021 wangxiyuan - 2.27.0-3 +- Correct rpm package structure + * Sat Jul 31 2021 OpenStack_SIG - 2.27.0-2 - Delete the epoch