default is stable

authorFlorent Cayre <florent.cayre@logilab.fr>
changeset7db3d7c30c53
branchstable
phasepublic
hiddenno
parent revision#ff56f6dbe746 merge, #df5efe92aac5 merge with more recent stable changes
child revision#3c58962f468c add TYPE_CONVERTERS dict on advanced helpers defining conversions callback from Python SQL types (closes #132587)
files modified by this revision
.hgtags
python-logilab-database.spec
# HG changeset patch
# User Florent Cayre <florent.cayre@logilab.fr>
# Date 1365579716 -7200
# Wed Apr 10 09:41:56 2013 +0200
# Branch stable
# Node ID 7db3d7c30c533bbf09d151a7bd5d88377c2eea24
# Parent df5efe92aac5282bc59f396c914d26eb28aca464
# Parent ff56f6dbe746624843621566a972981bd534284e
default is stable

diff --git a/.hgtags b/.hgtags
@@ -51,5 +51,6 @@
1  bbb86bf3775af37ab1586c1697f4ddec4c4f57a2 logilab-database-debian-version-1.8.1-1
2  443b3bc7cab5c5bac77dc4b4026c26b68c3620d6 logilab-database-version-1.8.2
3  93688ee18263966fe7ee41d84ff100552a5644c8 logilab-database-debian-version-1.8.2-1
4  dcbf659a5fe2f04c80172345692864e8800ee29e logilab-database-version-1.9.0
5  89a6e45cf45ec69350b05b840d2572518ed1afaf logilab-database-debian-version-1.9.0-1
6 +5397b6fdcb9d7a425a8bcf0a312c2fec9a1b1cc0 logilab-database-centos-version-1.9.0-1
diff --git a/python-logilab-database.spec b/python-logilab-database.spec
@@ -1,18 +1,17 @@
7  # for el5, force use of python2.6
8  %if 0%{?el5}
9  %define python python26
10  %define __python /usr/bin/python2.6
11 -%{!?python_scriptarch: %define python_scriptarch %(%{__python} -c "from distutils.sysconfig import get_python_lib; from os.path import join; print join(get_python_lib(1, 1), 'scripts')")}
12  %else
13  %define python python
14  %define __python /usr/bin/python
15  %endif
16  %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
17 
18  Name:           %{python}-logilab-database
19 -Version:        1.8.2
20 +Version:        1.9.0
21  Release:        logilab.1%{?dist}
22  Summary:        Unified database access library for python
23 
24  Group:          Development/Libraries
25  License:        LGPLv2+
@@ -46,15 +45,13 @@
26  %endif
27 
28 
29  %install
30  rm -rf $RPM_BUILD_ROOT
31 -NO_SETUPTOOLS=1 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %{?python_scriptarch: --install-scripts=%{python_scriptarch}}
32 +NO_SETUPTOOLS=1 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
33  rm -rf $RPM_BUILD_ROOT%{_python_sitelib}/logilab/database/test
34 -
35 -%check
36 -%{__python} setup.py test
37 +rm -rf $RPM_BUILD_ROOT%{_python_sitelib}/logilab/__init__.py*
38 
39  %clean
40  rm -rf $RPM_BUILD_ROOT
41 
42