Commit 54c2ddc5 authored by Pavel Vainerman's avatar Pavel Vainerman

Попытка решить вопрос с зависимостями python

parent 126f37f4
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
Name: libuniset Name: libuniset
Version: 1.6 Version: 1.6
Release: alt4 Release: alt5
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
...@@ -22,7 +22,7 @@ Source: %name-%version.tar ...@@ -22,7 +22,7 @@ Source: %name-%version.tar
# manually removed: glibc-devel-static # manually removed: glibc-devel-static
# Automatically added by buildreq on Fri Nov 26 2010 # Automatically added by buildreq on Fri Nov 26 2010
BuildRequires: libcomedi-devel libcommoncpp2-devel libomniORB-devel libsigc++2.0-devel python-modules xsltproc BuildRequires: libcomedi-devel libcommoncpp2-devel libomniORB-devel libsigc++2.0-devel xsltproc
%if_enabled mysql %if_enabled mysql
# Using old package name instead of libmysqlclient-devel it absent in branch 5.0 for yauza # Using old package name instead of libmysqlclient-devel it absent in branch 5.0 for yauza
...@@ -34,9 +34,10 @@ BuildRequires: libsqlite3-devel ...@@ -34,9 +34,10 @@ BuildRequires: libsqlite3-devel
%endif %endif
%if_enabled python %if_enabled python
BuildRequires: python-devel BuildRequires: python-devel
# swig # swig
BuildRequires(pre): rpm-build-python # add_findprov_lib_path %python_sitelibdir/%oname
%endif %endif
%if_enabled doc %if_enabled doc
...@@ -120,6 +121,8 @@ Group: Development/Python ...@@ -120,6 +121,8 @@ Group: Development/Python
Summary: python interface for libuniset Summary: python interface for libuniset
Requires: %name = %version-%release Requires: %name = %version-%release
%py_provides UGlobal UInterface UniXML uniset
%description -n python-module-%oname %description -n python-module-%oname
Python interface for %name Python interface for %name
%endif %endif
...@@ -316,6 +319,9 @@ mv -f %buildroot%python_sitelibdir/%oname/%oname.py %buildroot%python_sitelibdir ...@@ -316,6 +319,9 @@ mv -f %buildroot%python_sitelibdir/%oname/%oname.py %buildroot%python_sitelibdir
%exclude %_pkgconfigdir/libUniSet.pc %exclude %_pkgconfigdir/libUniSet.pc
%changelog %changelog
* Tue Mar 05 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt5
- force add python provides
* Tue Mar 05 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt4 * Tue Mar 05 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt4
- restote UInterface for python - restote UInterface for python
......
if DISABLE_PYTHON if DISABLE_PYTHON
else else
pyexec_LTLIBRARIES = _pyUConnector.la _pyUModbus.la _pyUExceptions.la _pyUniSet.la python_SCRIPTS = pyUniSet.py pyUConnector.py pyUModbus.py pyUExceptions.py
python_LTLIBRARIES = _pyUConnector.la _pyUModbus.la _pyUExceptions.la _pyUniSet.la
_pyUniSet_la_SOURCES = UInterface.cc UInterface_wrap.cxx _pyUniSet_la_SOURCES = UInterface.cc UInterface_wrap.cxx
_pyUniSet_la_CXXFLAGS = $(UNISET_CFLAGS) $(PYTHON_CFLAGS) _pyUniSet_la_CXXFLAGS = $(UNISET_CFLAGS) $(PYTHON_CFLAGS)
...@@ -34,8 +36,6 @@ _pyUExceptions_la_LIBADD = $(UNISET_LIBS) $(UNISET_EXT_LIBS) $(PYTHON_LIBS) ...@@ -34,8 +36,6 @@ _pyUExceptions_la_LIBADD = $(UNISET_LIBS) $(UNISET_EXT_LIBS) $(PYTHON_LIBS)
UExceptions_wrap.cxx: UExceptions.i UExceptions.h UExceptions_wrap.cxx: UExceptions.i UExceptions.h
swig -python -c++ -classic UExceptions.i swig -python -c++ -classic UExceptions.i
python_SCRIPTS = pyUniSet.py pyUConnector.py pyUModbus.py pyUExceptions.py
clean-local: clean-local:
rm -rf *.py* *_wrap.cxx rm -rf *.py* *_wrap.cxx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment