From 013ddf2a3358557856d5d14efbe56bdf23917c1c Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge@redhat.com>
Date: Wed, 26 Aug 2015 09:29:41 +0200
Subject: [PATCH] update to 1.5

---
 .gitignore                    |  1 +
 python-django-compressor.spec | 36 ++++++-----------------------------
 sources                       |  2 +-
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index de0294c..a45a086 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /django_compressor-1.2.tar.gz
 /django_compressor-1.3.tar.gz
 /django_compressor-1.4.tar.gz
+/django_compressor-1.5.tar.gz
diff --git a/python-django-compressor.spec b/python-django-compressor.spec
index d975aca..7ca8579 100644
--- a/python-django-compressor.spec
+++ b/python-django-compressor.spec
@@ -1,26 +1,14 @@
 %global pypi_name django_compressor
 
 Name:           python-django-compressor
-Version:        1.4
-Release:        4%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        Compresses linked and inline JavaScript or CSS into single cached files
 
 License:        MIT
 URL:            http://pypi.python.org/pypi/django_compressor/%{version}
 Source0:        http://pypi.python.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 
-# All patches are directly connected to Django-1.8
-#
-# cherry-pick from upstream
-# https://github.com/django-compressor/django-compressor/commit/c8495264b503a595fbc89e6c8a83a402eff445c6.patch
-Patch0001: django-compressor-use-get_template.patch
-# cherry-pick from upstream
-# https://github.com/django-compressor/django-compressor/commit/ac70fbfb7f8349e5c1150f40bf1d21ba635d0cb8.patch
-Patch0002:      django-compressor-fix-attributeerror-in-offline.patch
-# cherry-pick from upstream
-# https://github.com/django-compressor/django-compressor/commit/72b33ddbcdc41eb5af42b86329d81d96894a9d10.patch
-Patch0003:      django-compressor-make-compress-run-through.patch
-
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
@@ -38,7 +26,7 @@ Requires:   python-django
 %description
 Django Compressor combines and compresses linked and inline Javascript
 or CSS in a Django templates into cacheable static files by using the
-``compress`` template tag.  HTML in between 
+``compress`` template tag.  HTML in between
 ``{% compress js/css %}`` and ``{% endcompress %}`` is
 parsed and searched for CSS or JS. These styles and scripts are subsequently
 processed with optional, configurable compilers and filters.
@@ -46,21 +34,6 @@ processed with optional, configurable compilers and filters.
 
 %prep
 %setup -q -n %{pypi_name}-%{version}
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
-
-# remove /usr/bin/env from scripts
-#for i in compressor/tests/precompiler.py \
-         #compressor/filters/cssmin/cssmin.py \
-         #compressor/filters/jsmin/rjsmin.py; 
-  #do sed -i -e "1d" $i;
-#done
-
-
 
 %build
 %{__python} setup.py build
@@ -76,6 +49,9 @@ rm -rf %{pypi_name}.egg-info
 %{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 
 %changelog
+* Wed Aug 26 2015 Matthias Runge <mrunge@redhat.com> - 1.5-1
+- update to 1.5
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index dbef1f5..f00ce15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc050f1a85f83f927f94bcb09e8bdd0f  django_compressor-1.4.tar.gz
+274dd82a45ddd13e111852dd101a5924  django_compressor-1.5.tar.gz