[fabric/f14/master] * Sat Oct 09 2010 Silas Sewell <silas at sewell.ch> - 0.9.2-1 - Update to 0.9.2 - Import man page from

[Silas Sewell]

commit 6027424c5e3c614f27c791ced4023ff6b343bf68
Author: Silas Sewell <silas at sewell.ch>
Date:   Sat Oct 9 10:21:28 2010 -0400

    * Sat Oct 09 2010 Silas Sewell <silas at sewell.ch> - 0.9.2-1
    - Update to 0.9.2
    - Import man page from upstream branch
    - Apply upstream patch to fix incorrect requirements

 .gitignore                      |    1 +
 Fabric-0.9.2.fix-setup-py.patch |   12 ++++++++++++
 fabric.spec                     |   16 ++++++++++++----
 sources                         |    2 +-
 4 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0c164dd..7bc9441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Fabric-0.9.1.tar.gz
+/Fabric-0.9.2.tar.gz
diff --git a/Fabric-0.9.2.fix-setup-py.patch b/Fabric-0.9.2.fix-setup-py.patch
new file mode 100644
index 0000000..f57e2db
--- /dev/null
+++ b/Fabric-0.9.2.fix-setup-py.patch
@@ -0,0 +1,12 @@
+diff -up Fabric-0.9.2/setup.py.orig Fabric-0.9.2/setup.py
+--- Fabric-0.9.2/setup.py.orig	2010-10-09 09:41:57.769429322 -0400
++++ Fabric-0.9.2/setup.py	2010-10-09 09:42:37.986679839 -0400
+@@ -31,7 +31,7 @@ setup(
+     packages=find_packages(),
+     test_suite='nose.collector',
+     tests_require=['nose', 'fudge'],
+-    install_requires=['pycrypto <2.1', 'paramiko >=1.7.6'],
++    install_requires=['pycrypto >=1.9', 'paramiko >=1.7.6'],
+     entry_points={
+         'console_scripts': [
+             'fab = fabric.main:main',
diff --git a/fabric.spec b/fabric.spec
index ec58886..cc8bada 100644
--- a/fabric.spec
+++ b/fabric.spec
@@ -3,8 +3,8 @@
 %global package_name Fabric
 
 Name:           fabric
-Version:        0.9.1
-Release:        2%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        A simple Pythonic remote deployment tool
 
 Group:          Applications/System
@@ -12,7 +12,10 @@ License:        BSD
 URL:            http://www.fabfile.org
 Source0:        http://code.fabfile.org/projects/fabric/files/%{package_name}-%{version}.tar.gz
 # Upstream issue to add man page http://code.fabfile.org/issues/show/35
+# wget http://github.com/adamv/fabric/raw/a7027fd810344c455ada6c31435dbb0905ad4e55/man/fab.1
 Source1:        fab.1
+# Fix in http://github.com/adamv/fabric/commit/4630d896ffc56696ba7083ff0d458b63928ad9e8
+Patch0:         Fabric-%{version}.fix-setup-py.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,16 +31,16 @@ serially.
 
 %prep
 %setup -q -n %{package_name}-%{version}
+%patch0 -p1
 
 %build
 %{__python} setup.py build
-%{__gzip} %{SOURCE1}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 %{__rm} -fr %{buildroot}%{python_sitelib}/paramiko
-%{__install} -p -m 0644 -D %{SOURCE1}.gz %{buildroot}%{_mandir}/man1/fab.1.gz
+%{__install} -p -m 0644 -D %{SOURCE1} %{buildroot}%{_mandir}/man1/fab.1
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -51,6 +54,11 @@ serially.
 %{_mandir}/man1/fab.1.gz
 
 %changelog
+* Sat Oct 09 2010 Silas Sewell <silas at sewell.ch> - 0.9.2-1
+- Update to 0.9.2
+- Import man page from upstream branch
+- Apply upstream patch to fix incorrect requirements
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index 58b259b..4db8ba6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c2dc002d0da6cc4041f1c12be51e762  Fabric-0.9.1.tar.gz
+5ba652d4d4525fb6b470edf55747ea45  Fabric-0.9.2.tar.gz