diff --git a/pyramid-1.1a4.tar.gz b/pyramid-1.1a4.tar.gz deleted file mode 100644 index 3c9744e..0000000 --- a/pyramid-1.1a4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7481783cdf96fd8bb0f3e00c2223ef1412f5d1c26373cd91e1084d7d72dab5d3 -size 1889069 diff --git a/pyramid-1.3a6.tar.gz b/pyramid-1.3a6.tar.gz new file mode 100644 index 0000000..33d1d39 --- /dev/null +++ b/pyramid-1.3a6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:605f351406a7866e3e24bb02c310c4269dda2e32774b5e59edac62ef73c3d64d +size 2325101 diff --git a/pyramid-dont-load-external-sphinx-theme.patch b/pyramid-dont-load-external-sphinx-theme.patch new file mode 100644 index 0000000..10838b4 --- /dev/null +++ b/pyramid-dont-load-external-sphinx-theme.patch @@ -0,0 +1,48 @@ +diff -ru a/docs/conf.py b/docs/conf.py +--- a/docs/conf.py 2012-01-20 16:52:28.000000000 +0100 ++++ b/docs/conf.py 2012-02-01 10:40:34.727766925 +0100 +@@ -127,43 +127,6 @@ + # Options for HTML output + # ----------------------- + +-# Add and use Pylons theme +-if 'sphinx-build' in ' '.join(sys.argv): # protect against dumb importers +- from subprocess import call, Popen, PIPE +- +- p = Popen('which git', shell=True, stdout=PIPE) +- git = p.stdout.read().strip() +- cwd = os.getcwd() +- _themes = os.path.join(cwd, '_themes') +- +- if not os.path.isdir(_themes): +- call([git, 'clone', 'git://github.com/Pylons/pylons_sphinx_theme.git', +- '_themes']) +- else: +- os.chdir(_themes) +- call([git, 'checkout', 'master']) +- call([git, 'pull']) +- os.chdir(cwd) +- +- sys.path.append(os.path.abspath('_themes')) +- +- parent = os.path.dirname(os.path.dirname(__file__)) +- sys.path.append(os.path.abspath(parent)) +- wd = os.getcwd() +- os.chdir(parent) +- os.system('%s setup.py test -q' % sys.executable) +- os.chdir(wd) +- +- for item in os.listdir(parent): +- if item.endswith('.egg'): +- sys.path.append(os.path.join(parent, item)) +- +-html_theme_path = ['_themes'] +-html_theme = 'pyramid' +-html_theme_options = dict( +- github_url='https://github.com/Pylons/pyramid', +-# in_progress='true' +- ) + # The style sheet to use for HTML and HTML Help pages. A file of that name + # must exist either in Sphinx' static/ path, or in one of the custom paths + # given in html_static_path. +Only in b/docs: .conf.py.swp diff --git a/python-pyramid.changes b/python-pyramid.changes index c9364f0..78e95c7 100644 --- a/python-pyramid.changes +++ b/python-pyramid.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 1 10:09:28 UTC 2012 - saschpe@suse.de + +- Update to 1.3a6 +- Set license to SDPX style +- Simplified macro usage + ------------------------------------------------------------------- Sat Jul 9 13:06:38 UTC 2011 - saschpe@gmx.de diff --git a/python-pyramid.spec b/python-pyramid.spec index d52f7ce..6458542 100644 --- a/python-pyramid.spec +++ b/python-pyramid.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyramid # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,24 +16,25 @@ # Name: python-pyramid -Version: 1.1a4 +Version: 1.3a6 Release: 0 Url: http://pylonsproject.org Summary: The Pyramid web application development framework, a Pylons project -License: BSD-derived (http://www.repoze.org/LICENSE.txt) +License: BSD-4-Clause ; ZPL-2.1 ; MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/p/pyramid/pyramid-%{version}.tar.gz +Patch0: pyramid-dont-load-external-sphinx-theme.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: fdupes BuildRequires: python-devel -BuildRequires: python-setuptools -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 +BuildRequires: python-distribute +#BuildRequires: python-Sphinx +#BuildRequires: python-repoze.sphinx.autointerface +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %description Pyramid is a small, fast, down-to-earth, open source Python web application @@ -47,19 +48,29 @@ Pyramid was previously known as repoze.bfg (http://bfg.repoze.org). %prep %setup -q -n pyramid-%{version} +%patch0 -p1 %build -CFLAGS="%{optflags}" python setup.py build +python setup.py build +#cd docs && make html %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} - -%clean -rm -rf %{buildroot} +rm -rf %{buildroot}%{python_sitelib}/pyramid/tests # Big, hidden files, fdupes -> don't package +%fdupes %{buildroot}%{python_sitelib} %files %defattr(-,root,root,-) %doc *.txt +#%%doc docs/build/html +%{_bindir}/bfg2pyramid +%{_bindir}/pcreate +%{_bindir}/prequest +%{_bindir}/proutes +%{_bindir}/pserve +%{_bindir}/pshell +%{_bindir}/ptweens +%{_bindir}/pviews %{python_sitelib}/* %changelog