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

[Cluster-devel] conga autogen.sh conga.spec.in.in download_files



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic sourceware org	2006-08-16 03:08:44

Modified files:
	.              : autogen.sh conga.spec.in.in download_files 

Log message:
	Fix issues blocking inclusion of Conga into 5E
	(one thing left to be done - use libexecdir)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/autogen.sh.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.29&r2=1.30
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/download_files.diff?cvsroot=cluster&r1=1.1&r2=1.2

--- conga/autogen.sh	2006/08/09 20:53:21	1.4
+++ conga/autogen.sh	2006/08/16 03:08:43	1.5
@@ -74,11 +74,11 @@
 
 if [ "$INCLUDE_ZOPE_PLONE" = "yes" ] ; then
     get_and_verify_archive \
-	$ZOPE_ARCHIVE.tgz \
+	$ZOPE_ARCHIVE_TAR \
 	$ZOPE_MD5SUM \
 	$ZOPE_URLs
     get_and_verify_archive \
-	$PLONE_ARCHIVE.tar.gz \
+	$PLONE_ARCHIVE_TAR \
 	$PLONE_MD5SUM \
 	$PLONE_URLs
 fi
@@ -92,7 +92,9 @@
     | sed -e s/@@REL@@/$RELEASE/g \
     | sed -e s/@@INCLUDE_ZOPE_AND_PLONE@@/$INCLUDE_ZOPE_PLONE/g \
     | sed -e s/@@ZOPE_ARCHIVE@@/$ZOPE_ARCHIVE/g \
+    | sed -e s/@@ZOPE_ARCHIVE_TAR@@/$ZOPE_ARCHIVE_TAR/g \
     | sed -e s/@@PLONE_ARCHIVE@@/$PLONE_ARCHIVE/g \
+    | sed -e s/@@PLONE_ARCHIVE_TAR@@/$PLONE_ARCHIVE_TAR/g \
     > conga.spec
 
 cat clustermon.spec.in.in \
--- conga/conga.spec.in.in	2006/08/15 04:15:51	1.29
+++ conga/conga.spec.in.in	2006/08/16 03:08:43	1.30
@@ -12,15 +12,6 @@
 
 
 %define include_zope_and_plone     @@INCLUDE_ZOPE_AND_PLONE@@
-%define zope_archive               @@ZOPE_ARCHIVE@@
-%define plone_archive              @@PLONE_ARCHIVE@@
-%define zope_archive_file          %{zope_archive}.tgz
-%define plone_archive_file         %{plone_archive}.tar.gz
-
-
-%define PEGASUS_PROVIDERS_DIR %{_libdir}/Pegasus/providers
-
-
 
 
 
@@ -34,19 +25,18 @@
 URL: http://sources.redhat.com/cluster/conga
 
 Group: System Environment/Base
-Summary: Conga Remote Management System - source code
+Summary: Remote Management System
 
 Source0: %{name}-%{version}.tar.gz
-%if "%{include_zope_and_plone}" == yes
-Source1: %{zope_archive_file}
-Source2: %{plone_archive_file}
+%if "%{include_zope_and_plone}" == "yes"
+Source1: @@ZOPE_ARCHIVE_TAR@@
+Source2: @@PLONE_ARCHIVE_TAR@@
 Patch2:  Plone-2.5_CMFPlone.patch
 %endif
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
-%if "%{include_zope_and_plone}" == yes
-BuildRequires: python >= 2.4.1
+%if "%{include_zope_and_plone}" == "yes"
 BuildRequires: python-devel >= 2.4.1
 %endif
 BuildRequires: glibc-devel gcc-c++ libxml2-devel make
@@ -57,23 +47,19 @@
 It consists of luci, https frontend, and ricci, secure daemon that dispatches 
 incoming messages to underlying management modules. 
 
-This package contains source code of Conga and 
-Red Hat Enterprise Linux Cluster Suite ricci/SNMP/CIM module/agent/provider. 
-
 
 %prep
 %setup -q
-%if "%{include_zope_and_plone}" == yes
-CURRENT_DIR=`pwd`
+%if "%{include_zope_and_plone}" == "yes"
 # Zope
 %setup -q -T -D -a 1
-ln -s ../%{zope_archive} luci/zope
+ln -s ../@@ZOPE_ARCHIVE@@ luci/zope
 # Plone
 %setup -q -T -D -a 2
-ln -s ../%{plone_archive} luci/plone
-cd luci/plone
+ln -s ../@@PLONE_ARCHIVE@@ luci/plone
+pushd luci/plone
 %patch2 -p1
-cd $CURRENT_DIR
+popd
 %endif
 
 
@@ -82,7 +68,6 @@
 #./configure --arch=%{_arch} --sbindir=%{_sbindir} --libdir=%{_libdir} --docdir=%{_docdir}
 %configure      --arch=%{_arch} \
 		--docdir=%{_docdir} \
-		--pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
 		--include_zope_and_plone=%{include_zope_and_plone}
 #make %{?_smp_mflags}
 make conga
@@ -106,11 +91,12 @@
 
 
 %package -n luci
+
 Group: System Environment/Base
-Summary: Conga Remote Management System - Management Station
-URL: http://sources.redhat.com/cluster/conga
+Summary: Remote Management System - Management Station
+
 Requires: chkconfig initscripts
-%if "%{include_zope_and_plone}" == yes
+%if "%{include_zope_and_plone}" == "yes"
 Requires: python >= 2.4.1
 %else
 Requires: python
@@ -121,6 +107,10 @@
 Requires: sed util-linux
 Requires: ricci = %{version}-%{release}
 
+Requires(pre): grep shadow-utils
+Requires(post): chkconfig initscripts
+Requires(preun): chkconfig initscripts
+
 
 %description -n luci
 Conga is a project developing management system for remote stations. 
@@ -137,55 +127,55 @@
 				%{_sbindir}/luci_admin
 				%{_docdir}/luci-%{version}/
 %defattr(-,luci,luci)
-%if "%{include_zope_and_plone}" == yes
+%if "%{include_zope_and_plone}" == "yes"
 				%{_libdir}/luci/
 %endif
 				%{_localstatedir}/lib/luci
 
 %pre -n luci
-/usr/sbin/groupadd -r -f luci >/dev/null 2>&1
-/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >/dev/null 2>&1
-exit 0
+if [ "B`/bin/grep luci\:x /etc/group`" = "B" ]; then
+   /usr/sbin/groupadd -r -f luci >/dev/null 2>&1
+fi
+if [ "B`/bin/grep luci\:x /etc/passwd`" = "B" ]; then
+   /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >/dev/null 2>&1
+fi
 
 %post -n luci
-/sbin/chkconfig --add luci
+/sbin/chkconfig --list luci >/dev/null 2>&1
+if [ "1$?" != "10" ]; then
+   /sbin/chkconfig --add luci
+fi
 /sbin/service luci status >/dev/null 2>&1
 LUCI_RUNNING=$?
-if [ "$LUCI_RUNNING" = "0" ]; then
+if [ "1$LUCI_RUNNING" = "10" ]; then
    /sbin/service luci stop >/dev/null 2>&1
 fi
 if [ -e /var/lib/luci/var/luci_backup.xml ]; then
+   # restore luci database
    /usr/sbin/luci_admin restore >/dev/null 2>&1
 fi
 if [ ! -e /var/lib/luci/var/certs/privkey.pem ]; then
-   # no privkey.pem -> luci not initialized
+   # no privkey.pem => luci not initialized => admin has default password
    /usr/sbin/luci_admin password --random >/dev/null 2>&1
 fi
-if [ "$LUCI_RUNNING" = "0" ]; then
+if [ "1$LUCI_RUNNING" = "10" ]; then
    /sbin/service luci start >/dev/null 2>&1
 fi
 
-
 %preun -n luci
