All of lore.kernel.org
 help / color / mirror / Atom feed
From: kupcevic@sourceware.org <kupcevic@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. ...
Date: 16 Aug 2006 06:34:22 -0000	[thread overview]
Message-ID: <20060816063422.5704.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-16 06:34:20

Modified files:
	.              : clustermon.spec.in.in conga.spec.in.in 
	ricci/modules/cluster: Makefile 
	ricci/modules/cluster/d-bus: modcluster.oddjob.conf 
	ricci/modules/log: Makefile 
	ricci/modules/log/d-bus: ricci-modlog.oddjob.conf 
	ricci/modules/rpm: Makefile 
	ricci/modules/rpm/d-bus: ricci-modrpm.oddjob.conf 
	ricci/modules/service: Makefile 
	ricci/modules/service/d-bus: ricci-modservice.oddjob.conf 
	ricci/modules/storage: Makefile 
	ricci/modules/storage/d-bus: ricci-modstorage.oddjob.conf 
	ricci/ricci    : Makefile ricci_defines.h 

Log message:
	Move proper binaries (the ones not to be directly run by the user)
	to /usr/libexec - fulfill packaging guidelines

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.30&r2=1.31
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/d-bus/modcluster.oddjob.conf.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/d-bus/ricci-modlog.oddjob.conf.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/d-bus/ricci-modrpm.oddjob.conf.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/d-bus/ricci-modservice.oddjob.conf.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/d-bus/ricci-modstorage.oddjob.conf.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/ricci_defines.h.diff?cvsroot=cluster&r1=1.7&r2=1.8

--- conga/clustermon.spec.in.in	2006/08/16 03:02:26	1.6
+++ conga/clustermon.spec.in.in	2006/08/16 06:34:19	1.7
@@ -88,7 +88,7 @@
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/modcluster.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/modcluster.systembus.conf
 			%{_sysconfdir}/rc.d/init.d/modclusterd
-			%{_sbindir}/modcluster
+			%{_libexecdir}/modcluster
 			%{_sbindir}/modclusterd
 			%{_docdir}/modcluster-%{version}/
 
@@ -206,6 +206,9 @@
 
 
 %changelog
+* Wed Aug 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-11.7
+- Move modcluster from /usr/sbin to /usr/libexec
+
 * Tue Aug 15 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-11.6
 - Implement support for Cluster Suite 5
 
--- conga/conga.spec.in.in	2006/08/16 03:08:43	1.30
+++ conga/conga.spec.in.in	2006/08/16 06:34:19	1.31
@@ -233,25 +233,24 @@
 			%{_sysconfdir}/rc.d/init.d/ricci
 %attr(-,ricci,ricci)	%{_localstatedir}/lib/ricci
 			%{_sbindir}/ricci
-%attr(4755,root,root)	%{_sbindir}/ricci-auth
-			%{_sbindir}/ricci-worker
+%attr(-,root,ricci)	%{_libexecdir}/ricci/
 			%{_docdir}/ricci-%{version}/
 # modrpm
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf
-			%{_sbindir}/ricci-modrpm
+			%{_libexecdir}/ricci-modrpm
 # modstorage
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
-			%{_sbindir}/ricci-modstorage
+			%{_libexecdir}/ricci-modstorage
 # modservice
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
-			%{_sbindir}/ricci-modservice
+			%{_libexecdir}/ricci-modservice
 # modlog
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
-			%{_sbindir}/ricci-modlog
+			%{_libexecdir}/ricci-modlog
 
 %pre -n ricci
 if [ "B`/bin/grep ricci\:x /etc/group`" = "B" ]; then
@@ -297,6 +296,10 @@
 
 
 %changelog
+* Wed Aug 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-11.7
+- Move ricci-modrpm, ricci-modlog, ricci-modstorage, ricci-modservice
+   from /usr/sbin to /usr/libexec
+
 * Wed Aug 09 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-11
 - Spin off clustermon.srpm (modcluster, cluster-snmp and 
    cluster-cim) from conga.srpm
--- conga/ricci/modules/cluster/Makefile	2006/08/15 04:15:53	1.13
+++ conga/ricci/modules/cluster/Makefile	2006/08/16 06:34:19	1.14
@@ -36,8 +36,8 @@
 
 
 install: 
