sgallagh pushed to ReviewBoard (epel7). "Merge branch 'f21' into epel7"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Jun 12 16:08:53 UTC 2015
From 240ff328ec0f0aa6a8166bb8ac4bbc449826a093 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Fri, 12 Jun 2015 12:07:39 -0400
Subject: New upstream release 2.0.16
- https://www.reviewboard.org/docs/releasenotes/reviewboard/2.0.16/
diff --git a/.gitignore b/.gitignore
index ef4b61f..1d4d23f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,4 @@ clog
/ReviewBoard-2.0.13.tar.gz
/ReviewBoard-2.0.14.tar.gz
/ReviewBoard-2.0.15.tar.gz
+/ReviewBoard-2.0.16.tar.gz
diff --git a/FED01-Soften-dependencies.patch b/FED01-Soften-dependencies.patch
index 3bfc114..79ad5a4 100644
--- a/FED01-Soften-dependencies.patch
+++ b/FED01-Soften-dependencies.patch
@@ -1,7 +1,7 @@
-From 688684c143cc875b31b01bde7675a5823b376a36 Mon Sep 17 00:00:00 2001
+From ba942450df0047ebe7ab841e15930630f6991c2f Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Fri, 28 Feb 2014 16:20:03 -0500
-Subject: [PATCH 1/2] Soften dependencies
+Subject: [PATCH 2/3] Soften dependencies
---
reviewboard/__init__.py | 2 +-
@@ -9,16 +9,16 @@ Subject: [PATCH 1/2] Soften dependencies
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/reviewboard/__init__.py b/reviewboard/__init__.py
-index 1db54c428557d02cb267c8f9887749705a1dc86c..cc2cd1c5ccd21174169051e45bf23b0f44dca9a3 100644
+index e77ae0c2984345a52203fbc898c1159906420dc8..1f974cfd50ef946e6220b123119028f5581429b4 100644
--- a/reviewboard/__init__.py
+++ b/reviewboard/__init__.py
@@ -9,11 +9,11 @@ from __future__ import unicode_literals
#
- VERSION = (2, 0, 15, 0, 'final', 0, True)
+ VERSION = (2, 0, 16, 0, 'final', 0, True)
# Required version of Django
--django_version = 'Django>=1.6.10,<1.7'
+-django_version = 'Django>=1.6.11,<1.7'
+django_version = 'Django>=1.6,<1.7'
@@ -26,69 +26,13 @@ index 1db54c428557d02cb267c8f9887749705a1dc86c..cc2cd1c5ccd21174169051e45bf23b0f
version = '%s.%s' % (VERSION[0], VERSION[1])
diff --git a/setup.py b/setup.py
-index 5010e100feb2901d2d5e9d714469ae80d39c2573..529387eefdbb36128f39a9f171c02c2a033dcadc 100755
+index d9ed3e227258248e1c4b26b5dd2bc7e338041826..487d8eacd05e4772cc614a736a49113d9d6c2be8 100755
--- a/setup.py
+++ b/setup.py
-@@ -143,91 +143,91 @@ else:
- setup(name=PACKAGE_NAME,
- version=get_package_version(),
- license="MIT",
- description="Review Board, a web-based code review tool",
- url="https://www.reviewboard.org/",
- download_url=download_url,
- author="The Review Board Project",
- author_email="reviewboard at googlegroups.com",
- maintainer="Christian Hammond",
- maintainer_email="christian at beanbaginc.com",
- packages=find_packages(),
- entry_points = {
- 'console_scripts': [
- 'rb-site = reviewboard.cmdline.rbsite:main',
- 'rbssh = reviewboard.cmdline.rbssh:main',
- ],
- 'reviewboard.hosting_services': [
- 'beanstalk = reviewboard.hostingsvcs.beanstalk:Beanstalk',
- 'bitbucket = reviewboard.hostingsvcs.bitbucket:Bitbucket',
- 'bugzilla = reviewboard.hostingsvcs.bugzilla:Bugzilla',
- 'codebasehq = reviewboard.hostingsvcs.codebasehq:CodebaseHQ',
- 'fedorahosted = '
- 'reviewboard.hostingsvcs.fedorahosted:FedoraHosted',
- 'fogbugz = reviewboard.hostingsvcs.fogbugz:FogBugz',
- 'github = reviewboard.hostingsvcs.github:GitHub',
- 'gitlab = reviewboard.hostingsvcs.gitlab:GitLab',
- 'gitorious = reviewboard.hostingsvcs.gitorious:Gitorious',
- 'googlecode = reviewboard.hostingsvcs.googlecode:GoogleCode',
- 'kiln = reviewboard.hostingsvcs.kiln:Kiln',
- 'redmine = reviewboard.hostingsvcs.redmine:Redmine',
- 'sourceforge = reviewboard.hostingsvcs.sourceforge:SourceForge',
- 'trac = reviewboard.hostingsvcs.trac:Trac',
- 'unfuddle = reviewboard.hostingsvcs.unfuddle:Unfuddle',
- 'versionone = reviewboard.hostingsvcs.versionone:VersionOne',
- ],
- 'reviewboard.scmtools': [
- 'bzr = reviewboard.scmtools.bzr:BZRTool',
- 'clearcase = reviewboard.scmtools.clearcase:ClearCaseTool',
- 'cvs = reviewboard.scmtools.cvs:CVSTool',
- 'git = reviewboard.scmtools.git:GitTool',
- 'hg = reviewboard.scmtools.hg:HgTool',
- 'perforce = reviewboard.scmtools.perforce:PerforceTool',
- 'plastic = reviewboard.scmtools.plastic:PlasticTool',
- 'svn = reviewboard.scmtools.svn:SVNTool',
- ],
- 'reviewboard.auth_backends': [
- 'ad = reviewboard.accounts.backends:ActiveDirectoryBackend',
- 'ldap = reviewboard.accounts.backends:LDAPBackend',
- 'nis = reviewboard.accounts.backends:NISBackend',
- 'x509 = reviewboard.accounts.backends:X509Backend',
- 'digest = reviewboard.accounts.backends:HTTPDigestBackend',
- ],
- },
- cmdclass=cmdclasses,
- install_requires=[
- django_version,
- 'django_evolution>=0.7.4,<=0.7.999',
- 'django-haystack>=2.1',
- 'Djblets>=0.8.16,<=0.8.999',
+@@ -200,18 +200,18 @@ setup(name=PACKAGE_NAME,
+ 'django_evolution>=0.7.5,<=0.7.999',
+ 'django-haystack>=2.3.1',
+ 'Djblets>=0.8.19,<=0.8.999',
'docutils',
'markdown>=2.4.0,<2.4.999',
- 'mimeparse>=0.1.3',
@@ -107,23 +51,6 @@ index 5010e100feb2901d2d5e9d714469ae80d39c2573..529387eefdbb36128f39a9f171c02c2a
'http://downloads.reviewboard.org/mirror/',
'http://downloads.reviewboard.org/releases/Djblets/0.8/',
'http://downloads.reviewboard.org/releases/django-evolution/0.7/',
- download_url,
- ],
- include_package_data=True,
- zip_safe=False,
- classifiers=[
- "Development Status :: 5 - Production/Stable",
- "Environment :: Web Environment",
- "Framework :: Django",
- "Intended Audience :: Developers",
- "License :: OSI Approved :: MIT License",
- "Natural Language :: English",
- "Operating System :: OS Independent",
- "Programming Language :: Python",
- "Topic :: Software Development",
- "Topic :: Software Development :: Quality Assurance",
- ]
- )
--
-2.3.2
+2.4.3
diff --git a/FED02-Change-default-paths-to-match-Fedora-policies.patch b/FED02-Change-default-paths-to-match-Fedora-policies.patch
index 9aba085..86a488b 100644
--- a/FED02-Change-default-paths-to-match-Fedora-policies.patch
+++ b/FED02-Change-default-paths-to-match-Fedora-policies.patch
@@ -1,7 +1,7 @@
-From 9d985124980903b4f82d6167457ef48e1eb0c1b4 Mon Sep 17 00:00:00 2001
+From 3fe232a43a3c97ffa3d2f6cb2da8c1f00951767c Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Fri, 9 Jan 2015 08:53:37 -0500
-Subject: [PATCH 2/2] Change default paths to match Fedora policies
+Subject: [PATCH 3/3] Change default paths to match Fedora policies
The cache directory is a FHS requirement.
The default install path is changed to simplify the creation of
@@ -30,5 +30,5 @@ index e7ac73a60886645bf47ed3ee09ad2d69e07cafbc..a3495c8e77a75be25ea9016e4f52540e
-INSTALLED_SITE_PATH = "/var/www"
+INSTALLED_SITE_PATH = "/var/lib/reviewboard/sites"
--
-2.3.2
+2.4.3
diff --git a/ReviewBoard.spec b/ReviewBoard.spec
index 0e63a40..c519127 100644
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@ -3,7 +3,7 @@
%global djblets_version 0.8.16
Name: ReviewBoard
-Version: 2.0.15
+Version: 2.0.16
Release: 1%{?dist}
Summary: Web-based code review tool
Group: Applications/Internet
@@ -13,6 +13,7 @@ Source0: http://downloads.reviewboard.org/releases/%{name}/2.0/%{name}-%{
Source1: reviewboard-sites.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
+
BuildRequires: python-devel
BuildRequires: python-setuptools
BuildRequires: python-djblets >= %{djblets_version}
@@ -33,6 +34,7 @@ BuildRequires: uglify-js
BuildRequires: gettext
BuildRequires: systemd
BuildRequires: python-memcached
+BuildRequires: python-crypto
Requires: python-djblets >= %{djblets_version}
Requires: python-imaging
@@ -52,6 +54,7 @@ Requires: python-mimeparse
Requires: python-django-pipeline >= 1.3.15
Requires: python-docutils
Requires: python-markdown >= 2.3.1
+Requires: python-crypto
# Pull in the client libraries for all of the supported databases
Requires: python-sqlite
@@ -79,6 +82,7 @@ Requires: python-django-haystack
Requires: httpd >= 2.4.7-5
# Upstream patches awaiting the next release
+Patch0001: 0001-Add-pycrypto-to-setup.py.patch
# Fedora-specific patches
@@ -145,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL NEWS README
+%doc AUTHORS COPYING INSTALL NEWS
%{_bindir}/rb-site
%{_bindir}/rbssh
%ghost %config(noreplace) %{_sysconfdir}/reviewboard/sites
@@ -162,6 +166,10 @@ rm -rf $RPM_BUILD_ROOT
%{systemd_postun}
%changelog
+* Fri Jun 12 2015 Stephen Gallagher <sgallagh at redhat.com> 2.0.16-1
+- New upstream release 2.0.16
+- https://www.reviewboard.org/docs/releasenotes/reviewboard/2.0.16/
+
* Wed Mar 18 2015 Stephen Gallagher <sgallagh at redhat.com> 2.0.15-1
- https://www.reviewboard.org/docs/releasenotes/reviewboard/2.0.15/
diff --git a/sources b/sources
index 7482c24..568c8b0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4166c1620ccd74ba89c9393c822b2694 ReviewBoard-2.0.15.tar.gz
+51fe5fa6892389d0bb8d7d8ef33b8533 ReviewBoard-2.0.16.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/ReviewBoard.git/commit/?h=epel7&id=f2485bfd0ca26886c7eb31d6b9d157b460959b22
More information about the scm-commits
mailing list