|
|
dc71ce3 |
# SUSE guys use OBS to automatically handle release numbers,
|
|
|
dc71ce3 |
# when rebasing check what they are using on
|
|
|
878f880 |
# http://download.opensuse.org/repositories/openSUSE:/Tools/Fedora_31/src/
|
|
|
dc71ce3 |
# update the obsrel to match the upstream release number
|
|
|
2131388 |
%global obsrel 303.1
|
|
|
dc32b0e |
|
|
|
dc32b0e |
# osc plugin support
|
|
|
dc32b0e |
%global osc_plugin_dir %{_prefix}/lib/osc-plugins
|
|
|
d4bcd97 |
|
|
|
b8daf83 |
# for obs source services
|
|
|
b8daf83 |
%global obsroot %{_prefix}/lib/obs
|
|
|
b8daf83 |
%global obs_srcsvc_dir %{obsroot}/service
|
|
|
b8daf83 |
|
|
|
b62afc4 |
# Control building as Python 2 for
|
|
|
b62afc4 |
%if (0%{?fedora} && 0%{?fedora} < 30) || (0%{?rhel} && 0%{?rhel} < 8)
|
|
|
31982d5 |
%bcond_with python3
|
|
|
b62afc4 |
%else
|
|
|
b62afc4 |
%bcond_without python3
|
|
|
31982d5 |
%endif
|
|
|
31982d5 |
|
|
|
31982d5 |
%if %{with python3}
|
|
|
31982d5 |
%global __python %{__python3}
|
|
|
31982d5 |
%else
|
|
|
31982d5 |
%global __python %{__python2}
|
|
|
31982d5 |
%endif
|
|
|
31982d5 |
|
|
|
d4bcd97 |
# Real release number
|
|
|
f5c3ba0 |
%global baserelease 2
|
|
|
dc71ce3 |
|
|
Jerome Soyer |
23823f7 |
Name: osc
|
|
|
31982d5 |
Summary: Open Build Service Commander
|
|
|
2131388 |
Version: 0.169.1
|
|
|
dc71ce3 |
# Bump the release as necessary to ensure we're one level up from upstream
|
|
|
878f880 |
Release: %{obsrel}.%{baserelease}%{?dist}
|
|
Jerome Soyer |
23823f7 |
License: GPLv2+
|
|
|
31982d5 |
URL: https://github.com/openSUSE/osc
|
|
|
9640d5e |
Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
|
|
31982d5 |
|
|
|
81188a4 |
# Proposed fixes
|
|
|
81188a4 |
## Fix osc build --local-package runs
|
|
|
81188a4 |
## From: https://github.com/openSUSE/osc/pull/573
|
|
|
81188a4 |
Patch0101: 0101-Do-not-attempt-to-run-source-services-when-local-pac.patch
|
|
|
2131388 |
## Fix ElementTree imports to work with Python 3.9
|
|
|
2131388 |
## https://github.com/openSUSE/osc/pull/800
|
|
|
8f572ee |
Patch0102: 0102-Fix-and-standardize-ElementTree-imports-for-Python-3.patch
|
|
|
81188a4 |
|
|
Jerome Soyer |
23823f7 |
BuildArch: noarch
|
|
Jerome Soyer |
23823f7 |
|
|
|
31982d5 |
%if %{with python3}
|
|
|
31982d5 |
BuildRequires: python3-devel
|
|
|
b62afc4 |
BuildRequires: python3-distro
|
|
|
31982d5 |
BuildRequires: python3-rpm
|
|
|
878f880 |
BuildRequires: python3-progressbar2
|
|
|
b62afc4 |
Requires: python3-distro
|
|
|
31982d5 |
Requires: python3-rpm
|
|
|
31982d5 |
Requires: python3-m2crypto
|
|
|
31982d5 |
Requires: python3-lxml
|
|
|
878f880 |
Requires: python3-progressbar2
|
|
|
31982d5 |
%else
|
|
|
b8daf83 |
BuildRequires: python2-devel
|
|
|
b62afc4 |
BuildRequires: python2-distro
|
|
|
b8daf83 |
BuildRequires: python2-rpm
|
|
|
878f880 |
BuildRequires: python2-progressbar2
|
|
|
b62afc4 |
Requires: python2-distro
|
|
|
b8daf83 |
Requires: python2-rpm
|
|
|
116953c |
Requires: m2crypto
|
|
|
b8daf83 |
Requires: python2-lxml
|
|
|
878f880 |
Requires: python2-progressbar2
|
|
|
31982d5 |
%endif
|
|
Jerome Soyer |
23823f7 |
|
|
|
dc71ce3 |
%if 0%{?fedora} || 0%{?rhel} >= 8
|
|
|
31982d5 |
Recommends: obs-build
|
|
|
b8daf83 |
Recommends: obs-service-source_validator
|
|
|
dc71ce3 |
%else
|
|
|
b8daf83 |
Requires: obs-service-source_validator
|
|
|
dc71ce3 |
%endif
|
|
Jerome Soyer |
23823f7 |
|
|
|
a91a11a |
# To ensure functional parity
|
|
|
878f880 |
Conflicts: obs-build < 20191205
|
|
|
a91a11a |
|
|
Jerome Soyer |
23823f7 |
%description
|
|
|
b8daf83 |
Commandline client for the Open Build Service.
|
|
Jerome Soyer |
23823f7 |
|
|
Jerome Soyer |
23823f7 |
See http://en.opensuse.org/openSUSE:OSC , as well as
|
|
Jerome Soyer |
23823f7 |
http://en.opensuse.org/openSUSE:Build_Service_Tutorial for a general
|
|
Jerome Soyer |
23823f7 |
introduction.
|
|
Jerome Soyer |
23823f7 |
|
|
Jerome Soyer |
23823f7 |
|
|
Jerome Soyer |
23823f7 |
%prep
|
|
|
31982d5 |
%autosetup -p1
|
|
Jerome Soyer |
23823f7 |
|
|
Jerome Soyer |
23823f7 |
#fixup encoding
|
|
Jerome Soyer |
23823f7 |
iconv -f ISO8859-1 -t UTF-8 -o TODO.new TODO
|
|
Jerome Soyer |
23823f7 |
mv TODO.new TODO
|
|
Jerome Soyer |
23823f7 |
|
|
Jerome Soyer |
23823f7 |
%build
|
|
|
31982d5 |
%py_build
|
|
Jerome Soyer |
23823f7 |
|
|
Jerome Soyer |
23823f7 |
%install
|
|
|
31982d5 |
%py_install
|
|
|
dc71ce3 |
|
|
|
dc71ce3 |
%__ln_s osc-wrapper.py %{buildroot}%{_bindir}/osc
|
|
|
116953c |
%__mkdir_p %{buildroot}%{_localstatedir}/lib/osc-plugins
|
|
|
40db244 |
%__mkdir_p %{buildroot}%{_datadir}/bash-completion/completions/
|
|
|
116953c |
install -Dm0644 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh
|
|
|
40db244 |
install -Dm0644 dist/complete.sh %{buildroot}%{_datadir}/bash-completion/completions/osc
|
|
|
40db244 |
install -Dm0755 dist/osc.complete %{buildroot}%{_datadir}/osc/complete
|
|
Jerome Soyer |
23823f7 |
|
|
|
b8daf83 |
mkdir -p %{buildroot}%{obs_srcsvc_dir}
|
|
|
b8daf83 |
|
|
|
dc32b0e |
mkdir -p %{buildroot}%{osc_plugin_dir}
|
|
|
dc32b0e |
|
|
|
dc32b0e |
mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
|
|
|
dc32b0e |
|
|
|
dc32b0e |
# osc rpm macros
|
|
|
dc32b0e |
cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.osc <
|
|
|
b8daf83 |
%%obs_srcsvc_dir %{obs_srcsvc_dir}
|
|
|
dc32b0e |
%%osc_plugin_dir %{osc_plugin_dir}
|
|
|
dc32b0e |
EOM
|
|
|
dc32b0e |
|
|
|
dc32b0e |
|
|
Jerome Soyer |
23823f7 |
%files
|
|
Jerome Soyer |
23823f7 |
%doc AUTHORS README TODO NEWS
|
|
|
40db244 |
%license COPYING
|
|
Jerome Soyer |
23823f7 |
%{_bindir}/osc*
|
|
|
31982d5 |
%{python_sitelib}/osc*
|
|
|
dc32b0e |
%{_sysconfdir}/profile.d/osc.csh
|
|
|
40db244 |
%{_datadir}/bash-completion/completions/osc
|
|
|
116953c |
%dir %{_localstatedir}/lib/osc-plugins
|
|
Jerome Soyer |
23823f7 |
%{_mandir}/man1/osc.*
|
|
|
40db244 |
%{_datadir}/osc
|
|
|
dc32b0e |
%{_rpmconfigdir}/macros.d/macros.osc
|
|
|
b8daf83 |
%dir %{obsroot}
|
|
|
b8daf83 |
%dir %{obs_srcsvc_dir}
|
|
|
dc32b0e |
%dir %{osc_plugin_dir}
|
|
Jerome Soyer |
23823f7 |
|
|
Jerome Soyer |
23823f7 |
%changelog
|
|
|
f5c3ba0 |
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.169.1-303.1.2
|
|
|
f5c3ba0 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
|
f5c3ba0 |
|
|
|
2131388 |
* Tue Jun 02 2020 Adam Williamson <awilliam@redhat.com> - 0.169.1-303.1.1
|
|
|
2131388 |
- Update to 0.169.1
|
|
|
2131388 |
- Drop merged or otherwise-fixed PRs
|
|
|
2131388 |
- Backport PR #800 to fix build with Python 3.9
|
|
|
2131388 |
|
|
|
df8a5ff |
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.167.1-281.1.5
|
|
|
df8a5ff |
- Rebuilt for Python 3.9
|
|
|
df8a5ff |
|
|
|
8d7c94d |
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.167.1-281.1.4
|
|
|
8d7c94d |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
|
8d7c94d |
|
|
|
05f5574 |
* Tue Dec 31 2019 Neal Gompa <ngompa13@gmail.com> - 0.167.1-281.1.3
|
|
|
05f5574 |
- Rebuild again to deal with random Koji+Bodhi breakage
|
|
|
05f5574 |
|
|
|
68b5794 |
* Fri Dec 27 2019 Neal Gompa <ngompa13@gmail.com> - 0.167.1-281.1.2
|
|
|
68b5794 |
- Rebuild to deal with random Koji+Bodhi breakage
|
|
|
68b5794 |
|
|
|
878f880 |
* Fri Dec 27 2019 Neal Gompa <ngompa13@gmail.com> - 0.167.1-281.1.1
|
|
|
878f880 |
- Update to 0.167.1
|
|
|
878f880 |
- Backport fix for regressions in osc chroot
|
|
|
878f880 |
- Refresh patch for fixing local builds
|
|
|
878f880 |
- Drop patch incorporated in this release
|
|
|
878f880 |
- Add patch to fix osc importsrcpkg on Python 3
|
|
|
878f880 |
|
|
|
9ab882f |
* Mon Nov 18 2019 Neal Gompa <ngompa13@gmail.com> - 0.166.2-272.1.2
|
|
|
9ab882f |
- Fix patch for replacing cgi.escape with html.escape
|
|
|
9ab882f |
|
|
|
b62afc4 |
* Mon Nov 18 2019 Neal Gompa <ngompa13@gmail.com> - 0.166.2-272.1.1
|
|
|
b62afc4 |
- Update to 0.166.2
|
|
|
b62afc4 |
- Add fixes for Python 3.8 compatibility
|
|
|
b62afc4 |
|
|
|
edb6f6f |
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.165.1-255.1.2.3
|
|
|
edb6f6f |
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
|
|
edb6f6f |
|
|
|
2484945 |
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.165.1-255.1.2.2
|
|
|
2484945 |
- Rebuilt for Python 3.8
|
|
|
2484945 |
|
|
|
ed6d95a |
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.165.1-255.1.2.1
|
|
|
ed6d95a |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
|
ed6d95a |
|
|
|
81188a4 |
* Thu May 30 2019 Neal Gompa <ngompa13@gmail.com> - 0.165.1-255.1.2
|
|
|
81188a4 |
- Add patch proposed upstream to fix local builds
|
|
|
81188a4 |
|
|
|
d2717eb |
* Thu May 30 2019 Neal Gompa <ngompa13@gmail.com> - 0.165.1-255.1.1
|
|
|
d2717eb |
- Update to 0.165.1
|
|
|
d2717eb |
- Backport fixes from upstream for Python 3
|
|
|
d2717eb |
- Drop patches incorporated in this release
|
|
|
d2717eb |
|
|
|
31982d5 |
* Sun Mar 24 2019 Neal Gompa <ngompa13@gmail.com> - 0.164.2-245.1.1
|
|
|
31982d5 |
- Update to 0.164.2
|
|
|
31982d5 |
- Add proposed patches to build for Python 3 for Fedora 30+
|
|
|
31982d5 |
- Add Recommends for obs-build
|
|
|
31982d5 |
|
|
|
1085293 |
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.163.0-237.1.1.1
|
|
|
1085293 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
|
1085293 |
|
|
|
a91a11a |
* Thu Aug 23 2018 Neal Gompa <ngompa13@gmail.com> - 0.163.0-237.1.1
|
|
|
a91a11a |
- Update to 0.163.0
|
|
|
a91a11a |
|
|
|
b824e6f |
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.162.1-230.1.1.3
|
|
|
b824e6f |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
|
b824e6f |
|
|
|
2d6f0db |
* Fri Feb 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.162.1-230.1.1.2
|
|
|
2d6f0db |
- Update Python 2 dependency declarations to new packaging standards
|
|
|
2d6f0db |
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
|
|
2d6f0db |
|
|
|
cbaa043 |
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.162.1-230.1.1.1
|
|
|
cbaa043 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
|
cbaa043 |
|
|
|
b8daf83 |
* Mon Jan 15 2018 Neal Gompa <ngompa13@gmail.com> - 0.162.1-230.1.1
|
|
|
b8daf83 |
- Rebase to 0.162.1 to fix CVE-2017-9274
|
|
|
b8daf83 |
|
|
|
dc32b0e |
* Sun Nov 05 2017 Neal Gompa <ngompa13@gmail.com> - 0.161.1-224.1.1
|
|
|
dc32b0e |
- Rebase to 0.161.1
|
|
|
dc32b0e |
|
|
|
9e7636c |
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.157.1-202.1.1.1
|
|
|
9e7636c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
|
9e7636c |
|
|
|
d4bcd97 |
* Sat Mar 18 2017 Neal Gompa <ngompa13@gmail.com> - 0.157.1-202.1.1
|
|
|
d4bcd97 |
- Rebase to 0.157.1
|
|
|
d4bcd97 |
|
|
|
c781589 |
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.155.0-190.1.1.1
|
|
|
c781589 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
|
c781589 |
|
|
|
9640d5e |
* Thu Aug 11 2016 Neal Gompa <ngompa13@gmail.com> - 0.155.0-190.1.1
|
|
|
9640d5e |
- Rebase to 0.155.0
|
|
|
9640d5e |
|
|
|
dc71ce3 |
* Tue Jul 26 2016 Neal Gompa <ngompa13@gmail.com> - 0.154.0-187.1.1
|
|
|
dc71ce3 |
- Rebase to 0.154.0
|
|
|
dc71ce3 |
- Setup for working on EL7
|
|
|
dc71ce3 |
|
|
|
6bb32a4 |
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.151.1-166.2.1
|
|
|
6bb32a4 |
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
|
|
6bb32a4 |
|
|
|
3ee7c26 |
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.151.1-165.2.1
|
|
|
3ee7c26 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
|
3ee7c26 |
|
|
|
b38f367 |
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.151.1-164.2.1
|
|
|
b38f367 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
|
b38f367 |
|
|
|
40db244 |
* Tue Feb 24 2015 Miroslav Suchý <msuchy@redhat.com> 0.151.1-163.2.1
|
|
|
40db244 |
- rebase to 0.140.1
|
|
|
40db244 |
- fixed shell command injection via crafted _service files CVE-2015-0778
|
|
|
40db244 |
|
|
|
127b68a |
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.140.1-109.1.1
|
|
|
127b68a |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
|
127b68a |
|
|
|
baf1e86 |
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.140.1-108.1.1
|
|
|
baf1e86 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
|
baf1e86 |
|
|
|
116953c |
* Wed Jul 17 2013 Miroslav Suchý <msuchy@redhat.com> 0.140.1-107.1.1
|
|
|
116953c |
- add one number to release so we can distinguish from OpenSuse v-r
|
|
|
116953c |
(msuchy@redhat.com)
|
|
|
116953c |
- rebase to 0.140.1 (msuchy@redhat.com)
|
|
|
116953c |
|
|
|
3ff4e9e |
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.132.4-4
|
|
|
3ff4e9e |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
|
3ff4e9e |
|
|
|
9d62924 |
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.132.4-3
|
|
|
9d62924 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
|
9d62924 |
|
|
|
31e8393 |
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.132.4-2
|
|
|
31e8393 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
|
31e8393 |
|
|
Jerome Soyer |
209cac9 |
* Tue Jun 21 2011 Jerome Soyer <saispo@gmail.com> - 0.132.4-1
|
|
Jerome Soyer |
209cac9 |
- Update to 0.132.4
|
|
Jerome Soyer |
209cac9 |
|
|
Jerome Soyer |
209cac9 |
* Thu Jun 9 2011 Jerome Soyer <saispo@gmail.com> - 0.132.1-2
|
|
Jerome Soyer |
23823f7 |
- Fix non-arch dependent shell script in /usr/lib for multilib
|
|
Jerome Soyer |
23823f7 |
|
|
Jerome Soyer |
209cac9 |
* Wed Jun 8 2011 Jerome Soyer <saispo@gmail.com> - 0.132.1-1
|
|
Jerome Soyer |
23823f7 |
- Update to 0.132.1
|
|
Jerome Soyer |
23823f7 |
- Fix tab/space in SPEC file
|
|
Jerome Soyer |
23823f7 |
- Add comment and command for tarball creation
|
|
Jerome Soyer |
23823f7 |
- Fix libdir-macro-in-noarch-package
|
|
Jerome Soyer |
23823f7 |
|
|
Jerome Soyer |
209cac9 |
* Wed Jun 8 2011 Jerome Soyer <saispo@gmail.com> - 0.132.0-1
|
|
Jerome Soyer |
23823f7 |
- Initial build
|