PR#284: Fix bugs and updates spec - FedoraReview

FedoraReview

#284 Fix bugs and updates spec

Closed 6 years ago by till. Opened 6 years ago by till.

till/FedoraReview BR-Exceptions into master

Update Fedora release used for test cases

Till Maas • 6 years ago

be2d090

Merge downstream spec changes

Till Maas • 6 years ago

b7906b6

Do not check for build requires exceptions

Till Maas • 6 years ago

253da97

fedora-review.spec

file modified

+36 -18

		`@@ -7,27 +7,27 @@`
		`%bcond_with tests`

		`# See notes in make_release which patches this.`
		`- ## global git_tag .fa1afe1`
		`+ ## global git_tag .f03e4e7`

		`# Support jenkins build number if available.`
		`%global build_nr %(echo "${BUILD_NUMBER:+.}${BUILD_NUMBER:-%%{nil\\}}")`

		`Name: fedora-review`
		`Version: 0.6.1`
		`- Release: 1%{?build_nr}%{?git_tag}%{?dist}`
		`+ Release: 5%{?build_nr}%{?git_tag}%{?dist}`
		`Summary: Review tool for fedora rpm packages`

		`License: GPLv2+`
		`- URL: https://fedorahosted.org/FedoraReview/`
		`- Source0: https://fedorahosted.org/released/FedoraReview/%{name}-%{version}%{?git_tag}.tar.gz`
		`+ URL: https://pagure.io/FedoraReview`
		`+ Source0: https://releases.pagure.org/FedoraReview/%{name}-%{version}%{?git_tag}.tar.gz`

		`BuildArch: noarch`

		`- BuildRequires: python-argparse`
		`BuildRequires: python-BeautifulSoup`
		`BuildRequires: python-bugzilla`
		`+ BuildRequires: python-packaging`
		`BuildRequires: python-straight-plugin`
		`- %if 0%{?rhel} < 7`
		`+ %if 0%{?rhel} && 0%{?rhel} < 7`
		`BuildRequires: python-unittest2`
		`%endif`
		`BuildRequires: python2-devel`
		`@@ -35,10 +35,10 @@`

		`Requires: packagedb-cli`
		`Requires: fedora-packager`
		`- Requires: python-argparse`
		`Requires: python-BeautifulSoup`
		`Requires: python-bugzilla`
		`Requires: python-kitchen`
		`+ Requires: python-packaging`
		`Requires: python-straight-plugin`
		`Requires: packagedb-cli`
		`Requires: rpm-python`
		`@@ -94,15 +94,15 @@`


		`%prep`
		`- %setup -q`
		`+ %autosetup -p 1`


		`%build`
		`- %{__python} setup.py --quiet build`
		`+ %py2_build`


		`%install`
		`- %{__python} setup.py --quiet install -O1 --skip-build --root $RPM_BUILD_ROOT`
		`+ %py2_install`
		`pkg_dir="$RPM_BUILD_ROOT/%{python_sitelib}/FedoraReview"`
		`ln -s %{_datadir}/%{name}/scripts $pkg_dir/scripts`
		`ln -s %{_datadir}/%{name}/plugins $pkg_dir/plugins`
		`@@ -119,16 +119,18 @@`
		`cd test`
		`export REVIEW_LOGLEVEL=warning`
		`export MAKE_RELEASE=1`
		`- mock --quiet -r fedora-21-i386 --init`
		`- mock --quiet -r fedora-20-i386 --init`
		`- mock --quiet -r fedora-21-i386 --uniqueext=hugo --init`
		`- python -m unittest discover -f`
		`+ mock --quiet -r fedora-25-i386 --init`
		`+ mock --quiet -r fedora-26-i386 --init`
		`+ mock --quiet -r fedora-26-i386 --uniqueext=hugo --init`
		`+ %{__python2} -m unittest discover -f`
		`%endif`


		`%files`
		`- %doc COPYING AUTHORS README`
		`- %{python_sitelib}/*`
		`+ %doc README`
		`+ %license COPYING AUTHORS`
		`+ %{python2_sitelib}/FedoraReview`
		`+ %{python2_sitelib}/fedora_review-%{version}-py%{python2_version}.egg-info`
		`%{_bindir}/fedora-review`
		`%{_bindir}/fedora-create-review`
		`%{_bindir}/koji-download-scratch`
		`@@ -150,8 +152,24 @@`


		`%changelog`
		`- * Tue May 12 2015 Alec Leamas <leamas.alec@gmail.com> - 0.6.1-1.fa1afe1`
		`- - Generic post-release entry.`
		`+`
		`+ * Fri Jun 02 2017 Björn Esser <besser82@fedoraproject.org> - 0.6.1-5`
		`+ - Add mock-option '--no-bootstrap-chroot' to defaults, if mock >= 1.4.1`
		`+ - Update spec file to recent guidelines`
		`+ - Change package url and source to Pagure`
		`+`
		`+ * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-4`
		`+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild`
		`+`
		`+ * Thu Oct 06 2016 Pierre-Yves Chibon <pingou@pingoured.fr> - 0.6.1-3`
		`+ - Drop requirement to python-argparse now that it has been in python's stdlib`
		`+ for so long`
		`+`
		`+ * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-2`
		`+ - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages`
		`+`
		`+ * Mon May 02 2016 Alec Leamas <leamas.alec@gmail.com> - 0.6.1-1.f03e4e7`
		`+ - New upstream release 0.6.1`

		`* Tue Feb 16 2016 Orion Poplawski <orion@cora.nwra.com> - 0.6.0-4`
		`- Exclude test content from perl requires`

plugins/generic.py

file modified

-44

		`@@ -155,50 +155,6 @@`
		`self.set_passed(self.PENDING)`


		`- class CheckBuildRequires(GenericCheckBase):`
		`- '''`
		`- MUST: All build dependencies must be listed in BuildRequires,`
		`- except for any that are listed in the exceptions section of the`
		`- Packaging Guidelines Inclusion of those as BuildRequires is`
		`- optional. Apply common sense.`
		`- '''`
		`- def __init__(self, base):`
		`- GenericCheckBase.__init__(self, base)`
		`- self.url = 'http://fedoraproject.org/wiki/' \`
		`- 'Packaging/Guidelines#Exceptions_2'`
		`- self.text = 'All build dependencies are listed in BuildRequires,' \`
		`- ' except for any that are listed in the exceptions' \`
		`- ' section of Packaging Guidelines.'`
		`- self.automatic = True`
		`- self.type = 'MUST'`
		`-`
		`- def run(self):`
		`-`
		`- if self.checks.checkdict['CheckBuild'].is_pending or \`
		`- Settings.prebuilt:`
		`- self.set_passed(self.PENDING, 'Using prebuilt rpms.')`
		`- elif self.checks.checkdict['CheckBuild'].is_passed:`
		`- brequires = self.spec.build_requires`
		`- pkg_by_default = ['bash', 'bzip2', 'coreutils', 'cpio',`
		`- 'diffutils', 'fedora-release', 'findutils',`
		`- 'gawk', 'gcc', 'gcc-c++', 'grep', 'gzip',`
		`- 'info', 'make', 'patch', 'redhat-rpm-config',`
		`- 'rpm-build', 'sed', 'shadow-utils', 'tar',`
		`- 'unzip', 'util-linux-ng', 'which', 'xz']`
		`- intersec = list(set(brequires).intersection(set(pkg_by_default)))`
		`- if intersec:`
		`- self.set_passed(self.FAIL, 'These BR are not needed: %s' % (`
		`- ' '.join(intersec)))`
		`- else:`
		`- self.set_passed(self.PASS)`
		`- else:`
		`- self.set_passed(self.FAIL,`
		`- 'The package did not build.'`
		`- ' BR could therefore not be checked or the'`
		`- ' package failed to build because of'`
		`- ' missing BR')`
		`-`
		`-`
		`class CheckChangelogFormat(GenericCheckBase):`
		`''' Changelog in correct format. '''`

review_template.txt

file modified

-4

		`@@ -44,9 +44,6 @@`
		`[s] Sources used to build the package matches the upstream source, as provided in the spec URL.`
		`Semi-automatic - if the source is a valid url, md5 is checked. otherwise, a warning is shown to check the source package against CVS`

		`- [m] All build dependencies are listed in BuildRequires, except for any that are listed in the exceptions section of Packaging Guidelines[5].`
		`- Manual`
		`-`
		`[m] Package must own all directories that it creates or must require other packages for directories it uses.`
		`Manual - insanely costly`

		`@@ -166,5 +163,4 @@`
		`[2] https://fedoraproject.org/wiki/Packaging:Guidelines`
		`[3] https://fedoraproject.org/wiki/Packaging:LicensingGuidelines`
		`[4] https://fedoraproject.org/wiki/Licensing:Main`
		`- [5] https://fedoraproject.org/wiki/Packaging/Guidelines#Exceptions_2`
		`[6] https://fedoraproject.org/wiki/Packaging:Java#Filenames`

