X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=python-psycopg2.spec;h=abb0e3f322cbfc9cba88672198d094194f01b09c;hb=dbbbd4bab9d18093a38c996ddc5fa8ab5e540422;hp=220c12d51cfedb4099b617a08700516e4025ca7e;hpb=f17209238a1b40c2f4086ed622bda367f36a950a;p=packages%2Fpython-psycopg2.git

diff --git a/python-psycopg2.spec b/python-psycopg2.spec
index 220c12d..abb0e3f 100644
--- a/python-psycopg2.spec
+++ b/python-psycopg2.spec
@@ -1,25 +1,41 @@
-
-%include	/usr/lib/rpm/macros.python
-%define 	module psycopg
+#
+# Conditional build:
+%bcond_with mx	# build with egenix mx datetime support
+#
+# todo:
+# - zope adapter
+# - lib64 patch
+#
+# WARNING! Please note, that mx.DateTime is optional. You can use
+# mx.DateTime with your apps, but other see datetime datatype more
+# suitable for date and time as it is standard in Python.
+
+%define 	module	psycopg2
 
 Summary:	psycopg is a PostgreSQL database adapter for Python
-Summary(pl):	psycopg jest przeznaczonym dla Pythona interfejsem do bazy PostgreSQL
+Summary(pl.UTF-8):	psycopg jest przeznaczonym dla Pythona interfejsem do bazy PostgreSQL
 Name:		python-%{module}
-Version:	1.1.10
-Release:	2
+Version:	2.0.8
+Release:	1
 License:	GPL
 Group:		Libraries/Python
-Source0:	http://initd.org/pub/software/%{module}/%{module}-%{version}.tar.gz
-# Source0-md5:	2279a6aaddf8a8fbec44f782e5cdaa02
-Patch0:		%{name}-dumb-ac-fix.patch
+Source0:	http://initd.org/pub/software/psycopg/%{module}-%{version}.tar.gz
+# Source0-md5:	2c31827878d436b0c89e777989ff55af
+#Patch0:		%{name}-lib64.patch
 URL:		http://www.initd.org/software/psycopg/
 BuildRequires:	autoconf
 BuildRequires:	postgresql-backend-devel
+BuildRequires:	postgresql-devel
 BuildRequires:	python-devel
+BuildRequires:	rpm-pythonprov
+%if %{with mx}
 BuildRequires:	python-mx-DateTime-devel
+Requires:	python-mx-DateTime
+%else
+BuildConflicts:	python-mx-DateTime
+%endif
 Requires:	postgresql-libs
 %pyrequires_eq	python-modules
-Requires:	python-mx-DateTime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define zope_subname ZPsycopgDA
@@ -31,73 +47,74 @@ with the aim of being very small and fast, and stable as a rock. The
 main advantages of psycopg are that it supports the full Python
 DBAPI-2.0 and being thread safe at level 2.
 
-%description -l pl
+%description -l pl.UTF-8
 psycopg jest przeznaczonym dla Pythona interfejsem do bazy danych
-PostgreSQL (tak jak pygresql i popy). Zosta³ zakodowany od pocz±tku
-z za³o¿eniem ¿e ma byæ bardzo ma³y, szybki i stabilny. G³ówna zalet±
-psycopg jest, ¿e w jest pe³ni zgodny z standardem DBAPI-2.0 i jest
+PostgreSQL (tak jak pygresql i popy). Został zakodowany od początku
+z założeniem że ma być bardzo mały, szybki i stabilny. Główna zaletą
+psycopg jest, że w jest pełni zgodny z standardem DBAPI-2.0 i jest
 'thread safe' na poziomie 2.
 
 %package -n Zope-%{zope_subname}
 Summary:	Zope PostgreSQL database adapter
-Summary(pl):	Interfejs bazy danych PostgreSQL do Zope
+Summary(pl.UTF-8):	Interfejs bazy danych PostgreSQL do Zope
 Group:		Development/Languages/Python
