Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
d54305a0
Commit
d54305a0
authored
Dec 10, 2013
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Тестовая сборка с rrd, модифицировал spec-файл.
parent
c1f65aed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
2 deletions
+27
-2
libuniset.spec
conf/libuniset.spec
+20
-2
Makefile.am
extensions/RRDServer/Makefile.am
+7
-0
No files found.
conf/libuniset.spec
View file @
d54305a0
...
@@ -2,12 +2,13 @@
...
@@ -2,12 +2,13 @@
%def_enable mysql
%def_enable mysql
%def_enable sqlite
%def_enable sqlite
%def_enable python
%def_enable python
%def_enable rrd
%define oname uniset
%define oname uniset
Name: libuniset
Name: libuniset
Version: 1.7
Version: 1.7
Release: alt
2
Release: alt
3
Summary: UniSet - library for building distributed industrial control systems
Summary: UniSet - library for building distributed industrial control systems
...
@@ -33,6 +34,10 @@ BuildRequires: libMySQL-devel
...
@@ -33,6 +34,10 @@ BuildRequires: libMySQL-devel
BuildRequires: libsqlite3-devel
BuildRequires: libsqlite3-devel
%endif
%endif
%if_enabled rrd
BuildRequires: librrd-devel
%endif
%if_enabled python
%if_enabled python
BuildRequires: python-devel
BuildRequires: python-devel
BuildRequires(pre): rpm-build-python
BuildRequires(pre): rpm-build-python
...
@@ -178,7 +183,7 @@ Libraries needed to develop for uniset extensions
...
@@ -178,7 +183,7 @@ Libraries needed to develop for uniset extensions
%build
%build
%autoreconf
%autoreconf
%configure %{subst_enable doc} %{subst_enable mysql} %{subst_enable sqlite} %{subst_enable python}
%configure %{subst_enable doc} %{subst_enable mysql} %{subst_enable sqlite} %{subst_enable python}
%{subst_enable rrd}
%make
%make
%install
%install
...
@@ -294,6 +299,12 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
...
@@ -294,6 +299,12 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%_libdir/libUniSetUNetUDP*.so.*
%_libdir/libUniSetUNetUDP*.so.*
#%_libdir/libUniSetSMDBServer*.so.*
#%_libdir/libUniSetSMDBServer*.so.*
%if_enabled rrd
%_bindir/%oname-rrd*
%_libdir/libUniSetRRD*.so.*
%endif
%files extensions-devel
%files extensions-devel
%_includedir/%oname/extensions/
%_includedir/%oname/extensions/
%_libdir/*Extensions.so
%_libdir/*Extensions.so
...
@@ -314,11 +325,18 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
...
@@ -314,11 +325,18 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%_pkgconfigdir/libUniSetNetwork*.pc
%_pkgconfigdir/libUniSetNetwork*.pc
%_pkgconfigdir/libUniSetUNet*.pc
%_pkgconfigdir/libUniSetUNet*.pc
%if_enabled rrd
%_pkgconfigdir/libUniSetRRD*.pc
%endif
#%_pkgconfigdir/libUniSetSMDBServer.pc
#%_pkgconfigdir/libUniSetSMDBServer.pc
#%_pkgconfigdir/libUniSet*.pc
#%_pkgconfigdir/libUniSet*.pc
%exclude %_pkgconfigdir/libUniSet.pc
%exclude %_pkgconfigdir/libUniSet.pc
%changelog
%changelog
* Tue Dec 10 2013 Pavel Vainerman <pv@altlinux.ru> 1.7-alt3
- add RRDServer
* Fri Dec 06 2013 Pavel Vainerman <pv@altlinux.ru> 1.7-alt2
* Fri Dec 06 2013 Pavel Vainerman <pv@altlinux.ru> 1.7-alt2
- (unetexchange): add 'prefix'
- (unetexchange): add 'prefix'
...
...
extensions/RRDServer/Makefile.am
View file @
d54305a0
if
DISABLE_RRD
else
bin_PROGRAMS
=
@PACKAGE@-rrdserver
bin_PROGRAMS
=
@PACKAGE@-rrdserver
RRD_VER
=
@LIBVER@
RRD_VER
=
@LIBVER@
...
@@ -31,3 +35,5 @@ pkgconfig_DATA = libUniSetRRDServer.pc
...
@@ -31,3 +35,5 @@ pkgconfig_DATA = libUniSetRRDServer.pc
all-local
:
all-local
:
ln
-sf
../RRDServer/
$(devel_include_HEADERS)
../include
ln
-sf
../RRDServer/
$(devel_include_HEADERS)
../include
endif
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment