rpms/python-twisted-conch/F-10 .cvsignore, 1.3, 1.4 python-twisted-conch.spec, 1.5, 1.6 sources, 1.3, 1.4
Matthias Saou
thias at fedoraproject.org
Mon Dec 29 10:10:49 UTC 2008
- Previous message (by thread): rpms/fuse-zip/devel fuse-zip-man-page.patch, NONE, 1.1 fuse-zip.spec, 1.2, 1.3 import.log, 1.2, 1.3
- Next message (by thread): rpms/fuse-zip/F-10 .cvsignore, 1.2, 1.3 fuse-zip.spec, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thias
Update of /cvs/extras/rpms/python-twisted-conch/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22546
Modified Files:
.cvsignore python-twisted-conch.spec sources
Log Message:
Backport 8.1.0 update from devel.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-conch/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 31 Aug 2007 21:13:00 -0000 1.3
+++ .cvsignore 29 Dec 2008 10:10:18 -0000 1.4
@@ -1 +1 @@
-TwistedConch-0.8.0.tar.bz2
+TwistedConch-8.1.0.tar.bz2
Index: python-twisted-conch.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-conch/F-10/python-twisted-conch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-twisted-conch.spec 7 Mar 2008 16:50:21 -0000 1.5
+++ python-twisted-conch.spec 29 Dec 2008 10:10:18 -0000 1.6
@@ -1,24 +1,21 @@
-%{?!python:%define python python}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%define origname TwistedConch
+%{!?python:%define python python}
+%{!?python_sitearch: %define python_sitearch %(%{python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: %{python}-twisted-conch
-Version: 0.8.0
-Release: 4%{?dist}
-Summary: Twisted SSHv2 implementation
-
+Version: 8.1.0
+Release: 2%{?dist}
+Summary: SSH and SFTP protocol implementation together with clients and servers
Group: Development/Libraries
License: MIT
URL: http://twistedmatrix.com/trac/wiki/TwistedConch
-Source0: http://tmrc.mit.edu/mirror/twisted/Conch/0.8/TwistedConch-%{version}.tar.bz2
+Source0: http://tmrc.mit.edu/mirror/twisted/Conch/8.1/TwistedConch-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: %{python}-twisted-core >= 2.5.0
-BuildRequires: python-devel
-
-Requires: %{python}-twisted-core >= 2.5.0
+BuildRequires: %{python}-twisted-core >= 8.1.0
+BuildRequires: %{python}-devel
+Requires: %{python}-twisted-core >= 8.1.0
Requires: %{python}-crypto
+# for tkconch
+Requires: tkinter
# a noarch-turned-arch package should not have debuginfo
%define debug_package %{nil}
@@ -36,48 +33,73 @@
server-side input history and interactive syntax coloring.
%prep
-%setup -n %{origname}-%{version} -q
+%setup -q -n TwistedConch-%{version}
-find doc -name \*.py | xargs chmod a-x
+# Fix doc file dependencies
+%{__chmod} -x doc/{benchmarks/buffering_mixin.py,examples/sshsimpleserver.py}
%build
+%{python} setup.py build
%install
-rm -rf $RPM_BUILD_ROOT
-# this is a pure python package, but extending the twisted namespace from
+%{__rm} -rf %{buildroot}
+
+# This is a pure python package, but extending the twisted namespace from
# python-twisted-core, which is arch-specific, so it needs to go in sitearch
-%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT --install-purelib %{python_sitearch}
+%{python} setup.py install -O1 --skip-build \
+ --install-purelib %{python_sitearch} --root %{buildroot}
# Man pages
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
-cp -a doc/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-rm -rf doc/man
+%{__mkdir_p} %{buildroot}%{_mandir}/man1/
+%{__cp} -a doc/man/*.1 %{buildroot}%{_mandir}/man1/
+%{__rm} -rf doc/man
+
+# See if there's any egg-info
+if [ -f %{buildroot}%{python_sitearch}/Conch*.egg-info ]; then
+ echo %{buildroot}%{python_sitearch}/Conch*.egg-info |
+ %{__sed} -e 's|^%{buildroot}||'
+fi > egg-info
%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p %{_libexecdir}/twisted-dropin-cache
+%{__rm} -rf %{buildroot}
-%postun -p %{_libexecdir}/twisted-dropin-cache
+%post
+if [ -x %{_libexecdir}/twisted-dropin-cache ]; then
+ %{_libexecdir}/twisted-dropin-cache || :
+fi
+
+%postun
+if [ -x %{_libexecdir}/twisted-dropin-cache ]; then
+ %{_libexecdir}/twisted-dropin-cache || :
+fi
-%files
+%files -f egg-info
%defattr(-,root,root,-)
-%doc README LICENSE NEWS doc/*
-%{_mandir}/man1/*
+%doc LICENSE NEWS README doc/*
%{_bindir}/cftp
%{_bindir}/ckeygen
%{_bindir}/conch
%{_bindir}/tkconch
-
+%{_mandir}/man1/cftp.1*
+%{_mandir}/man1/ckeygen.1*
+%{_mandir}/man1/conch.1*
+%{_mandir}/man1/tkconch.1*
%{python_sitearch}/twisted/conch/
-
%{python_sitearch}/twisted/plugins/twisted_conch.py*
-%if 0%{?fedora} >= 9
- %{python_sitearch}/Conch-%{version}-py2.5.egg-info
-%endif
-
%changelog
+* Tue Dec 23 2008 Matthias Saou <http://freshrpms.net/> 8.1.0-2
+- Update to 8.1.0.
+- Merge back changes from Paul Howarth.
+- Make sure the scriplets never return a non-zero exit status.
+- Add tkinter requirement for tkconch (#440385).
+
+* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8.0-6
+- Fix locations for Python 2.6
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8.0-5
+- Rebuild for Python 2.6
+
* Fri Mar 07 2008 Jesse Keating <jkeating at redhat.com> - 0.8.0-4
- Handle the egg correctly, since the name is odd.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-conch/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 31 Aug 2007 21:13:00 -0000 1.3
+++ sources 29 Dec 2008 10:10:18 -0000 1.4
@@ -1 +1 @@
-f3ccdd8da6b6e26b0a1eae5e54b9b0e2 TwistedConch-0.8.0.tar.bz2
+e746618618ba93f707f7725899e141a9 TwistedConch-8.1.0.tar.bz2
- Previous message (by thread): rpms/fuse-zip/devel fuse-zip-man-page.patch, NONE, 1.1 fuse-zip.spec, 1.2, 1.3 import.log, 1.2, 1.3
- Next message (by thread): rpms/fuse-zip/F-10 .cvsignore, 1.2, 1.3 fuse-zip.spec, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list