[python-sphinx10/el6/master] Build fix for EL-6: Use el5 build settings
Michel Alexandre Salim
salimma at fedoraproject.org
Sun Mar 13 14:31:23 UTC 2011
commit 4c86c278ecaff071da1b84ba0ab56f32ec310f89
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Sun Mar 13 15:31:14 2011 +0100
Build fix for EL-6: Use el5 build settings
python-sphinx10.spec | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/python-sphinx10.spec b/python-sphinx10.spec
index 70440ae..49b4807 100644
--- a/python-sphinx10.spec
+++ b/python-sphinx10.spec
@@ -6,7 +6,7 @@
Name: python-sphinx10
Version: 1.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Python documentation generator
Group: Development/Tools
@@ -22,7 +22,7 @@ Source1: README.Fedora
Patch0: Sphinx-1.0.4-localedirs.patch
BuildArch: noarch
-%if 0%{?el5}
+%if 0%{?rhel}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%endif
@@ -98,7 +98,7 @@ sed '1d' -i sphinx/pycode/pgen2/token.py
%{__python} setup.py bdist_egg
pushd doc
make html
-%if ! 0%{?el5}
+%if ! 0%{?rhel}
make man
%endif
rm -rf _build/html/.buildinfo
@@ -109,7 +109,7 @@ popd
%install
rm -rf %{buildroot}
-%if 0%{?el5}
+%if 0%{?rhel}
# older versions of easy_install can't recreate path
mkdir -p %{buildroot}%{python_sitelib}
%endif
@@ -127,7 +127,7 @@ for b in sphinx-*; do
done
popd
-%if ! 0%{?el5}
+%if ! 0%{?rhel}
pushd doc/_build/man
# Deliver man pages
install -d %{buildroot}%{_mandir}/man1
@@ -166,7 +166,7 @@ popd
>> sphinx-1.0.lang
-%if 0%{?el5}
+%if 0%{?rhel}
%clean
rm -rf %{buildroot}
%endif
@@ -184,7 +184,7 @@ make test
%dir %{_datadir}/sphinx-1.0/
%dir %{_datadir}/sphinx-1.0/locale
%dir %{_datadir}/sphinx-1.0/locale/*
-%if ! 0%{?el5}
+%if ! 0%{?rhel}
%{_mandir}/man1/*
%endif
@@ -194,6 +194,9 @@ make test
%changelog
+* Sun Mar 13 2011 Michel Salim <salimma at fedoraproject.org> - 1.0.4-4
+- Build fix for EL-6: Use el5 build settings
+
* Tue Nov 2 2010 Michel Salim <salimma at fedoraproject.org> - 1.0.4-3
- EL-5: not generating manpages
- EL-5: re-add %%{buildroot} and %%clean
More information about the scm-commits
mailing list