| |
@@ -9,6 +9,7 @@
|
| |
%define with_admin 1
|
| |
%define with_client 1
|
| |
%define with_django 1
|
| |
+ %define with_python2_django 1
|
| |
%define with_hub 1
|
| |
%define with_worker 1
|
| |
|
| |
@@ -34,10 +35,15 @@
|
| |
%define python2_rpm python2-rpm
|
| |
%endif
|
| |
|
| |
+ # Django 2.0+ does not support python2
|
| |
+ %if 0%{?fedora} >= 30
|
| |
+ %define with_python2_django 0
|
| |
+ %endif
|
| |
+
|
| |
|
| |
Name: kobo
|
| |
Version: 0.8.0
|
| |
- Release: 1%{?dist}
|
| |
+ Release: 2%{?dist}
|
| |
License: LGPLv2
|
| |
Summary: Python modules for tools development
|
| |
Group: Development/Libraries
|
| |
@@ -64,7 +70,7 @@
|
| |
Kobo is a set of python modules designed for rapid tools development.
|
| |
|
| |
|
| |
- %if 0%{?with_django}
|
| |
+ %if 0%{?with_django} && 0%{with_python2_django}
|
| |
%package -n python2-%{name}-django
|
| |
Summary: Django components
|
| |
Group: Development/Libraries
|
| |
@@ -107,7 +113,7 @@
|
| |
%endif
|
| |
|
| |
|
| |
- %if 0%{?with_hub}
|
| |
+ %if 0%{?with_hub} && 0%{with_python2_django}
|
| |
%package -n python2-%{name}-hub
|
| |
Summary: Xml-rpc and web interface to a task database
|
| |
Group: Development/Libraries
|
| |
@@ -151,6 +157,7 @@
|
| |
Kobo admin provides templates for various kobo-based projects,
|
| |
incl. CLI, hub client, worker and hub.
|
| |
|
| |
+ %if 0%{with_python2_django}
|
| |
%package -n python2-%{name}-admin
|
| |
Summary: Kobo admin script for instant project deployment
|
| |
Group: Development/Tools
|
| |
@@ -161,6 +168,7 @@
|
| |
%description -n python2-%{name}-admin
|
| |
Python library for kobo-admin command.
|
| |
%endif
|
| |
+ %endif
|
| |
|
| |
%if 0%{?with_python3}
|
| |
%package -n python%{python3_pkgversion}-%{name}
|
| |
@@ -305,6 +313,13 @@
|
| |
%endif
|
| |
%endif
|
| |
|
| |
+ %if ! 0%{with_python2_django}
|
| |
+ rm -rf $RPM_BUILD_ROOT/%{python2_sitelib}/kobo/django
|
| |
+ rm -rf $RPM_BUILD_ROOT/%{python2_sitelib}/kobo/admin
|
| |
+ rm -rf $RPM_BUILD_ROOT/%{python2_sitelib}/kobo/hub
|
| |
+ %endif
|
| |
+
|
| |
+
|
| |
|
| |
%files -n python2-%{name}
|
| |
%dir %{python2_sitelib}/kobo
|
| |
@@ -317,7 +332,7 @@
|
| |
%endif
|
| |
|
| |
|
| |
- %if 0%{?with_django}
|
| |
+ %if 0%{?with_django} && 0%{with_python2_django}
|
| |
%files -n python2-%{name}-django
|
| |
%{python2_sitelib}/kobo/django
|
| |
%endif
|
| |
@@ -335,7 +350,7 @@
|
| |
%endif
|
| |
|
| |
|
| |
- %if 0%{?with_hub}
|
| |
+ %if 0%{?with_hub} && 0%{with_python2_django}
|
| |
%files -n python2-%{name}-hub
|
| |
%{python2_sitelib}/kobo/hub
|
| |
%endif
|
| |
@@ -349,9 +364,11 @@
|
| |
%files admin
|
| |
%{_bindir}/kobo-admin
|
| |
|
| |
+ %if 0%{with_python2_django}
|
| |
%files -n python2-%{name}-admin
|
| |
%{python2_sitelib}/kobo/admin
|
| |
%endif
|
| |
+ %endif
|
| |
|
| |
%if 0%{?with_python3}
|
| |
%files -n python%{python3_pkgversion}-%{name}
|
| |
@@ -400,6 +417,9 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Fri Jan 11 2019 Petr Viktorin <pviktori@redhat.com> - 0.8.0-2
|
| |
+ - Remove packages needing python2-django1.11 on Fedora 30+ (RHBZ#1632301)
|
| |
+
|
| |
* Fri Nov 30 2018 Rohan McGovern <rmcgover@redhat.com> - 0.8.0-1
|
| |
- New upstream release 0.8.0
|
| |
|
| |
pviktori
commented 5 years ago
That's
- python2-kobo-django
- python2-kobo-admin
- python2-kobo-hub
https://bugzilla.redhat.com/show_bug.cgi?id=1632301