#2 Update conditionals
Merged 6 years ago by tdawson. Opened 6 years ago by tdawson.
rpms/ tdawson/python-django update-conditionals  into  master

file modified
+8 -5
@@ -1,4 +1,4 @@ 

- %if 0%{?fedora} > 12

+ %if 0%{?fedora} || 0%{?rhel} > 7

  %global with_python3 1

  %else

  %global with_python3 0
@@ -22,7 +22,7 @@ 

  Name:           python-django

  

  Version:        1.11.9

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        A high-level Python Web framework

  

  Group:          Development/Languages
@@ -57,7 +57,7 @@ 

  BuildRequires:  python-pillow

  BuildRequires:  PyYAML

  BuildRequires:  pytz

- %if 0%{?fedora} > 0

+ %if 0%{?fedora} || 0%{?rhel} > 7

  BuildRequires:  python-selenium

  %endif

  BuildRequires:  python-sqlparse
@@ -179,7 +179,7 @@ 

  

  %py2_install

  

- %if 0%{?fedora} > 0

+ %if 0%{?fedora} || 0%{?rhel} > 7

  # Manually invoke the python byte compile macro for each path that needs byte

  # compilation.

  %py_byte_compile %{__python2} %{buildroot}%{python2_sitelib}
@@ -230,7 +230,7 @@ 

  find $RPM_BUILD_ROOT -name "*.po" | xargs rm -f

  

  %check

- %if 0%{?fedora} > 0

+ %if 0%{?fedora} || 0%{?rhel} > 7

  cd %{_builddir}/%{pkgname}-%{version}

  export PYTHONPATH=$(pwd)

  export LANG=en_US.utf8
@@ -578,6 +578,9 @@ 

  

  

  %changelog

+ * Tue Jan 16 2018 Troy Dawson <tdawson@redhat.com> - 1.11.9-2

+ - Update conditionals

+ 

  * Thu Jan 04 2018 Miro Hrončok <mhroncok@redhat.com> - 1.11.9-1

  - update to 1.11.9

  

no initial comment

The changes look good. Thanks for taking care of those updates.

Pull-Request has been merged by tdawson

6 years ago

This will all go out in the planned update to Django 2 anyway.

Also note that I find it rather disrespectful if you merge a PR almost immediately without any input form the package admins :(