[ReviewBoard] Update to ReviewBoard 2.0rc3
Stephen Gallagher
sgallagh at fedoraproject.org
Fri May 9 17:19:38 UTC 2014
commit 3c3b005e7368fcaa7291874b587271c1f0581b8f
Author: Stephen Gallagher <sgallagh at redhat.com>
Date: Fri Feb 28 16:16:47 2014 -0500
Update to ReviewBoard 2.0rc3
- http://www.reviewboard.org/docs/releasenotes/reviewboard/2.0-rc-3/
- Update to 2.0rc2
- http://www.reviewboard.org/docs/releasenotes/reviewboard/2.0-rc-2/
- Update to 2.0rc1
- http://www.reviewboard.org/docs/releasenotes/reviewboard/2.0-rc-1/
- Update runtime requires for paramiko and pygments
- Add BuildRequires on systemd for the RPM macro
- Fix dependency version requirements
- Add gettext to build requirements
- Add Whoosh to build requirements to be safe
- New upstream major release beta
- Add new systemd snippet to replace %post script
- http://www.reviewboard.org/docs/releasenotes/reviewboard/2.0-beta-3/
.gitignore | 6 ++-
FED03-Change-default-cache-file-path.patch | 6 +-
FED04-Soften-requires.txt.patch | 45 ++++++++++--------
ReviewBoard.spec | 66 ++++++++++++++++++---------
sources | 2 +-
5 files changed, 78 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9adc8f5..175a0a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
-ReviewBoard-1.5rc1.tar.gz
+*.src.rpm
+clog
+.build*
+/ReviewBoard-1.5rc1.tar.gz
/ReviewBoard-1.5rc2.tar.gz
/ReviewBoard-1.5.tar.gz
/ReviewBoard-1.5.1.tar.gz
@@ -50,3 +53,4 @@ ReviewBoard-1.5rc1.tar.gz
/ReviewBoard-1.7.23.tar.gz
/ReviewBoard-1.7.24.tar.gz
/ReviewBoard-1.7.25.tar.gz
+/ReviewBoard-2.0rc3.tar.gz
diff --git a/FED03-Change-default-cache-file-path.patch b/FED03-Change-default-cache-file-path.patch
index c86c6c8..f303075 100644
--- a/FED03-Change-default-cache-file-path.patch
+++ b/FED03-Change-default-cache-file-path.patch
@@ -1,4 +1,4 @@
-From d8b7243f24771b296b87cd838d5218e45b841f72 Mon Sep 17 00:00:00 2001
+From 5224194b5c5e5fada6a6ea161c91d80f30b58bf5 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Fri, 17 Jun 2011 15:50:05 -0400
Subject: [PATCH 2/2] Change default cache file path
@@ -9,10 +9,10 @@ FHS requirement
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/reviewboard/cmdline/rbsite.py b/reviewboard/cmdline/rbsite.py
-index 957eadb8ad6bd5ceebb962760406ae3279da3553..5b148d08e430b9475197c858153b7f79aacbd575 100755
+index c2ed25253845010790dde2a9a931541677ab5aab..0d15bfdabc17ea8d78d18bc2f04fb1a3a4850099 100755
--- a/reviewboard/cmdline/rbsite.py
+++ b/reviewboard/cmdline/rbsite.py
-@@ -1719,7 +1719,7 @@ class InstallCommand(Command):
+@@ -1382,7 +1382,7 @@ class InstallCommand(Command):
is_visible_func=lambda: site.cache_type == "file")
ui.prompt_input(page, "Cache Directory",
diff --git a/FED04-Soften-requires.txt.patch b/FED04-Soften-requires.txt.patch
index c436340..0707e3d 100644
--- a/FED04-Soften-requires.txt.patch
+++ b/FED04-Soften-requires.txt.patch
@@ -1,33 +1,38 @@
-From f5fbdfa77b5ba6d1e2875d26ca05c86c80d3cb01 Mon Sep 17 00:00:00 2001
+From 369fca81ae376af4a725bf1dbce6adb1518e6c35 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
-Date: Fri, 21 Feb 2014 16:10:31 -0500
-Subject: [PATCH 1/3] FEDORA: Soften requires.txt
+Date: Fri, 28 Feb 2014 16:20:03 -0500
+Subject: [PATCH] Soften dependencies
-We don't need hard requirements on the Django version or dateutil
-because RPM handles these gracefully.
---
- setup.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ reviewboard/__init__.py | 2 +-
+ setup.py | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+diff --git a/reviewboard/__init__.py b/reviewboard/__init__.py
+index d269a1de027598367b0aeb45f478d2a05e5d8d60..b2ed67e89c7633cb7691a594238a33af1ca1195a 100644
+--- a/reviewboard/__init__.py
++++ b/reviewboard/__init__.py
+@@ -10,7 +10,7 @@ from __future__ import unicode_literals
+ VERSION = (2, 0, 0, 0, 'rc', 3, True)
+
+ # Required version of Django
+-django_version = 'Django>=1.6.4,<1.7',
++django_version = 'Django>=1.6,<1.7',
+
+ def get_version_string():
+ version = '%s.%s' % (VERSION[0], VERSION[1])
diff --git a/setup.py b/setup.py
-index 121e42976619231d92432962590f4910bbfb6c5d..35c50920d90a49ac3050460738f416101825895e 100755
+index da75c44c436419873aa65a5f300f9abb398a2d3e..4150d8322548c4e316c0d8a4c2704de84dcd4d77 100755
--- a/setup.py
+++ b/setup.py
-@@ -171,16 +171,16 @@ setup(name=PACKAGE_NAME,
- },
- cmdclass=cmdclasses,
- install_requires=[
-- 'Django>=1.4.11,<1.5',
-+ 'Django>=1.4,<1.5',
- 'django_evolution>=0.6.9,<0.7',
- 'Djblets>=0.7.29,<0.8',
- 'django-pipeline>=1.2.24,<1.3',
+@@ -198,10 +198,10 @@ setup(name=PACKAGE_NAME,
+ 'django-haystack',
'docutils',
- markdown_requirement,
+ 'markdown>=2.3.1',
- 'mimeparse>=0.1.3',
+ 'python_mimeparse>=0.1.3',
- 'paramiko>=1.9.0',
- 'Pygments>=1.5',
+ 'paramiko>=1.12',
+ 'Pygments>=1.6',
- 'python-dateutil==1.5',
+ 'python-dateutil<2.0',
'python-memcached',
diff --git a/ReviewBoard.spec b/ReviewBoard.spec
index 65476ea..d14d410 100644
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@ -1,35 +1,36 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%global djblets_version 0.7.29
+%global djblets_version 0.8-6
Name: ReviewBoard
-Version: 1.7.25
-Release: 1%{?dist}
+Version: 2.0
+Release: 11%{?dist}.rc3
Summary: Web-based code review tool
Group: Applications/Internet
License: MIT
URL: http://www.review-board.org
-Source0: http://downloads.reviewboard.org/releases/%{name}/1.7/%{name}-%{version}.tar.gz
+Source0: http://downloads.reviewboard.org/releases/%{name}/2.0/%{name}-%{version}rc3.tar.gz
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}
-BuildRequires: python-django-pipeline >= 1.2.24
+BuildRequires: python-django-pipeline >= 1.3.15
BuildRequires: python-mimeparse
BuildRequires: python-sphinx
BuildRequires: python-recaptcha-client
BuildRequires: pysvn
-BuildRequires: python-pygments >= 1.4
+BuildRequires: python-pygments >= 1.6
BuildRequires: python-nose
BuildRequires: pytz
-BuildRequires: python-paramiko >= 1.7.6
+BuildRequires: python-paramiko >= 1.12
BuildRequires: python-dateutil
BuildRequires: python-mimeparse
BuildRequires: python-markdown >= 2.2.1
BuildRequires: python-docutils
BuildRequires: uglify-js
+BuildRequires: gettext
BuildRequires: systemd
Requires: python-djblets >= %{djblets_version}
@@ -41,16 +42,15 @@ Requires: pysvn
Requires: python-flup
Requires: python-nose
Requires: pytz
-Requires: python-pygments >= 1.4
+Requires: python-pygments >= 1.6
Requires: python-recaptcha-client
-Requires: python-paramiko
+Requires: python-paramiko >= 1.12
Requires: python-memcached
Requires: python-dateutil
Requires: python-mimeparse
-Requires: python-django-pipeline >= 1.2.24
-Conflicts: python-django-pipeline >= 1.3.0
+Requires: python-django-pipeline >= 1.3.15
Requires: python-docutils
-Requires: python-markdown >= 2.2.1
+Requires: python-markdown >= 2.3.1
# Pull in the client libraries for all of the supported databases
Requires: python-sqlite
@@ -64,17 +64,20 @@ Requires: mercurial
# Distro-release-specific
# Change this for each branch
-BuildRequires: python-django14
-Requires: python-django14
-BuildRequires: python-django-evolution >= 0.6.9
-Requires: python-django-evolution >= 0.6.9
+BuildRequires: python-django >= 1.6
+Requires: python-django >= 1.6
+BuildRequires: python-django-evolution >= 0.7
+Requires: python-django-evolution >= 0.7
+BuildRequires: python-whoosh
+Requires: python-whoosh
+BuildRequires: python-django-haystack
+Requires: python-django-haystack
# Requires httpd 2.4.7-3 or later in order to support systemd snippets
# Note: this differs on F20 and F21
-Requires: httpd >= 2.4.7-3
+Requires: httpd >= 2.4.7-5
# Upstream patches awaiting the next release
-Patch0001: 0001-Support-building-with-parallel-installed-Django.patch
# Fedora-specific patches
@@ -92,10 +95,9 @@ projects to large companies and offers a variety of tools to take much
of the stress and time out of the code review process.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}rc3
# Upstream patches
-%patch0001 -p1
# Fedora patches
%patch1003 -p1
@@ -126,7 +128,7 @@ rm -Rf $RPM_BUILD_ROOT/%{python_sitelib}/reviewboard/diffviewer/testdata \
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/reviewboard/
touch $RPM_BUILD_ROOT/%{_sysconfdir}/reviewboard/sites
-# Create the systemd snippet directory
+# Create directory for systemd snippet
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}/httpd.service.d/
cp %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/httpd.service.d/
@@ -142,15 +144,35 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING INSTALL NEWS README
%{_bindir}/rb-site
%{_bindir}/rbssh
+%{_unitdir}/httpd.service.d/reviewboard-sites.conf
%ghost %config(noreplace) %{_sysconfdir}/reviewboard/sites
%attr(755,root,root) %dir %{_unitdir}/httpd.service.d
%config(noreplace) %{_unitdir}/httpd.service.d/reviewboard-sites.conf
%{python_sitelib}/reviewboard/
%{python_sitelib}/ReviewBoard*.egg-info/
-%{python_sitelib}/webtests/*.py*
+
+%postun
+# Update the systemd unit files
+%{systemd_postun}
%changelog
+* Fri May 09 2014 Stephen Gallagher <sgallagh at redhat.com> 2.0-11.rc3
+- Update to ReviewBoard 2.0rc3
+- http://www.reviewboard.org/docs/releasenotes/reviewboard/2.0-rc-3/
+- Update to 2.0rc2
+- http://www.reviewboard.org/docs/releasenotes/reviewboard/2.0-rc-2/
+- Update to 2.0rc1
+- http://www.reviewboard.org/docs/releasenotes/reviewboard/2.0-rc-1/
+- Update runtime requires for paramiko and pygments
+- Add BuildRequires on systemd for the RPM macro
+- Fix dependency version requirements
+- Add gettext to build requirements
+- Add Whoosh to build requirements to be safe
+- New upstream major release beta
+- Add new systemd snippet to replace %%post script
+- http://www.reviewboard.org/docs/releasenotes/reviewboard/2.0-beta-3/
+
* Thu Apr 24 2014 Stephen Gallagher <sgallagh at redhat.com> 1.7.25-1
- New upstream security release 1.7.25
- http://www.reviewboard.org/docs/releasenotes/reviewboard/1.7.25
diff --git a/sources b/sources
index dc9ea25..58dbe37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ca4b32c9995dba12b8a31f43ddbd081 ReviewBoard-1.7.25.tar.gz
+7a4282ce472de1d8caafdcb93416afd2 ReviewBoard-2.0rc3.tar.gz
More information about the scm-commits
mailing list