-	$(INSTALL_DIR)  ${sbindir}
-	$(INSTALL_BIN)  ${TARGET} ${sbindir}
+	$(INSTALL_DIR)  ${libexecdir}
+	$(INSTALL_BIN)  ${TARGET} ${libexecdir}
 	$(INSTALL_DIR)  ${sysconfdir}/oddjobd.conf.d
 	$(INSTALL_FILE) d-bus/modcluster.oddjob.conf ${sysconfdir}/oddjobd.conf.d
 	$(INSTALL_DIR)  ${sysconfdir}/dbus-1/system.d
--- conga/ricci/modules/cluster/d-bus/modcluster.oddjob.conf	2006/08/09 20:53:22	1.1
+++ conga/ricci/modules/cluster/d-bus/modcluster.oddjob.conf	2006/08/16 06:34:19	1.2
@@ -4,7 +4,7 @@
 	<object name="/com/redhat/ricci">
 		<interface name="com.redhat.ricci">
 			<method name="modcluster_rw">
-				<helper exec="/usr/sbin/modcluster"
+				<helper exec="/usr/libexec/modcluster"
 					arguments="1"
 					prepend_user_name="no"
 					argument_passing_method="stdin"
@@ -12,7 +12,7 @@
 				<allow user="root"/>
 			</method>
 			<method name="modcluster_ro">
-				<helper exec="/usr/sbin/modcluster_ro"
+				<helper exec="/usr/libexec/modcluster_ro"
 					arguments="1"
 					prepend_user_name="no"
 					argument_passing_method="stdin"
--- conga/ricci/modules/log/Makefile	2006/08/15 04:15:53	1.5
+++ conga/ricci/modules/log/Makefile	2006/08/16 06:34:19	1.6
@@ -31,8 +31,8 @@
 
 
 install: 
-	$(INSTALL_DIR)  ${sbindir}
-	$(INSTALL_BIN)  ${TARGET} ${sbindir}
+	$(INSTALL_DIR)  ${libexecdir}
+	$(INSTALL_BIN)  ${TARGET} ${libexecdir}
 	$(INSTALL_DIR)  ${sysconfdir}/oddjobd.conf.d
 	$(INSTALL_FILE) d-bus/ricci-modlog.oddjob.conf ${sysconfdir}/oddjobd.conf.d
 	$(INSTALL_DIR)  ${sysconfdir}/dbus-1/system.d
--- conga/ricci/modules/log/d-bus/ricci-modlog.oddjob.conf	2006/06/15 03:08:36	1.1
+++ conga/ricci/modules/log/d-bus/ricci-modlog.oddjob.conf	2006/08/16 06:34:20	1.2
@@ -4,7 +4,7 @@
 	<object name="/com/redhat/ricci">
 		<interface name="com.redhat.ricci">
 			<method name="modlog_rw">
-				<helper exec="/usr/sbin/ricci-modlog"
+				<helper exec="/usr/libexec/ricci-modlog"
 					arguments="1"
 					prepend_user_name="no"
 					argument_passing_method="stdin"
@@ -12,7 +12,7 @@
 				<allow user="root"/>
 			</method>
 			<method name="modlog_ro">
-				<helper exec="/usr/sbin/ricci-modlog_ro"
+				<helper exec="/usr/libexec/ricci-modlog_ro"
 					arguments="1"
 					prepend_user_name="no"
 					argument_passing_method="stdin"
--- conga/ricci/modules/rpm/Makefile	2006/08/15 04:15:53	1.6
+++ conga/ricci/modules/rpm/Makefile	2006/08/16 06:34:20	1.7
@@ -32,8 +32,8 @@
 
 
 install: 
-	$(INSTALL_DIR)  ${sbindir}
-	$(INSTALL_BIN)  ${TARGET} ${sbindir}
+	$(INSTALL_DIR)  ${libexecdir}
+	$(INSTALL_BIN)  ${TARGET} ${libexecdir}
 	$(INSTALL_DIR)  ${sysconfdir}/oddjobd.conf.d
 	$(INSTALL_FILE) d-bus/ricci-modrpm.oddjob.conf ${sysconfdir}/oddjobd.conf.d
 	$(INSTALL_DIR)  ${sysconfdir}/dbus-1/system.d
