ACK because we talked about this change offline.
But you need to start including descriptions with these patches ;-)
On Fri, Oct 1, 2010 at 7:04 PM, Adam Stokes <astokes(a)fedoraproject.org> wrote:
---
matahari.init.in | 9 +++++----
matahari.spec | 7 +++++--
src/CMakeLists.txt | 6 +++---
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/matahari.init.in b/matahari.init.in
index def8c64..10b77fa 100644
--- a/matahari.init.in
+++ b/matahari.init.in
@@ -20,6 +20,7 @@
. @sysconfdir(a)/rc.d/init.d/functions
SERVICE=`basename "$0"`
+PROCESS=`echo "$SERVICE"d`
RETVAL=0
@@ -27,7 +28,7 @@ test -f @sysconfdir@/sysconfig/matahari && .
@sysconfdir@/sysconfig/matahari
start() {
echo -n $"Starting $SERVICE daemon: "
- daemon $SERVICE $MATAHARI_ARGS --daemon
+ daemon $PROCESS $MATAHARI_ARGS --daemon
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE
@@ -36,7 +37,7 @@ start() {
stop() {
echo -n $"Stopping $SERVICE daemon: "
- killproc $SERVICE
+ killproc $PROCESS
RETVAL=$?
echo
if [ $RETVAL -eq 0 ]; then
@@ -53,7 +54,7 @@ restart() {
reload() {
echo -n $"Reloading $SERVICE configuration: "
- killproc $SERVICE -HUP
+ killproc $PROCESS -HUP
RETVAL=$?
echo
return $RETVAL
@@ -65,7 +66,7 @@ case "$1" in
$1
;;
status)
- status $SERVICE
+ status $PROCESS
RETVAL=$?
;;
force-reload)
diff --git a/matahari.spec b/matahari.spec
index 11f9794..6155f59 100644
--- a/matahari.spec
+++ b/matahari.spec
@@ -1,5 +1,5 @@
%global specversion 1
-%global upstream_version 9fc30e4
+%global upstream_version 5e26232
# Keep around for when/if required
%global alphatag %{upstream_version}.git
@@ -92,8 +92,9 @@ test "x%{buildroot}" != "x" && rm -rf
%{buildroot}
%defattr(644, root, root, 755)
%dir %{_datadir}/matahari/
%{_datadir}/matahari/schema-host.xml
+%{_datadir}/matahari/schema-net.xml
-%attr(755, root, root) %{_sbindir}/matahari-host
+%attr(755, root, root) %{_sbindir}/matahari-hostd
%attr(755, root, root) %{_initddir}/matahari-host
%attr(755, root, root) %{_initddir}/matahari-broker
%config(noreplace) %{_sysconfdir}/sysconfig/matahari-host
@@ -103,6 +104,8 @@ test "x%{buildroot}" != "x" && rm -rf
%{buildroot}
%doc AUTHORS COPYING
%changelog
+* Fri Oct 01 2010 Adam Stokes <astokes(a)fedoraproject.org> - 0.4.0-0.1.5e26232.git
+- Add schema-net for network api
* Tue Sep 21 2010 Andrew Beekhof <andrew(a)beekhof.net> - 0.4.0-0.1.9fc30e4.git
- Pre-release of the new cross platform version of Matahari
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8fc2213..8cf9813 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,9 +15,9 @@ set(PCRE_PATH "D:/Users/mcpierce/Programming/pcre-7.0")
set(QPID_PATH "C:/Program Files/Apache/qpid-0.6")
# set service name var's
-set(M_HOST "matahari-host")
-set(M_NET "matahari-net")
-set(M_PKG "matahari-package")
+set(M_HOST "matahari-hostd")
+set(M_NET "matahari-netd")
+set(M_PKG "matahari-packaged")
set(M_VERSION
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
file(GLOB SCHEMAS "*.xml")
--
1.7.2.3
_______________________________________________
Matahari mailing list
Matahari(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/matahari