powerguru-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Powerguru-commit] [SCM] powerguru branch, master, updated. 3202e4a13733


From: Rob Savoye
Subject: [Powerguru-commit] [SCM] powerguru branch, master, updated. 3202e4a13733c6d518e502f04dc7d98352d57aa0
Date: Sun, 13 Jan 2019 13:23:07 -0500 (EST)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "powerguru".

The branch, master has been updated
       via  3202e4a13733c6d518e502f04dc7d98352d57aa0 (commit)
       via  837531c0ca13503f9a3505e528cd04ec1feef8c9 (commit)
      from  d5a53b03b51e6031918f16b7f85e9c0f647f0f90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/powerguru.git/commit/?id=3202e4a13733c6d518e502f04dc7d98352d57aa0


commit 3202e4a13733c6d518e502f04dc7d98352d57aa0
Author: Rob Savoye <address@hidden>
Date:   Sun Jan 13 11:22:56 2019 -0700

    Add dependencies

diff --git a/rpm/powerguru.spec b/rpm/powerguru.spec
index 4c8efee..9075e76 100644
--- a/rpm/powerguru.spec
+++ b/rpm/powerguru.spec
@@ -1,3 +1,22 @@
+# 
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+#               2014, 2015, 2016, 2017, 2018, 2019
+#      Free Software Foundation, Inc.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 # When using rpm 4.1 or newer, the behaviour changed to terminate
 # if any files are missing. This is stupid as if you have scrollkeeper
 # support for the docs, they need to be included in the package. As
@@ -10,7 +29,7 @@
 # Turns out this also works.
 %define _unpackaged_files_terminate_build 0
 
-%define version 0.1
+%define version 0.2
 %define localstatedir   /var/lib
 
 Summary: A monitoring and control program for power devices.
@@ -24,6 +43,9 @@ Vendor: Seneca Software & Solar, Inc.
 Packager: Rob Savoye <address@hidden>
 Group: Applications/Engineering
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+Requires: owfs-shell owfs-capi owfs-server owfs-ownet owfs-devel \
+         boost-devel libxml2-devel net-snmp-devel \
+         postgresql-devel
 
 %description
 Powerguru is an program for monitoring, data logging, and controlling
@@ -31,15 +53,16 @@ your inverter, charger controller, or power meter.
 
 %prep
 %setup -q -n powerguru-%{version}
+./autogen.sh
 
 %build
-./configure --disable-gtkhtml-help --prefix=%{_prefix} \
+./configure --prefix=%{_prefix} \
     --bindir=%{_bindir} --mandir=%{_mandir} \
     --localstatedir=%{localstatedir} --libdir=%{_libdir} \
     --datadir=%{_datadir} --includedir=%{_includedir} \
     --sysconfdir=%{_sysconfdir}
-CFLAGS="$RPM_OPT_FLAGS" make all
-CFLAGS="$RPM_OPT_FLAGS" make -C doc/C alldocs
+CXXFLAGS="$RPM_OPT_FLAGS" make all
+CXXFLAGS="$RPM_OPT_FLAGS" make -C doc/C install-doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,17 +85,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/powerguru/libpguru.*
 %{_datadir}/omf/powerguru/powerguru.omf
 
-# %config site.exp
-
-%post
-/sbin/ldconfig
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
+#%post
+#/sbin/ldconfig
+#if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
-%postun
-/sbin/ldconfig
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
+#%postun
+#/sbin/ldconfig
+#if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Sun Jan 13 2019 Rob Savoye <address@hidden>
+- Update version after heavy refactoring of all the code.
+
 * Sat Jun 11 2005 Rob Savoye <address@hidden>
 - Update version number for 0.1 release.
 

http://git.savannah.gnu.org/cgit/powerguru.git/commit/?id=837531c0ca13503f9a3505e528cd04ec1feef8c9


commit 837531c0ca13503f9a3505e528cd04ec1feef8c9
Author: Rob Savoye <address@hidden>
Date:   Sun Jan 13 11:22:31 2019 -0700

    Remove as boost networking is now used

diff --git a/testsuite/libtests/Makefile.am b/testsuite/libtests/Makefile.am
index 643b2fd..ff73624 100644
--- a/testsuite/libtests/Makefile.am
+++ b/testsuite/libtests/Makefile.am
@@ -27,7 +27,7 @@ AM_CPPFLAGS = -I$(top_srcdir) \
        $(PQ_CPPFLAGS) \
        -DSRCDIR=\"$(srcdir)\"
 
-check_PROGRAMS =  tcpip tutil childtcpip db
+check_PROGRAMS =  db
 TESTS = $(check_PROGRAMS)
 
 if BUILD_LIBXML
@@ -43,18 +43,6 @@ xml_test_SOURCES = xml-test.cc ../../lib/xml.cc
 xml_test_LDADD = $(LIBXML_LIBS) $(LOG)
 endif
 
-tcpip_SOURCES = tcpip-test.cc
-tcpip_LDADD =  ../../lib/tcpip.lo ../../lib/tcputil.lo $(LOG)
-tcpip_DEPENDENCIES = ../../lib/tcpip.lo ../../lib/tcputil.lo $(LOG)
-
-tutil_SOURCES = tcputil-test.cc
-tutil_LDADD = ../../lib/tcputil.lo  $(LOG)
-tutil_DEPENDENCIES = ../../lib/tcputil.lo $(LOG)
-
 db_SOURCES = db-test.cc
 db_LDADD =  $(LOG) -lpthread
 db_DEPENDENCIES = $(LOG)
-
-childtcpip_SOURCES = childtcpip.cc
-childtcpip_LDADD = ../../lib/tcpip.lo ../../lib/tcputil.lo $(LOG)
-childtcpip_DEPENDENCIES = ../../lib/tcpip.lo ../../lib/tcputil.lo $(LOG)

-----------------------------------------------------------------------

Summary of changes:
 rpm/powerguru.spec             | 48 +++++++++++++++++++++++++++++++-----------
 testsuite/libtests/Makefile.am | 14 +-----------
 2 files changed, 37 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
powerguru



reply via email to

[Prev in Thread] Current Thread [Next in Thread]