Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
https://bugzilla.redhat.com/show_bug.cgi?id=737293
--- Comment #26 from Matthias Runge <mrunge(a)matthias-runge.de> 2012-03-19 08:55:18
EDT ---
OK, I changed language handling according to #c25 and skipped changing dir in
%check.
Anything else?
SPEC:
http://www.matthias-runge.de/fedora/python-django.spec
SRPM:
http://www.matthias-runge.de/fedora/python-django-1.3.1-9.fc16.src.rpm
[mrunge@mrungexp SPECS]$ diff -u python-django.spec-8 python-django.spec
--- python-django.spec-8 2012-03-18 13:43:56.000000000 +0100
+++ python-django.spec 2012-03-19 13:41:36.892469820 +0100
@@ -8,7 +8,7 @@
Name: python-django
Version: 1.3.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A high-level Python Web framework
Group: Development/Languages
@@ -74,6 +74,8 @@
%patch0 -p1 -b .sphinx-table_row_index
%patch1 -p1 -b .sphinx-param_separator
%patch2 -p1 -b .test-week_view_allow_future
+
+# patch tests to skip tests requiring internet connection
%patch3
# empty files
@@ -97,15 +99,10 @@
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
-# Handling locale files
-# This is adapted from the %%find_lang macro, which cannot be directly
-# used since Django locale files are not located in %%{_datadir}
-#
-# The rest of the packaging guideline still apply -- do not list
-# locale files by hand!
-(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e
's|^.||' |
%{__sed} -e \
- 's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
- >> %{name}.lang
+%find_lang django
+%find_lang djangojs
+# append djangojs.lang to django.lang
+cat djangojs.lang >> django.lang
# If it's rhel5+ or any Fedora over 12 build docs
%if 0%{?rhel} > 4 || 0%{?fedora} >= 12
@@ -136,9 +133,7 @@
$RPM_BUILD_ROOT%{python_sitelib}/django/bin/profiling/gather_profile_stats.py*
# test section
-# uncomment, if tests succeed
%check
-cd %{_builddir}/%{pkgname}-%{version}
export PYTHONPATH=$(pwd)
export LANG=en_US.utf8
cd tests
@@ -148,7 +143,7 @@
rm -rf $RPM_BUILD_ROOT
-%files -f %{name}.lang
+%files -f django.lang
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README
%{_bindir}/django-admin
@@ -158,7 +153,7 @@
%attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py*
%dir %{_sysconfdir}/bash_completion.d/
%config(noreplace) %{_sysconfdir}/bash_completion.d/django_bash_completion
-%{python_sitelib}/django/bin/profiling/*
+%{python_sitelib}/django/bin/profiling/
%{python_sitelib}/django/bin/__init__.py*
# Include everything but the locale data ...
%dir %{python_sitelib}/django/
@@ -250,6 +245,9 @@
%changelog
+* Mon Mar 19 2012 Matthias Runge <mrunge(a)matthias-runge.de> - 1.3.1-9
+- spec cleanup
+
* Sat Mar 17 2012 Matthias Runge <mrunge(a)matthias-runge.de> - 1.3.1-8
- patch tests to work on koji (no internet connection)
--
Configure bugmail:
https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.