Attachment 2270 Details for Bug 13444 – Support for x86_64, spec file cleanup, removing dependency from nevow

[patch] Support for x86_64, spec file cleanup, removing dependency from nevow

python-module-twisted-lore.patch (text/plain), 3.38 KB, created by Nikolay A. Fetisov on 2007-11-16 14:08:03 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolay A. Fetisov

Created: 2007-11-16 14:08:03 MSK

Size: 3.38 KB

patch

obsolete

>Fix build on x86_64
>Fix missed dependency on python2.4(nevow)
>Spec file cleanup
>
>--- /dev/null
>+++ b/python-module-twisted-lore-0.3.0-alt-remove_nevow.patch
>@@ -0,0 +1,12 @@
>+Removing depricated nevow suport
>+
>+--- ./twisted/plugins/twisted_lore.py
>++++ ./twisted/plugins/twisted_lore.py
>+@@ -32,7 +32,3 @@ ManProcessor = _LorePlugin(
>+     "twisted.lore.man2lore",
>+     "UNIX Man pages")
>+ 
>+-NevowProcessor = _LorePlugin(
>+-    "nevow",
>+-    "twisted.lore.nevowlore",
>+-    "Nevow for Lore")
>--- a/python-module-twisted-lore.spec
>+++ b/python-module-twisted-lore.spec
>@@ -1,18 +1,19 @@
> %define version 0.3.0
>-%define release alt1
>+%define release alt1.1
> %define origname TwistedLore
> %setup_python_module twisted-lore
> 
>-Name:           %{packagename}
>-Version:        %{version}
>-Release:        %{release}
>+Name:           %packagename
>+Version:        %version
>+Release:        %release
> Summary:        Twisted documentation system
> 
> Group:          Development/Python
> License:        MIT
> URL:            http://www.twistedmatrix.com
> Packager:	Sergey Alembekov <rt@altlinux.ru>
>-Source0:        http://tmrc.mit.edu/mirror/twisted/Lore/0.3/%{origname}-%{version}.tar.bz2
>+Source0:        http://tmrc.mit.edu/mirror/twisted/Lore/0.3/%origname-%version.tar.bz2
>+Patch0:		python-module-twisted-lore-0.3.0-alt-remove_nevow.patch
> 
> BuildRequires:  python-module-twisted-core >= 2.5.0
> BuildRequires:  python-devel
>@@ -20,8 +21,6 @@ BuildRequires:  python-devel
> Requires:       python-module-twisted-core
> Requires:       python-module-twisted-web
> 
>-#%add_python_req_skip nevow
>-
> %description
> Twisted is an event-based framework for internet applications.
> 
>@@ -29,38 +28,42 @@ Lore is a complete documentation system based on XHTML and can generate
> documentation into other formats such as PDF, HTML.
> 
> %prep
>-%setup -q -n %{origname}-%{version}
>+%setup -q -n %origname-%version
>+%patch0
> 
>-%{__sed} -i 's/\r//' doc/howto/listings/lore/1st_example.html
>-%{__sed} -i 's/\r//' doc/howto/listings/lore/factory.py*
>-%{__sed} -i 's/\r//' doc/howto/listings/lore/spitters.py*
>-%{__sed} -i 's/\r//' doc/howto/listings/lore/plugins.tml
>+subst 's/\r//g' doc/howto/listings/lore/1st_example.html \
>+		doc/howto/listings/lore/factory.py* \
>+		doc/howto/listings/lore/spitters.py* \
>+		doc/howto/listings/lore/plugins.tml
> 
> %build
> %__python setup.py build
> 
> %install
>-%__python setup.py install --root $RPM_BUILD_ROOT
>+%__python setup.py install --root $RPM_BUILD_ROOT --install-purelib %python_sitelibdir
> 
>-# Man pages
>-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
>-cp -a doc/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
>-rm -rf doc/man
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>+# Man pages
>+mkdir -p -- $RPM_BUILD_ROOT%_man1dir
>+cp -a -- doc/man/*.1 $RPM_BUILD_ROOT%_man1dir
>+rm -rf -- doc/man
> 
> %files
>-%defattr(-,root,root,-)
> %doc README LICENSE NEWS doc/*
>-%{_mandir}/man1/*
>-%{_bindir}/bookify
>-%{_bindir}/lore
>+%_man1dir/*
>+%_bindir/bookify
>+%_bindir/lore
> 
>-%{python_sitelibdir}/twisted/lore/
>+%python_sitelibdir/twisted/lore
>+%python_sitelibdir/twisted/plugins/twisted_lore.py*
> 
>-%{python_sitelibdir}/twisted/plugins/twisted_lore.py*
>+%exclude %python_sitelibdir/twisted/lore/nevowlore*
> 
> %changelog
>+* Sat Oct 27 2007 Nikolay A. Fetisov <naf@altlinux.ru> 0.3.0-alt1.1
>+- Fix build on x86_64
>+- Fix missed dependency on python2.4(nevow)
>+- Spec file cleanup
>+
> * Fri Mar 30 2007 Sergey Alembekov <rt@altlinux.ru> 0.3.0-alt1
>  - Build for new upstream version

Actions: View | Diff

Attachments on bug 13444: 2270