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

[Cluster-devel] conga clustermon.spec.in.in conga.spec.in.in



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe sourceware org	2007-07-16 21:11:18

Modified files:
	.              : clustermon.spec.in.in conga.spec.in.in 

Log message:
	Insure correct permissions are set on %{_libdir}/luci when installing from rpm.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.30&r2=1.31
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.78&r2=1.79

--- conga/clustermon.spec.in.in	2007/05/03 19:55:10	1.30
+++ conga/clustermon.spec.in.in	2007/07/16 21:11:18	1.31
@@ -34,7 +34,7 @@
 BuildRequires: net-snmp-devel tog-pegasus-devel
 
 %description
-This package contains Red Hat Enterprise Linux Cluster Suite 
+This package contains Red Hat Enterprise Linux Cluster Suite
 SNMP/CIM module/agent/provider.
 
 
@@ -42,7 +42,7 @@
 %setup -q
 
 %build
-%configure      --arch=%{_arch} \
+%configure		--arch=%{_arch} \
 		--docdir=%{_docdir} \
 		--pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
 		--include_zope_and_plone=no
@@ -96,18 +96,18 @@
 
 %preun -n modcluster
 if [ "$1" == "0" ]; then
-   /sbin/service modclusterd stop > /dev/null 2>&1
-   /sbin/chkconfig --del modclusterd
+	/sbin/service modclusterd stop > /dev/null 2>&1
+	/sbin/chkconfig --del modclusterd
 fi
 
 %postun -n modcluster
 if [ "$1" == "0" ]; then
-   DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
-   /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
-   /sbin/service oddjobd reload > /dev/null 2>&1
+	DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
+	/bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
+	/sbin/service oddjobd reload > /dev/null 2>&1
 fi
 if [ "$1" == "1" ]; then
-   /sbin/service modclusterd condrestart > /dev/null 2>&1
+	/sbin/service modclusterd condrestart > /dev/null 2>&1
 fi
 
 
@@ -121,7 +121,7 @@
 Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
 
 Requires: modcluster = %{version}-%{release}
-Requires: net-snmp 
+Requires: net-snmp
 Requires: oddjob openssl
 Requires(post): initscripts
 Requires(postun): initscripts
@@ -143,7 +143,7 @@
 %postun -n cluster-snmp
 # don't restart snmpd twice on upgrades
 if [ "$1" == "0" ]; then
-   /sbin/service snmpd condrestart > /dev/null 2>&1
+	/sbin/service snmpd condrestart > /dev/null 2>&1
 fi
 
 
@@ -158,14 +158,14 @@
 Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
 
 Requires: modcluster = %{version}-%{release}
-Requires: tog-pegasus 
+Requires: tog-pegasus
 Requires: oddjob openssl
 Requires(post): initscripts
 Requires(postun): initscripts
 Conflicts: clumon-cim
 
 %description -n cluster-cim
-CIM provider for Red Hat Enterprise Linux Cluster Suite. 
+CIM provider for Red Hat Enterprise Linux Cluster Suite.
 
 %files -n cluster-cim
 %defattr(-,root,root)
@@ -179,7 +179,7 @@
 %postun -n cluster-cim
 # don't restart pegasus twice on upgrades
 if [ "$1" == "0" ]; then
-   /sbin/service tog-pegasus condrestart > /dev/null 2>&1
+	/sbin/service tog-pegasus condrestart > /dev/null 2>&1
 fi
 # pegasus might not be running, don't fail %postun
 exit 0
--- conga/conga.spec.in.in	2007/06/25 16:03:37	1.78
+++ conga/conga.spec.in.in	2007/07/16 21:11:18	1.79
@@ -11,7 +11,7 @@
 ###############################################################################
 
 
-%define include_zope_and_plone     @@INCLUDE_ZOPE_AND_PLONE@@
+%define include_zope_and_plone	@@INCLUDE_ZOPE_AND_PLONE@@
 
 
 
@@ -38,15 +38,15 @@
 
 BuildRequires: python-devel >= 2.4.1
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
-#BuildRequires: pam-devel
+BuildRequires: cman-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openssl-devel dbus-devel pkgconfig file
 
 
 %description
-Conga is a project developing management system for remote stations. 
-It consists of luci, https frontend, and ricci, secure daemon that dispatches 
-incoming messages to underlying management modules. 
+Conga is a project developing management system for remote stations.
+It consists of luci, https frontend, and ricci, secure daemon that dispatches
+incoming messages to underlying management modules.
 
 
 %prep
@@ -64,7 +64,7 @@
 %endif
 
 %build
-%configure      --arch=%{_arch} \
+%configure		--arch=%{_arch} \
 		--docdir=%{_docdir} \
 		--include_zope_and_plone=%{include_zope_and_plone}
 make %{?_smp_mflags} conga
@@ -101,7 +101,7 @@
 Requires: zope
 Requires: plone >= 2.5
 %endif
-Requires: grep openssl mailcap stunnel 
+Requires: grep openssl mailcap stunnel
 Requires: sed util-linux
 
 Requires(pre): grep shadow-utils
@@ -110,9 +110,9 @@
 
 
 %description -n luci
