[openslides] change rpm requirements (pil, pillow, python-imaging)

Matthias Runge mrunge at fedoraproject.org
Mon Jul 8 06:40:39 UTC 2013


commit eaaa43ab0861332cd715e322e493bafd0e96ea8b
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Jul 8 08:39:31 2013 +0200

    change rpm requirements (pil, pillow, python-imaging)

 .gitignore      |    1 +
 openslides.spec |   15 +++++++++++----
 sources         |    2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 47e1cf6..3167dc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /openslides-1.3.tar.gz
+/openslides-1.3.1.tar.gz
diff --git a/openslides.spec b/openslides.spec
index 1a0378c..d09ec01 100644
--- a/openslides.spec
+++ b/openslides.spec
@@ -2,8 +2,8 @@
 %global pypi_name openslides
 
 Name:           %{pypi_name}
-Version:        1.3
-Release:        4%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Presentation and assembly system
 
 License:        GPLv2+
@@ -15,10 +15,10 @@ BuildRequires:  python2-devel
 BuildRequires:  python-versiontools >= 1.6
 BuildRequires:  python-setuptools
  
-Requires:       python-django >= 1.4
+Requires:       python-django < 1.5
 Requires:       python-django-mptt
 Requires:       python-reportlab
-Requires:       python-imaging
+Requires:       python-pillow
 
 %description
 OpenSlides is a free web-based presentation and assembly system for
@@ -49,6 +49,9 @@ chmod 644 openslides/projector/static/javascript/jquery-ui-1.8.18.custom.min.js
 sed -i 's/\r//' README.txt
 sed -i 's/\r//' LICENSE
 
+# use pillow instead of PIL:
+sed -i "s/'pil',/'pillow',/" setup.py
+
 
 %build
 %{__python} setup.py build
@@ -83,6 +86,10 @@ cat djangojs.lang >> django.lang
 %{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 
 %changelog
+* Mon Jul 08 2013 Matthias Runge <mrunge at redhat.com> - 1.3.1-1
+- update to 1.3.1
+- fix up pil/pillow/PILLOW issues (rhbz#981854)
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 18c0194..a920df0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df780583d543cfd731a23e8da2de9a10  openslides-1.3.tar.gz
+b49f1db03b79265723f0fff98c700359  openslides-1.3.1.tar.gz


More information about the scm-commits mailing list