[python-django14] add conflicts, obsoletes
Matthias Runge
mrunge at fedoraproject.org
Mon Apr 29 11:47:00 UTC 2013
commit dcc9a10d96773c4c041da52b801c9ad21fc38039
Author: Matthias Runge <mrunge at redhat.com>
Date: Mon Apr 29 13:46:37 2013 +0200
add conflicts, obsoletes
python-django14.spec | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/python-django14.spec b/python-django14.spec
index 744309d..8a41ce8 100644
--- a/python-django14.spec
+++ b/python-django14.spec
@@ -7,7 +7,7 @@
Name: python-django14
Version: 1.4.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A high-level Python Web framework
Group: Development/Languages
@@ -28,6 +28,7 @@ BuildArch: noarch
# BuildRequires: python-setuptools
BuildRequires: python2-devel
BuildRequires: python-sphinx
+BuildRequires: python-setuptools
# for testing
BuildRequires: python-simplejson
@@ -39,6 +40,8 @@ Provides: %{pkgname} = %{version}-%{release}
# provide compatibility with python-django
Provides: python-django = %{version}-%{release}
Provides: Django = %{version}-%{release}
+Obsoletes: python-django < 1.4.5-2
+Conflicts: python-django >= 1.5
%description
Django is a high-level Python Web framework that encourages rapid
@@ -93,12 +96,15 @@ cp -p %{SOURCE1} __init__.py
%build
-%{__python} setup.py build
+%{__python} setup.py bdist_egg
%install
rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+#%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
+mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
+easy_install -m --prefix $RPM_BUILD_ROOT%{_usr} dist/*.egg
%find_lang django
%find_lang djangojs
@@ -295,6 +301,9 @@ cd tests
%changelog
+* Wed Apr 29 2013 Matthias Runge <mrunge at redhat.com> - 1-4.5-6
+- add obsoletes, conflicts
+
* Fri Apr 05 2013 Matthias Runge <mrunge at redhat.com> - 1.4.5-5
- provide python-django, Django
More information about the scm-commits
mailing list