From 632186fdd6b8c1d186afb95d86e232fda9b12d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?=
 <toshio@fedoraproject.org>
Date: Fri, 14 Sep 2007 00:53:48 +0000
Subject: [PATCH] - Update to 0.4beta5.

---
 .cvsignore             |  2 +-
 python-sqlalchemy.spec | 26 ++++++++++++++++++--------
 sources                |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6205013..1a3192f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-SQLAlchemy-0.4.0beta4.tar.gz
+SQLAlchemy-0.4.0beta5.tar.gz
diff --git a/python-sqlalchemy.spec b/python-sqlalchemy.spec
index 125abdf..3db6907 100644
--- a/python-sqlalchemy.spec
+++ b/python-sqlalchemy.spec
@@ -3,11 +3,11 @@
 
 
 %define srcname SQLAlchemy
-%define betaver beta4
+%define betaver beta5
 
 Name:           python-sqlalchemy
 Version:        0.4.0
-Release:        0.3.%{betaver}%{?dist}
+Release:        0.4.%{betaver}%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
@@ -44,10 +44,15 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py bdist_egg
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
-easy_install -m --prefix $RPM_BUILD_ROOT%{_usr} --always-unzip dist/*.egg
-cd $RPM_BUILD_ROOT%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
-mv sqlalchemy ..
-ln -s ../sqlalchemy .
+python setup.py install --root $RPM_BUILD_ROOT
+#PYTHONPATH=$RPM_BUILD_ROOT%{python_sitelib} easy_install --prefix $RPM_BUILD_ROOT%{_usr} dist/*.egg 'SQLAlchemy==%{version}%{betaver}'
+#cd $RPM_BUILD_ROOT%{python_sitelib}
+#rm site.py*
+#mv easy-install.pth sqlalchemy.pth
+
+#cd $RPM_BUILD_ROOT%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
+#mv sqlalchemy ..
+#ln -s ../sqlalchemy .
 
 # remove unnecessary scripts for building documentation
 rm -rf doc/build
@@ -59,10 +64,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE PKG-INFO CHANGES doc examples
-%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
-%{python_sitelib}/sqlalchemy/
+%{python_sitelib}/*
 
 %changelog
+* Tue Sep 11 2007 Toshio Kuratomi <a.badger@gmail.com> - 0.4.0-0.4.beta5
+- Update to 0.4beta5.
+
+* Fri Sep 06 2007 Toshio Kuratomi <a.badger@gmail.com> - 0.4.0-0.4.beta4
+- setuptools has been fixed.
+
 * Fri Aug 31 2007 Toshio Kuratomi <a.badger@gmail.com> - 0.4.0-0.3.beta4
 - setuptools seems to be broken WRT having an active and inactive version
   of an egg.  Have to make both versions inactive and manually setup a copy
diff --git a/sources b/sources
index bf3a5f1..89f74a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97b00cfba5bcb7cc947320a66c2ce085  SQLAlchemy-0.4.0beta4.tar.gz
+b00125102578a603497bfb0dcc72473c  SQLAlchemy-0.4.0beta5.tar.gz