SPECS: python-psycopg2.spec - zope related stuff commented out for years, n...

[wrobell]

Author: wrobell                      Date: Thu Jan 22 01:39:43 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 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

---- Files affected:
SPECS:
   python-psycopg2.spec (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: SPECS/python-psycopg2.spec
diff -u SPECS/python-psycopg2.spec:1.62 SPECS/python-psycopg2.spec:1.63
--- SPECS/python-psycopg2.spec:1.62	Fri Dec 19 09:49:29 2008
+++ SPECS/python-psycopg2.spec	Thu Jan 22 02:39:37 2009
@@ -1,17 +1,7 @@
 # $Revision$, $Date$
 #
 # 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
 
@@ -19,7 +9,7 @@
 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
@@ -31,14 +21,19 @@
 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
@@ -53,19 +48,6 @@
 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"
@@ -82,50 +64,31 @@
 
 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}
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2009/01/22 01:39:37  wrobell
+- 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
+
 Revision 1.62  2008/12/19 08:49:29  matkor
 - Release 3. Killed nonworking mx bcond. Prepared for Ac.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python-psycopg2.spec?r1=1.62&r2=1.63&f=u