From c70a2684bcf77717240ba1f3be16f603580aaa4f Mon Sep 17 00:00:00 2001
From: cvsextras <cvsextras@fedoraproject.org>
Date: Mon, 8 Nov 2004 05:12:26 +0000
Subject: [PATCH] auto-import changelog data from
 pexpect-0.999-0.fdr.1.1.src.rpm Mon May 31 2004 Panu Matilainen
 <pmatilai@welho.com> 0.999-0.fdr.1 - get rid of distrel munging, buildsys
 does that... - update to 0.999 - update doc and example tarballs - fix build
 on python <> 2.2 - use -O1 in install to generate .pyo files instead of
 manually creating     the files - require python-abi = pyver to get
 dependencies right

---
 .cvsignore   |  2 +-
 pexpect.spec | 49 ++++++++++++++++++++++++++-----------------------
 sources      |  6 +++---
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index e75b2cd..f586f01 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-pexpect-0.98.tgz
+pexpect-0.999.tgz
 pexpect-doc.tgz
 pexpect-examples.tgz
diff --git a/pexpect.spec b/pexpect.spec
index e5462af..a9f5b9d 100644
--- a/pexpect.spec
+++ b/pexpect.spec
@@ -1,14 +1,9 @@
-%{!?rhrel:%define rhrel %(cut -d' ' -f5 /etc/redhat-release )}
-%if "%{rhrel}" == "9"
-%define distrel rh90
-%else
-%define distrel rh%(echo %{rhrel} | sed 's/\\.//')
-%endif
+%define pyver %(python -c 'import sys ; print sys.version[:3]')
 
 Summary: Expect module for Python
 Name: pexpect
-Version: 0.98
-Release: 0.fdr.3.%{distrel}
+Version: 0.999
+Release: 0.fdr.1.1
 License: PSFL
 Group: Development/Languages
 URL: http://pexpect.sourceforge.net
@@ -16,7 +11,7 @@ Source: http://download.sourceforge.net/pexpect/%{name}-%{version}.tgz
 Source1: http://download.sourceforge.net/pexpect/pexpect-doc.tgz
 Source2: http://download.sourceforge.net/pexpect/pexpect-examples.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: python >= 0:2.2
+Requires: python-abi = %{pyver}
 BuildRequires: python-devel >= 0:2.2
 
 %description
@@ -42,30 +37,38 @@ rm -rf $(find . -type d -name CVS)
 python setup.py build
 
 %install
-python setup.py install --root $RPM_BUILD_ROOT
+python setup.py install -O1 --root $RPM_BUILD_ROOT
 
-touch %{name}-ghost.files
-for file in $(find $RPM_BUILD_ROOT -type f -name "*.py"); do
-  for suffix in c o; do
-    if [ ! -e "$file$suffix" ]; then
-      touch "$file$suffix"
-      echo "%ghost $file$suffix" | sed "s|$RPM_BUILD_ROOT||" \
-        >> %{name}-ghost.files
-    fi
-  done
-done
+#touch %{name}-ghost.files
+#for file in $(find $RPM_BUILD_ROOT -type f -name "*.py"); do
+#for suffix in c o; do
+#if [ ! -e "$file$suffix" ]; then
+#touch "$file$suffix"
+#echo "%ghost $file$suffix" | sed "s|$RPM_BUILD_ROOT||" \
+#>> %{name}-ghost.files
+#fi
+#done
+#done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}-ghost.files
+#%files -f %{name}-ghost.files
+%files
 %defattr(-,root,root,-)
-%{_libdir}/python2.2/site-packages/pexpect.py
-%{_libdir}/python2.2/site-packages/pexpect.pyc
+%{_libdir}/python%{pyver}/site-packages/pexpect.*
 
 %doc README.txt doc examples
 
 %changelog
+* Mon May 31 2004 Panu Matilainen <pmatilai@welho.com> 0.999-0.fdr.1
+- get rid of distrel munging, buildsys does that...
+- update to 0.999
+- update doc and example tarballs
+- fix build on python <> 2.2
+- use -O1 in install to generate .pyo files instead of manually creating the files
+- require python-abi = pyver to get dependencies right
+
 * Sun Jul 27 2003 Panu Matilainen <pmatilai@welho.com> 0.98-0.fdr.3
 - own .pyo files too as suggested by Ville (#517)
 
diff --git a/sources b/sources
index 4e69cf8..dd27afa 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-914c2a5225e37dd6c0c73914db2fa4f1  pexpect-0.98.tgz
-de9f0ed8a563fc0ea566055d000779ce  pexpect-doc.tgz
-be0086d3f55dd8690cba7381f9e9be14  pexpect-examples.tgz
+e426e5f54d323aaf392008c9eb35131d  pexpect-0.999.tgz
+69bfc0056938f561875289651c8715ad  pexpect-doc.tgz
+ee05cad1d7b6b4de0dc74bc16330b852  pexpect-examples.tgz