+if [ "$1" = "0" ]; then
+   /sbin/service luci stop >/dev/null 2>&1
+   /sbin/chkconfig --del luci
+fi
 /sbin/service luci status >/dev/null 2>&1
 LUCI_RUNNING=$?
-if [ "$LUCI_RUNNING" = "0" ]; then
+if [ "1$LUCI_RUNNING" = "10" ]; then
    /sbin/service luci stop >/dev/null 2>&1
 fi
 /usr/sbin/luci_admin backup >/dev/null 2>&1
-if [ "$LUCI_RUNNING" = "0" ]; then
+if [ "1$LUCI_RUNNING" = "10" ]; then
    /sbin/service luci start >/dev/null 2>&1
 fi
-if [ "$1" = "0" ]; then
-   /sbin/service luci stop >/dev/null 2>&1
-   /sbin/chkconfig --del luci
-fi
-
-%postun -n luci
-if [ "$1" -ge "1" ]; then
-   /sbin/service luci condrestart > /dev/null 2>&1
-fi
-exit 0
 
 
 
@@ -194,11 +184,11 @@
 
 
 %package -n ricci
+
 Group: System Environment/Base
-Summary: Conga Remote Management System - Managed Station
-URL: http://sources.redhat.com/cluster/conga
+Summary: Remote Management System - Managed Station
 
-Requires: chkconfig initscripts
+Requires: initscripts
 Requires: oddjob dbus openssl pam
 Requires: sed util-linux
 Requires: modcluster = %{version}-%{release}
@@ -210,7 +200,7 @@
 Provides: ricci-modrpm = %{version}-%{release}
 
 # modstorage
-Requires: parted
+Requires: parted util-linux
 Provides: ricci-modstorage = %{version}-%{release}
 
 # modservice
@@ -220,6 +210,11 @@
 # modlog
 Provides: ricci-modlog = %{version}-%{release}
 
+Requires(pre): grep shadow-utils
+Requires(post): chkconfig initscripts util-linux sed SysVinit
+Requires(preun): chkconfig initscripts
+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 
@@ -259,47 +254,40 @@
 			%{_sbindir}/ricci-modlog
 
 %pre -n ricci
-/usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
-/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >/dev/null 2>&1
-exit 0
+if [ "B`/bin/grep ricci\:x /etc/group`" = "B" ]; then
+   /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
+fi
+if [ "B`/bin/grep ricci\:x /etc/passwd`" = "B" ]; then
+   /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >/dev/null 2>&1
+fi
 
 %post -n ricci
-/sbin/chkconfig --add ricci
-if [ ! -e /var/lib/ricci/certs/privkey.pem ]; then
-	/usr/bin/openssl genrsa -out /var/lib/ricci/certs/privkey.pem 2048 > /dev/null 2>&1
-	/usr/bin/openssl req -new -x509 -key /var/lib/ricci/certs/privkey.pem \
-	-out /var/lib/ricci/certs/cacert.pem -days 1095 -config /var/lib/ricci/certs/cacert.config
-	/bin/chown ricci:root /var/lib/ricci/certs/*.pem
-	/bin/chmod 644 /var/lib/ricci/certs/cacert.pem
-	/bin/chmod 600 /var/lib/ricci/certs/privkey.pem
+/sbin/chkconfig --list ricci >/dev/null 2>&1
+if [ "1$?" != "10" ]; then
+   /sbin/chkconfig --add ricci
 fi
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
+
+# start ricci only if explicitly enabled (in current runlevel)
 RUNS=(`/sbin/runlevel`)
 RUNLEVEL=${RUNS[1]}
 STATE=`/sbin/chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
-if [ $STATE = "on" ]; then
-   /sbin/service ricci restart > /dev/null 2>&1
+if [ "1$STATE" = "1on" ]; then
+   /sbin/service ricci start > /dev/null 2>&1
 fi
 
 %preun -n ricci
-if [ "$1" = "0" ]; then
-   /sbin/service ricci stop > /dev/null 2>&1
+/sbin/service ricci stop > /dev/null 2>&1
+if [ "1$1" = "10" ]; then
    /sbin/chkconfig --del ricci
 fi
 
 %postun -n ricci
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-if [ "$1" -ge "1" ]; then
-   RUNS=(`/sbin/runlevel`)
-   RUNLEVEL=${RUNS[1]}
-   STATE=`/sbin/chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
-   if [ $STATE = "on" ]; then
-      /sbin/service ricci restart > /dev/null 2>&1
-   fi
+if [ "1$1" = "10" ]; then
+   /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+   /sbin/service oddjobd reload > /dev/null 2>&1
 fi
-exit 0
 
 
 
@@ -310,31 +298,42 @@
 
 %changelog
 * Wed Aug 09 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-11
-- Separate clustermon.srpm (modcluster, cluster-snmp and 
+- Spin off clustermon.srpm (modcluster, cluster-snmp and 
    cluster-cim) from conga.srpm
 - Luci: tighten down security
+
 * Thu Aug 03 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-10
 - Luci: fix login issues, add cluster resources, styling... 
+
 * Wed Jul 26 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-9
 - Update Luci to Plone 2.5
+
 * Tue Jul 25 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-8
 - New build with a lot of implementation details on Luci
 - Last build with plone 2.1.2
+
 * Thu Jul 06 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-7
 - More compliant specfile, minor fixes
+
 * Tue Jun 27 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-6
 - Luci persists users/clusters/systems/permissions across upgrades 
+
 * Fri Jun 16 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-4
 - Moved storage, service, log and rpm modules into main ricci.rpm
+
 * Wed Jun 14 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-1
 - Packaged cluster-snmp (cluster snmp agent)
 - Packaged cluster-cim (cluster CIM provider)
+
 * Mon Jun 06 2006 Stanko Kupcevic <kupcevic redhat com> 0.7-5
 - Disable non-https access to Luci, enable https on port 8084
+
 * Mon Jun 02 2006 Stanko Kupcevic <kupcevic redhat com> 0.7-1
 - Packaged Luci - ricci's www frontend
 - Added logging module
+
 * Mon May 26 2006 Stanko Kupcevic <kupcevic redhat com> 0.6-1
 - Multitude of fixes and new features
+
 * Mon Apr 10 2006 Stanko Kupcevic <kupcevic redhat com> 0.5-1
-- First official build of ricci project
+- First official build of conga project
--- conga/download_files	2006/07/24 20:17:01	1.1
+++ conga/download_files	2006/08/16 03:08:43	1.2
@@ -3,18 +3,21 @@
 
 
 ZOPE_ARCHIVE=Zope-2.9.3
+ZOPE_ARCHIVE_TAR=Zope-2.9.3.tgz
 ZOPE_MD5SUM=4e8b4e076cadd6eb62dd4513748cb9f9
 ZOPE_URLs="http://www.zope.org/Products/Zope/2.9.3/Zope-2.9.3.tgz";
 
 
 # don't use 2.9.4 yet, try to track FC6 so we have as little changes as possible
 #ZOPE_ARCHIVE=Zope-2.9.4-final
+#ZOPE_ARCHIVE_TAR=Zope-2.9.4-final.tgz
 #ZOPE_MD5SUM=7d7ffe62eabc84d0c438e450e344c29f
 #ZOPE_URLs="http://www.zope.org/Products/Zope/2.9.4/Zope-2.9.4-final.tgz";
 
 
 
 PLONE_ARCHIVE=Plone-2.5
+PLONE_ARCHIVE_TAR=Plone-2.5.tar.gz
 PLONE_MD5SUM=0a385a1a4afbf940bb4e094ce5dcb583
 PLONE_URLs="http://superb-west.dl.sourceforge.net/sourceforge/plone/Plone-2.5.tar.gz \
 	    http://superb-east.dl.sourceforge.net/sourceforge/plone/Plone-2.5.tar.gz \


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