+Requires:	%{name} = %{version}-%{release}
 Requires:	Zope
-Requires:	%{name} = %{version}
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description -n Zope-%{zope_subname}
 Zope PostgreSQL database adapter.
 
-%description -n Zope-%{zope_subname} -l pl
+%description -n Zope-%{zope_subname} -l pl.UTF-8
 Interfejs bazy danych PostgreSQL do Zope.
 
 %prep
 %setup -q -n %{module}-%{version}
-%patch0 -p1
+#%if "%{_lib}" == "lib64"
+#%patch0 -p1
+#%endif
 
 %build
-%{__autoconf}
-
-%configure \
-	--with-python=%{_bindir}/python \
-	--with-mxdatetime-includes=%{py_incdir}/mx \
-	--with-postgres-includes=%{_includedir}/postgresql/server
-%{__make}
+python setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{py_sitedir},%{_datadir}/Zope-%{zope_subname}}
 
-install psycopgmodule.so $RPM_BUILD_ROOT%{py_sitedir}
+python setup.py install --optimize=2 --root=$RPM_BUILD_ROOT
 
-cp -ar %{zope_subname}/* $RPM_BUILD_ROOT%{_datadir}/Zope-%{zope_subname}
-%py_comp $RPM_BUILD_ROOT%{_datadir}/Zope-%{zope_subname}
-%py_ocomp $RPM_BUILD_ROOT%{_datadir}/Zope-%{zope_subname}
-rm -f $RPM_BUILD_ROOT%{_datadir}/Zope-%{zope_subname}/*.py
+find $RPM_BUILD_ROOT%{py_libdir} -type f -name "*.py" | xargs rm
+
+#install -d $RPM_BUILD_ROOT%{_datadir}/Zope-%{zope_subname}
+
+#cp -ar %{zope_subname}/* $RPM_BUILD_ROOT%{_datadir}/Zope-%{zope_subname}
+#%py_comp $RPM_BUILD_ROOT%{_datadir}/Zope-%{zope_subname}
+#%py_ocomp $RPM_BUILD_ROOT%{_datadir}/Zope-%{zope_subname}
+#rm -f $RPM_BUILD_ROOT%{_datadir}/Zope-%{zope_subname}/*.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n Zope-%{zope_subname}
-/usr/sbin/installzopeproduct %{_datadir}/Zope-%{zope_subname} %{zope_subname}
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+#%post -n Zope-%{zope_subname}
+#/usr/sbin/installzopeproduct %{_datadir}/Zope-%{zope_subname} %{zope_subname}
+#if [ -f /var/lock/subsys/zope ]; then
+#	/etc/rc.d/init.d/zope restart >&2
+#fi
 
-%postun -n Zope-%{zope_subname}
-if [ "$1" = "0" ]; then
-	/usr/sbin/installzopeproduct -d %{zope_subname} 
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
-fi
+#%postun -n Zope-%{zope_subname}
+#if [ "$1" = "0" ]; then
+#	/usr/sbin/installzopeproduct -d %{zope_subname} 
+#	if [ -f /var/lock/subsys/zope ]; then
+#		/etc/rc.d/init.d/zope restart >&2
+#	fi
+#fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CREDITS FAQ NEWS README RELEASE-1.0 SUCCESS TODO doc
-%attr(755,root,root) %{py_sitedir}/*.so
-
-%files -n Zope-%{zope_subname}
-%defattr(644,root,root,755)
-%{_datadir}/Zope-%{zope_subname}
+%doc ChangeLog AUTHORS README doc/HACKING doc/SUCCESS doc/TODO
+%dir %{py_sitedir}/%{module}
+%attr(755,root,root) %{py_sitedir}/%{module}/*.so
+%{py_sitedir}/%{module}/*.py[co]
+%{py_sitedir}/*.egg-info
+
+#%files -n Zope-%{zope_subname}
+#%defattr(644,root,root,755)
+#%{_datadir}/Zope-%{zope_subname}