Update to 2.3.2

This commit is contained in:
Tom Lane 2010-12-29 17:29:01 -05:00
parent afd3c83e25
commit 74fce094b1
3 changed files with 44 additions and 23 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
psycopg2-2.2.2.tar.gz /psycopg2-2.3.2.tar.gz

View File

@ -4,13 +4,16 @@
# Python 2.5+ is not supported by Zope, so it does not exist in # Python 2.5+ is not supported by Zope, so it does not exist in
# recent Fedora releases. That's why zope subpackage is disabled. # recent Fedora releases. That's why zope subpackage is disabled.
#%define ZPsycopgDAdir %{_localstatedir}/lib/zope/Products/ZPsycopgDA %global zope 0
%if %zope
%global ZPsycopgDAdir %{_localstatedir}/lib/zope/Products/ZPsycopgDA
%endif
Summary: A PostgreSQL database adapter for Python Summary: A PostgreSQL database adapter for Python
Name: python-psycopg2 Name: python-psycopg2
Version: 2.2.2 Version: 2.3.2
Release: 3%{?dist} Release: 1%{?dist}
Source0: http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz Source0: http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
# The exceptions allow linking to OpenSSL and PostgreSQL's libpq # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
License: LGPLv3+ with exceptions License: LGPLv3+ with exceptions
@ -47,32 +50,44 @@ Requires: %{name} = %{version}-%{release}
Documentation and example files for the psycopg python PostgreSQL Documentation and example files for the psycopg python PostgreSQL
database adapter. database adapter.
#%package zope %if %zope
#Summary: Zope Database Adapter ZPsycopgDA %package zope
Summary: Zope Database Adapter ZPsycopgDA
# The exceptions allow linking to OpenSSL and PostgreSQL's libpq # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
#License: GPLv2+ with exceptions or ZPLv1.0 License: GPLv2+ with exceptions or ZPLv1.0
#Group: Applications/Databases Group: Applications/Databases
#Requires: %{name} = %{version}-%{release} zope Requires: %{name} = %{version}-%{release} zope
#%description zope %description zope
#Zope Database Adapter for PostgreSQL, called ZPsycopgDA Zope Database Adapter for PostgreSQL, called ZPsycopgDA
%endif
%prep %prep
%setup -q -n psycopg2-%{version} %setup -q -n psycopg2-%{version}
%build %build
python setup.py build python setup.py build
# Fix for wrong-file-end-of-line-encoding problem; upstream also must fix this. # Fix for wrong-file-end-of-line-encoding problem; upstream also must fix this.
for i in `find doc -iname "*.html"`; do sed -i 's/\r//' $i; done for i in `find doc -iname "*.html"`; do sed -i 's/\r//' $i; done
for i in `find doc -iname "*.css"`; do sed -i 's/\r//' $i; done for i in `find doc -iname "*.css"`; do sed -i 's/\r//' $i; done
# Get rid of a "hidden" file that rpmlint complains about
rm -f doc/html/.buildinfo
%install %install
rm -Rf %{buildroot} rm -rf %{buildroot}
mkdir -p %{buildroot}%{python_sitearch}/psycopg2 mkdir -p %{buildroot}%{python_sitearch}/psycopg2
python setup.py install --no-compile --root %{buildroot} python setup.py install --no-compile --root %{buildroot}
#install -d %{buildroot}%{ZPsycopgDAdir} # We're not currently interested in packaging the test suite.
#cp -pr ZPsycopgDA/* %{buildroot}%{ZPsycopgDAdir} rm -rf %{buildroot}%{python_sitearch}/psycopg2/tests
%if %zope
install -d %{buildroot}%{ZPsycopgDAdir}
cp -pr ZPsycopgDA/* %{buildroot}%{ZPsycopgDAdir}
%endif
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -91,16 +106,22 @@ rm -rf %{buildroot}
%defattr(-,root,root) %defattr(-,root,root)
%doc doc examples/ %doc doc examples/
#%files zope %if %zope
#%defattr(-,root,root) %files zope
#%dir %{ZPsycopgDAdir} %defattr(-,root,root)
#%{ZPsycopgDAdir}/*.py %dir %{ZPsycopgDAdir}
#%{ZPsycopgDAdir}/*.pyo %{ZPsycopgDAdir}/*.py
#%{ZPsycopgDAdir}/*.pyc %{ZPsycopgDAdir}/*.pyo
#%{ZPsycopgDAdir}/dtml/* %{ZPsycopgDAdir}/*.pyc
#%{ZPsycopgDAdir}/icons/* %{ZPsycopgDAdir}/dtml/*
%{ZPsycopgDAdir}/icons/*
%endif
%changelog %changelog
* Wed Dec 29 2010 Tom Lane <tgl@redhat.com> 2.3.2-1
- Update to 2.3.2
- Clean up a few rpmlint warnings
* Fri Dec 03 2010 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.2.2-3 * Fri Dec 03 2010 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.2.2-3
- Fix incorrect (and invalid) License: tag. - Fix incorrect (and invalid) License: tag.

View File

@ -1 +1 @@
571af2ad9dfeb522ee5f8553278a4c38 psycopg2-2.2.2.tar.gz 9f86f726f9aa7f6c4b05d729cad1e70a psycopg2-2.3.2.tar.gz