Author: qboosh                       Date: Tue Sep 13 19:24:52 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- separated python*-Sphinx modules (for other python packages using Sphinx API)
- release 2

---- Files affected:
packages/sphinx-pdg:
   sphinx-pdg.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/sphinx-pdg/sphinx-pdg.spec
diff -u packages/sphinx-pdg/sphinx-pdg.spec:1.18 
packages/sphinx-pdg/sphinx-pdg.spec:1.19
--- packages/sphinx-pdg/sphinx-pdg.spec:1.18    Tue Sep 13 20:46:52 2011
+++ packages/sphinx-pdg/sphinx-pdg.spec Tue Sep 13 21:24:47 2011
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):     Sphinx - narzędzie do tworzenia dokumentacji dla Pythona
 Name:          sphinx-pdg
 Version:       1.0.7
-Release:       1
+Release:       2
 License:       BSD
 Group:         Development/Languages/Python
 Source0:       
http://pypi.python.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz
@@ -17,11 +17,7 @@
 BuildRequires: python-setuptools
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
-Requires:      python-distribute
-Requires:      python-docutils >= 0.5
-Requires:      python-jinja2 >= 2.1
-Requires:      python-pygments >= 0.11.1
-%pyrequires_eq python-modules
+Requires:      python-Sphinx = %{version}-%{release}
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -45,10 +41,7 @@
 Summary:       Sphinx Python documentation generator (Python 3 version)
 Summary(pl.UTF-8):     Sphinx - narzędzie do tworzenia dokumentacji dla 
Pythona (wersja dla Pythona 3)
 Group:         Development/Languages/Python
-Requires:      python3-distribute
-Requires:      python3-docutils >= 0.8
-Requires:      python3-jinja2 >= 2.1
-Requires:      python3-pygments >= 0.11.1
+Requires:      python3-Sphinx = %{version}-%{release}
 
 %description 3
 Sphinx is a tool that makes it easy to create intelligent and
@@ -66,6 +59,51 @@
 dokumentacji Pythona, ale potem zostało wyczyszczone w nadziei, że
 będzie przydatne dla wielu innych projektów.
 
+%package -n python-Sphinx
+Summary:       Sphinx Python documentation generator (Python 2.x modules)
+Summary(pl.UTF-8):     Sphinx - narzędzie do tworzenia dokumentacji dla 
Pythona (moduły Pythona 2.x)
+Group:         Development/Languages/Python
+Requires:      python-distribute
+Requires:      python-docutils >= 0.5
+Requires:      python-jinja2 >= 2.1
+Requires:      python-pygments >= 0.11.1
+%pyrequires_eq python-modules
+Conflicts:     sphinx-pdg < 1.0.7-2
+
+%description -n python-Sphinx
+Sphinx Python documentation generator (Python 2.x modules).
+
+For command-line utilities, see sphinx-pdg package.
+
+%description -n python-Sphinx -l pl.UTF-8
+Sphinx - narzędzie do tworzenia dokumentacji dla Pythona (moduły
+Pythona 2.x).
+
+Narzędzia działające z linii poleceń znajdują się w pakiecie
+sphinx-pdg.
+
+%package -n python3-Sphinx
+Summary:       Sphinx Python documentation generator (Python 3.x modules)
+Summary(pl.UTF-8):     Sphinx - narzędzie do tworzenia dokumentacji dla 
Pythona (moduły Pythona 3.x)
+Group:         Development/Languages/Python
+Requires:      python3-distribute
+Requires:      python3-docutils >= 0.8
+Requires:      python3-jinja2 >= 2.1
+Requires:      python3-pygments >= 0.11.1
+Conflicts:     sphinx-pdg-3 < 1.0.7-2
+
+%description -n python3-Sphinx
+Sphinx Python documentation generator (Python 3.x modules).
+
+For command-line utilities, see sphinx-pdg-3 package.
+
+%description -n python3-Sphinx -l pl.UTF-8
+Sphinx - narzędzie do tworzenia dokumentacji dla Pythona (moduły
+Pythona 3.x).
+
+Narzędzia działające z linii poleceń znajdują się w pakiecie
+sphinx-pdg-3.
+
 %prep
 %setup -q -n Sphinx-%{version}
 mkdir .py3k
@@ -107,8 +145,6 @@
 %attr(755,root,root) %{_bindir}/sphinx-autogen
 %attr(755,root,root) %{_bindir}/sphinx-build
 %attr(755,root,root) %{_bindir}/sphinx-quickstart
-%{py_sitescriptdir}/sphinx
-%{py_sitescriptdir}/Sphinx-%{version}-py*.egg-info
 
 %files 3
 %defattr(644,root,root,755)
@@ -116,6 +152,14 @@
 %attr(755,root,root) %{_bindir}/sphinx-autogen-3
 %attr(755,root,root) %{_bindir}/sphinx-build-3
 %attr(755,root,root) %{_bindir}/sphinx-quickstart-3
+
+%files -n python-Sphinx
+%defattr(644,root,root,755)
+%{py_sitescriptdir}/sphinx
+%{py_sitescriptdir}/Sphinx-%{version}-py*.egg-info
+
+%files -n python3-Sphinx
+%defattr(644,root,root,755)
 %{py3_sitescriptdir}/sphinx
 %{py3_sitescriptdir}/Sphinx-%{version}-py*.egg-info
 
@@ -125,6 +169,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2011/09/13 19:24:47  qboosh
+- separated python*-Sphinx modules (for other python packages using Sphinx API)
+- release 2
+
 Revision 1.18  2011/09/13 18:46:52  qboosh
 - pl
 - changed prep not to mess outside builddir
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sphinx-pdg/sphinx-pdg.spec?r1=1.18&r2=1.19&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to