--- conga/ricci/modules/rpm/d-bus/ricci-modrpm.oddjob.conf	2006/06/15 03:08:36	1.1
+++ conga/ricci/modules/rpm/d-bus/ricci-modrpm.oddjob.conf	2006/08/16 06:34:20	1.2
@@ -4,7 +4,7 @@
 	<object name="/com/redhat/ricci">
 		<interface name="com.redhat.ricci">
 			<method name="modrpm_rw">
-				<helper exec="/usr/sbin/ricci-modrpm"
+				<helper exec="/usr/libexec/ricci-modrpm"
 					arguments="1"
 					prepend_user_name="no"
 					argument_passing_method="stdin"
@@ -12,7 +12,7 @@
 				<allow user="root"/>
 			</method>
 			<method name="modrpm_ro">
-				<helper exec="/usr/sbin/ricci-modrpm_ro"
+				<helper exec="/usr/libexec/ricci-modrpm_ro"
 					arguments="1"
 					prepend_user_name="no"
 					argument_passing_method="stdin"
--- conga/ricci/modules/service/Makefile	2006/08/15 04:15:53	1.7
+++ conga/ricci/modules/service/Makefile	2006/08/16 06:34:20	1.8
@@ -31,8 +31,8 @@
 
 
 install: 
-	$(INSTALL_DIR)  ${sbindir}
-	$(INSTALL_BIN)  ${TARGET} ${sbindir}
+	$(INSTALL_DIR)  ${libexecdir}
+	$(INSTALL_BIN)  ${TARGET} ${libexecdir}
 	$(INSTALL_DIR)  ${sysconfdir}/oddjobd.conf.d
 	$(INSTALL_FILE) d-bus/ricci-modservice.oddjob.conf ${sysconfdir}/oddjobd.conf.d
 	$(INSTALL_DIR)  ${sysconfdir}/dbus-1/system.d
--- conga/ricci/modules/service/d-bus/ricci-modservice.oddjob.conf	2006/06/15 03:08:36	1.1
+++ conga/ricci/modules/service/d-bus/ricci-modservice.oddjob.conf	2006/08/16 06:34:20	1.2
@@ -4,7 +4,7 @@
 	<object name="/com/redhat/ricci">
 		<interface name="com.redhat.ricci">
 			<method name="modservice_rw">
-				<helper exec="/usr/sbin/ricci-modservice"
+				<helper exec="/usr/libexec/ricci-modservice"
 					arguments="1"
 					prepend_user_name="no"
 					argument_passing_method="stdin"
@@ -12,7 +12,7 @@
 				<allow user="root"/>
 			</method>
 			<method name="modservice_ro">
-				<helper exec="/usr/sbin/ricci-modservice_ro"
+				<helper exec="/usr/libexec/ricci-modservice_ro"
 					arguments="1"
 					prepend_user_name="no"
 					argument_passing_method="stdin"
--- conga/ricci/modules/storage/Makefile	2006/08/15 04:15:54	1.9
+++ conga/ricci/modules/storage/Makefile	2006/08/16 06:34:20	1.10
@@ -60,8 +60,8 @@
 
 
 install: 
-	$(INSTALL_DIR)  ${sbindir}
-	$(INSTALL_BIN)  ${TARGET} ${sbindir}
+	$(INSTALL_DIR)  ${libexecdir}
+	$(INSTALL_BIN)  ${TARGET} ${libexecdir}
 	$(INSTALL_DIR)  ${sysconfdir}/oddjobd.conf.d
 	$(INSTALL_FILE) d-bus/ricci-modstorage.oddjob.conf ${sysconfdir}/oddjobd.conf.d
 	$(INSTALL_DIR)  ${sysconfdir}/dbus-1/system.d
--- conga/ricci/modules/storage/d-bus/ricci-modstorage.oddjob.conf	2006/06/15 03:08:37	1.1
+++ conga/ricci/modules/storage/d-bus/ricci-modstorage.oddjob.conf	2006/08/16 06:34:20	1.2
@@ -4,7 +4,7 @@
 	<object name="/com/redhat/ricci">
 		<interface name="com.redhat.ricci">
 			<method name="modstorage_rw">
-				<helper exec="/usr/sbin/ricci-modstorage"
+				<helper exec="/usr/libexec/ricci-modstorage"
 					arguments="1"
 					prepend_user_name="no"
 					argument_passing_method="stdin"
