From 50327b067943fb40f90a6e42546e76151f99d6f2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 5 Jun 2008 16:19:14 +0000 Subject: [PATCH 1/7] Initialize branch F-8 for python-sphinx --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 1f61c2034cf3e5f1658d09e34b58efae81665880 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 5 Jun 2008 19:21:24 +0000 Subject: [PATCH 2/7] python-sphinx-0.3 --- .cvsignore | 1 + python-sphinx.spec | 119 +++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 121 insertions(+) create mode 100644 python-sphinx.spec diff --git a/.cvsignore b/.cvsignore index e69de29..a501e9d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +Sphinx-0.3.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec new file mode 100644 index 0000000..e05cd66 --- /dev/null +++ b/python-sphinx.spec @@ -0,0 +1,119 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} + +%define upstream_name Sphinx + +Name: python-sphinx +Version: 0.3 +Release: 1%{?dist} +Summary: Python documentation generator + +Group: Development/Tools +License: BSD +URL: http://sphinx.pocoo.org/ +Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: python-devel python-docutils python-jinja python-setuptools +Requires: python-docutils python-jinja python-pygments + + +%description +Sphinx is a tool that makes it easy to create intelligent and +beautiful documentation for Python projects (or other documents +consisting of multiple reStructuredText sources), written by Georg +Brandl. It was originally created to translate the new Python +documentation, but has now been cleaned up in the hope that it will be +useful to many other projects. + +Sphinx uses reStructuredText as its markup language, and many of its +strengths come from the power and straightforwardness of +reStructuredText and its parsing and translating suite, the Docutils. + +Although it is still under constant development, the following +features are already present, work fine and can be seen "in action" in +the Python docs: + + * Output formats: HTML (including Windows HTML Help) and LaTeX, + for printable PDF versions + * Extensive cross-references: semantic markup and automatic links + for functions, classes, glossary terms and similar pieces of + information + * Hierarchical structure: easy definition of a document tree, with + automatic links to siblings, parents and children + * Automatic indices: general index as well as a module index + * Code handling: automatic highlighting using the Pygments highlighter + * Various extensions are available, e.g. for automatic testing of + snippets and inclusion of appropriately formatted docstrings. + + +%package doc +Summary: Documentation for ${name} +Group: Documentation +License: BSD +Requires: %{name} = %{version}-%{release} + + +%description doc +Sphinx is a tool that makes it easy to create intelligent and +beautiful documentation for Python projects (or other documents +consisting of multiple reStructuredText sources), written by Georg +Brandl. It was originally created to translate the new Python +documentation, but has now been cleaned up in the hope that it will be +useful to many other projects. + +This package contains documentation in rST and HTML formats + + +%prep +%setup -q -n %{upstream_name}-%{version} + + +%build +%{__python} setup.py build +cd doc +make html +mv _build/html .. +rm -rf _* + + +%install +rm -rf $RPM_BUILD_ROOT +# Fix EOL delimiters +sed -i 's|\r||g' LICENSE +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc AUTHORS CHANGES LICENSE README TODO +%{_bindir}/sphinx-* +%{python_sitelib}/sphinx +%if 0%{?fedora} >= 9 +%{python_sitelib}/*.egg-info +%endif + +%files doc +%defattr(-,root,root,-) +%doc doc html + + +%changelog +* Mon May 26 2008 Michel Salim - 0.3-1 +- Update to 0.3 + +* Fri May 2 2008 Michel Salim - 0.1.61950-3 +- Split documentation into subpackage +- Exclude C files (not built by default anyway) + +* Wed Apr 16 2008 José Matos - 0.1.61950-2 +- Build html documentation, include it and include the rst + documentation. + +* Thu Mar 27 2008 Michel Salim 0.1.61950-1 +- Initial package diff --git a/sources b/sources index e69de29..4325461 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +98550d222aec91a029c0921819c4c49f Sphinx-0.3.tar.gz From 12c3de4bd66f3c8904181ae0aee8bae1c0c37f40 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 6 Jun 2008 17:22:41 +0000 Subject: [PATCH 3/7] Package egginfo on F-8 too --- python-sphinx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index e05cd66..b1c479b 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -94,7 +94,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS CHANGES LICENSE README TODO %{_bindir}/sphinx-* %{python_sitelib}/sphinx -%if 0%{?fedora} >= 9 +%if 0%{?fedora} >= 8 %{python_sitelib}/*.egg-info %endif From 9a654e53b0e0b68339ca04bf4bd0fda021ab860a Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 26 Aug 2008 02:02:58 +0000 Subject: [PATCH 4/7] - Update to 0.4.2 --- .cvsignore | 2 +- python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index a501e9d..e6666b5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Sphinx-0.3.tar.gz +Sphinx-0.4.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index b1c479b..242e9f2 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -4,7 +4,7 @@ %define upstream_name Sphinx Name: python-sphinx -Version: 0.3 +Version: 0.4.2 Release: 1%{?dist} Summary: Python documentation generator @@ -49,7 +49,7 @@ the Python docs: %package doc -Summary: Documentation for ${name} +Summary: Documentation for %{name} Group: Documentation License: BSD Requires: %{name} = %{version}-%{release} @@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 25 2008 Michel Salim - 0.4.2-1 +- Update to 0.4.2 + * Mon May 26 2008 Michel Salim - 0.3-1 - Update to 0.3 diff --git a/sources b/sources index 4325461..2b6a469 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98550d222aec91a029c0921819c4c49f Sphinx-0.3.tar.gz +5fb591961e1d834f726b3e5d29bec924 Sphinx-0.4.2.tar.gz From 748a1adb3e7a1737d8b85eff39a0d858b085e216 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 10 Oct 2008 13:34:29 +0000 Subject: [PATCH 5/7] - Update to 0.4.3 --- .cvsignore | 2 +- python-sphinx.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index e6666b5..dcc065b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Sphinx-0.4.2.tar.gz +Sphinx-0.4.3.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 242e9f2..bf58db7 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -4,7 +4,7 @@ %define upstream_name Sphinx Name: python-sphinx -Version: 0.4.2 +Version: 0.4.3 Release: 1%{?dist} Summary: Python documentation generator @@ -94,9 +94,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS CHANGES LICENSE README TODO %{_bindir}/sphinx-* %{python_sitelib}/sphinx -%if 0%{?fedora} >= 8 %{python_sitelib}/*.egg-info -%endif %files doc %defattr(-,root,root,-) @@ -104,6 +102,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 10 2008 Michel Salim - 0.4.3-1 +- Update to 0.4.3 + +* Wed Aug 27 2008 Toshio Kuratomi - 0.4.2-1.1 +- Fix for EL-5 build. + * Mon Aug 25 2008 Michel Salim - 0.4.2-1 - Update to 0.4.2 diff --git a/sources b/sources index 2b6a469..4507bc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5fb591961e1d834f726b3e5d29bec924 Sphinx-0.4.2.tar.gz +b3c17f1b5be0b76c373a2474488f1662 Sphinx-0.4.3.tar.gz From 9336d339ac4a2f0fa2eee0d07d21673b7ec1f945 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:55:27 +0000 Subject: [PATCH 6/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b609317..be369c3 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := python-sphinx SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 17c8e9fdc834f25cbb8fe6216f186e75d02f54ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:43:39 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index be369c3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: python-sphinx -# $Id$ -NAME := python-sphinx -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8