- zope related stuff commented out for years, now... removed until someone

  is interested in it
- use one bcond type for AC line on HEAD
- rel. 4

Changed files:
    python-psycopg2.spec -> 1.63

diff --git a/python-psycopg2.spec b/python-psycopg2.spec
index 7df1843ec640efc6aa634e2e1d8deb5c96350fac..dc6b158548d081b1f7d86b1bbea202cd8af768d4 100644 (file)
--- a/python-psycopg2.spec
+++ b/python-psycopg2.spec
@@ -1,16 +1,6 @@
 #
 # 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.
-
-# Version 2.0.8 builds well with both datetime and mx.DateTime 
-# By default uses datetime
-# If sb really needs version _without_ mx pls do it on your own
-# with without_mx bcond
 
 %define        module  psycopg2
 
@@ -18,7 +8,7 @@ Summary:       psycopg is a PostgreSQL database adapter for Python
 Summary(pl.UTF-8):     psycopg jest przeznaczonym dla Pythona interfejsem do bazy PostgreSQL
 Name:          python-%{module}
 Version:       2.0.8
-Release:       3
+Release:       4
 License:       GPL
 Group:         Libraries/Python
 Source0:       http://initd.org/pub/software/psycopg/%{module}-%{version}.tar.gz
@@ -30,14 +20,19 @@ BuildRequires:      postgresql-backend-devel
 BuildRequires: postgresql-devel
 BuildRequires: python-devel
 BuildRequires: rpm-pythonprov
-BuildRequires: python-mx-DateTime-devel
-Requires:      python-mx-DateTime
 Requires:      postgresql-libs
 %pyrequires_eq python-modules
+%if "%{pld_release}" == "ac"
+BuildRequires: python-mx-DateTime-devel
+Requires:      python-mx-DateTime
+%else
+# allow mx.DateTime to be optional
+# don't suggest - it is rare tu use it as python provides its own datetime
+# implementation, now
+BuildConflicts:   python-mx-DateTime
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define zope_subname ZPsycopgDA
-
 %description
 psycopg is a PostgreSQL database adapter for the Python programming
 language (just like pygresql and popy.) It was written from scratch
@@ -52,19 +47,6 @@ 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.UTF-8):     Interfejs bazy danych PostgreSQL do Zope
-Group:         Development/Languages/Python
-Requires:      %{name} = %{version}-%{release}
-Requires:      Zope
-
-%description -n Zope-%{zope_subname}
-Zope PostgreSQL database adapter.
-
-%description -n Zope-%{zope_subname} -l pl.UTF-8
-Interfejs bazy danych PostgreSQL do Zope.
-
 %prep
 %setup -q -n %{module}-%{version}
 #%if "%{_lib}" == "lib64"
@@ -81,40 +63,15 @@ python setup.py install --optimize=2 --root=$RPM_BUILD_ROOT
 
 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
-
-#%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 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]
-%if "%{py_ver}" > "2.4"
+%if "%{pld_release}" == "ac"
 %{py_sitedir}/*.egg-info
 %endif
-
-#%files -n Zope-%{zope_subname}
-#%defattr(644,root,root,755)
-#%{_datadir}/Zope-%{zope_subname}