-Conga is a project developing management system for remote stations. 
-It consists of luci, https frontend, and ricci, secure daemon that 
-dispatches incoming messages to underlying management modules. 
+Conga is a project developing management system for remote stations.
+It consists of luci, https frontend, and ricci, secure daemon that
+dispatches incoming messages to underlying management modules.
 
 This package contains Luci website.
 
@@ -123,6 +123,8 @@
 				%{_sysconfdir}/rc.d/init.d/luci
 				%{_sbindir}/luci_admin
 				%{_docdir}/luci-%{version}/
+%defattr(0755,root,root)
+				%{_libdir}/luci/
 %defattr(-,luci,luci)
 				%{_localstatedir}/lib/luci
 				%{_libdir}/luci/ssl
@@ -132,10 +134,10 @@
 
 %pre -n luci
 if ! /bin/grep ^luci\:x /etc/group >&/dev/null; then
-   /usr/sbin/groupadd -r -f luci >&/dev/null
+	/usr/sbin/groupadd -r -f luci >&/dev/null
 fi
 if ! /bin/grep ^luci\:x /etc/passwd >&/dev/null; then
-   /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null
+	/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null
 fi
 
 %post -n luci
@@ -143,36 +145,37 @@
 /sbin/service luci status >&/dev/null
 LUCI_RUNNING=$?
 if [ "$LUCI_RUNNING" == "0" ]; then
-   /sbin/service luci stop >&/dev/null
+	/sbin/service luci stop >&/dev/null
 fi
 if [ -f /var/lib/luci/var/luci_backup.xml ]; then
-   # restore luci database
-   /usr/sbin/luci_admin restore >&/dev/null
+	# restore luci database
+	/usr/sbin/luci_admin restore >&/dev/null
 fi
 
 # set initial admin password (if not already set) to random value
 grep True /var/lib/luci/.default_password_has_been_reset >&/dev/null
 if [ $? -ne 0 ]; then
-   /usr/sbin/luci_admin password --random >&/dev/null &&
-   rm -f /var/lib/luci/var/Data.fs.index /var/lib/luci/var/Data.fs.tmp /var/lib/luci/var/Data.fs.old
+	/usr/sbin/luci_admin password --random >&/dev/null &&
+		rm -f /var/lib/luci/var/Data.fs.index /var/lib/luci/var/Data.fs.tmp /var/lib/luci/var/Data.fs.old
+	find %{_libdir}/luci/zope/var -print0 2>/dev/null | xargs -0 chown luci:
 fi
 if [ "$LUCI_RUNNING" == "0" ]; then
-   /sbin/service luci start >&/dev/null
+	/sbin/service luci start >&/dev/null
 fi
 
 %preun -n luci
 if [ "$1" == "0" ]; then
-   /sbin/service luci stop >&/dev/null
-   /sbin/chkconfig --del luci
+	/sbin/service luci stop >&/dev/null
+	/sbin/chkconfig --del luci
 fi
 /sbin/service luci status >&/dev/null
 LUCI_RUNNING=$?
 if [ "$LUCI_RUNNING" == "0" ]; then
-   /sbin/service luci stop >&/dev/null
+	/sbin/service luci stop >&/dev/null
 fi
 /usr/sbin/luci_admin backup >&/dev/null
 if [ "$LUCI_RUNNING" == "0" ]; then
-   /sbin/service luci start >&/dev/null
+	/sbin/service luci start >&/dev/null
 fi
 
 
@@ -210,12 +213,12 @@
 Requires(postun): initscripts util-linux
 
 %description -n ricci
-Conga is a project developing management system for remote stations. 
-It consists of luci, https frontend, and ricci, secure daemon that dispatches 
-incoming messages to underlying management modules. 
+Conga is a project developing management system for remote stations.
+It consists of luci, https frontend, and ricci, secure daemon that dispatches
+incoming messages to underlying management modules.
 
-This package contains listening daemon (dispatcher), as well as 
-reboot, rpm, storage, service and log management modules. 
+This package contains listening daemon (dispatcher), as well as
+reboot, rpm, storage, service and log management modules.
 
 
 %files -n ricci
@@ -248,10 +251,10 @@
 
 %pre -n ricci
 if ! /bin/grep ^ricci\:x /etc/group >&/dev/null; then
-   /usr/sbin/groupadd -r -f ricci >&/dev/null
+	/usr/sbin/groupadd -r -f ricci >&/dev/null
 fi
 if ! /bin/grep ^ricci\:x /etc/passwd >&/dev/null; then
-   /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >&/dev/null
+	/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >&/dev/null
 fi
 
 %post -n ricci
@@ -262,18 +265,18 @@
 
 %preun -n ricci
 if [ "$1" == "0" ]; then
-   /sbin/service ricci stop >&/dev/null
-   /sbin/chkconfig --del ricci
+	/sbin/service ricci stop >&/dev/null
+	/sbin/chkconfig --del ricci
 fi
 
 %postun -n ricci
 if [ "$1" == "0" ]; then
-   DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
-   /bin/kill -s SIGHUP $DBUS_PID >&/dev/null
-   /sbin/service oddjobd reload >&/dev/null
+	DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
+	/bin/kill -s SIGHUP $DBUS_PID >&/dev/null
+	/sbin/service oddjobd reload >&/dev/null
 fi
 if [ "$1" == "1" ]; then
-   /sbin/service ricci condrestart >&/dev/null
+	/sbin/service ricci condrestart >&/dev/null
 fi
 
 


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