test/fr_testcase.py

file modified

+1 -1

		`@@ -38,7 +38,7 @@`

		`VERSION = '0.6.1'`

		`- RELEASE = '20'`
		`+ RELEASE = '26'`

		`try:`
		`urlopen('http://bugzilla.redhat.com')`

test/run-tests

file modified

+2 -2

		`@@ -68,8 +68,8 @@`
		`PYTHONPATH=src ./update-version \|\| :`
		`cd test`
		`export REVIEW_LOGLEVEL=${REVIEW_LOGLEVEL:-warning}`
		`- for root in '-' fedora-20-i386 fedora-20-i386 \`
		`- "fedora-20-i386 --uniqueext=hugo"`
		`+ for root in '-' fedora-26-i386 fedora-26-i386 \`
		`+ "fedora-26-i386 --uniqueext=hugo"`
		`do`
		`init_mockroot $root`
		`done`

test/test_checks.py

file modified

-4

		`@@ -87,7 +87,6 @@`
		`('pass', 'CheckSourceMD5'),`
		`('pending', 'CheckBundledLibs'),`
		`('fail', 'CheckBuildInMock'),`
		`- ('pending', 'CheckBuildRequires'),`
		`# Disable for now due to F18/F19 differences`
		`# ('pass' if FEDORA else 'pending',`
		`# 'CheckOwnDirs'),`
		`@@ -167,7 +166,6 @@`
		`('pass', 'CheckSourceMD5'),`
		`('pending', 'CheckBundledLibs'),`
		`('fail', 'CheckBuildInMock'),`
		`- ('pending', 'CheckBuildRequires'),`
		`('pending', 'CheckOwnDirs'),`
		`('fail', 'RubyCheckNotRequiresRubyAbi'),`
		`('fail', 'RubyCheckRequiresRubyRelease'),`
		`@@ -260,7 +258,6 @@`
		`('pass', 'CheckSourceMD5'),`
		`('pending', 'CheckBundledLibs'),`
		`('fail', 'CheckBuildInMock'),`
		`- ('pending', 'CheckBuildRequires'),`
		`('pass' if FEDORA else 'pending',`
		`'CheckOwnDirs'),`
		`('na', 'CheckSourceComment'),`
		`@@ -379,7 +376,6 @@`
		`('pending', 'CheckBundledLibs'),`
		`('fail', 'CheckBuildInMock'),`
		`('pass', 'CheckLDConfig'),`
		`- ('pending', 'CheckBuildRequires'),`
		`('pending', 'CheckNoStaticExecutables'),`
		`('pass', 'CheckRPATH'),`
		`('pending', 'CheckUsefulDebuginfo'),`