@@ -12,7 +12,7 @@
 				<allow user="root"/>
 			</method>
 			<method name="modstorage_ro">
-				<helper exec="/usr/sbin/ricci-modstorage_ro"
+				<helper exec="/usr/libexec/ricci-modstorage_ro"
 					arguments="1"
 					prepend_user_name="no"
 					argument_passing_method="stdin"
--- conga/ricci/ricci/Makefile	2006/08/04 17:55:24	1.14
+++ conga/ricci/ricci/Makefile	2006/08/16 06:34:20	1.15
@@ -51,8 +51,9 @@
 install: 
 	$(INSTALL_DIR)  ${sbindir}
 	$(INSTALL_BIN)  ${TARGET} ${sbindir}
-	$(INSTALL_BIN)  ${TARGET_AUTH} ${sbindir}
-	$(INSTALL_BIN)  ${TARGET_WORKER} ${sbindir}
+	$(INSTALL_DIR)  ${libexecdir}/ricci
+	install -m 4755 ${TARGET_AUTH}   ${libexecdir}/ricci
+	$(INSTALL_BIN)  ${TARGET_WORKER} ${libexecdir}/ricci
 	$(INSTALL_DIR)  ${localstatedir}/lib/ricci/queue
 	$(INSTALL_DIR)  ${localstatedir}/lib/ricci/certs
 	$(INSTALL_FILE) cacert.config ${localstatedir}/lib/ricci/certs/
--- conga/ricci/ricci/ricci_defines.h	2006/06/09 16:32:19	1.7
+++ conga/ricci/ricci/ricci_defines.h	2006/08/16 06:34:20	1.8
@@ -36,8 +36,8 @@
 #define QUEUE_DIR_PATH     "/var/lib/ricci/queue/"
 #define QUEUE_LOCK_PATH    "/var/lib/ricci/queue/lock"
 
-#define AUTH_HELPER_PATH   "/usr/sbin/ricci-auth"
-#define RICCI_WORKER_PATH  "/usr/sbin/ricci-worker"
+#define AUTH_HELPER_PATH   "/usr/libexec/ricci/ricci-auth"
+#define RICCI_WORKER_PATH  "/usr/libexec/ricci/ricci-worker"
 
 
 #endif  // ricci_defines_h



             reply	other threads:[~2006-08-16  6:34 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-16  6:34 kupcevic [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-07-29 19:47 [Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. rmccabe
2008-07-28 17:49 rmccabe
2008-05-12 15:13 rmccabe
2008-04-18  3:31 rmccabe
2008-04-11  6:54 rmccabe
2008-04-11  6:48 rmccabe
2008-04-07 20:11 rmccabe
2008-02-12 17:40 rmccabe
2008-01-29 22:02 rmccabe
2007-08-20 16:23 rmccabe
2007-08-13 19:06 rmccabe
2007-08-09 22:02 rmccabe
2007-08-08 21:24 rmccabe
2007-06-27  7:43 rmccabe
2007-05-01 15:57 rmccabe
2007-04-11 20:15 rmccabe
2007-04-11 19:23 rmccabe
2007-03-20 20:52 kupcevic
2007-02-07  1:36 kupcevic
2007-02-05 22:01 kupcevic
2007-02-05 20:08 rmccabe
2007-02-05 12:12 kupcevic
2007-01-23 22:34 kupcevic
2007-01-17 16:36 kupcevic
2007-01-17 14:57 kupcevic
2007-01-17 14:32 kupcevic
2006-12-13 19:21 kupcevic
2006-12-12 13:53 kupcevic
2006-11-17 20:46 kupcevic
2006-11-17  0:59 kupcevic
2006-11-16 19:35 kupcevic
2006-11-02  0:46 rmccabe
2006-11-01 23:11 kupcevic
2006-11-01 20:43 rmccabe
2006-10-31 20:34 kupcevic
2006-10-25 18:47 rmccabe
2006-10-25 16:35 kupcevic
2006-10-16 21:01 kupcevic
2006-10-16 15:56 kupcevic
2006-10-04 16:32 kupcevic
2006-09-26  5:21 kupcevic
2006-08-22 23:01 kupcevic
2006-08-22 20:12 kupcevic
2006-08-15  4:15 kupcevic
2006-08-09 21:13 kupcevic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060816063422.5704.qmail@sourceware.org \
    --to=kupcevic@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.