rpms/conga/FC-5 conga.spec,1.4,1.5 sources,1.5,1.6

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jul 25 21:05:21 UTC 2006 

Author: kupcevic

Update of /cvs/dist/rpms/conga/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19229/FC-5

Modified Files:
	conga.spec sources 
Log Message:
auto-import conga-0.8-8 on branch FC-5 from conga-0.8-8.src.rpm


Index: conga.spec
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/conga.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- conga.spec	27 Jun 2006 21:58:36 -0000	1.4
+++ conga.spec	25 Jul 2006 21:05:07 -0000	1.5
@@ -11,18 +11,21 @@
 ###############################################################################
 
 %define vers 0.8
-%define rel 6.FC5
+%define rel  8%{?dist}
 
+%define include_zope_and_plone     no
+%define zope_archive               Zope-2.9.3
+%define plone_archive              Plone-2.5
+%define zope_archive_file          %{zope_archive}.tgz
+%define plone_archive_file         %{plone_archive}.tar.gz
 
-%ifarch x86_64
-%define _libdir /usr/lib64
-%endif
 
 %define PEGASUS_PROVIDERS_DIR %{_libdir}/Pegasus/providers
 
 
 
 
+
 ############  SRPM  ###################
 
 
@@ -30,13 +33,24 @@
 Version: %vers
 Release: %rel
 License: GPL
+URL: http://sources.redhat.com/cluster/conga
 
 Group: System Environment/Base
-Summary: conga source rpm
+Summary: Conga Remote Management System - source code
 
-Source: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
+%if "%{include_zope_and_plone}" == yes
+Source1: %{zope_archive_file}
+Source2: %{plone_archive_file}
+Patch2:  Plone-2.5_Marhsall_ro_file.patch
+%endif
 Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
 
+
+%if "%{include_zope_and_plone}" == yes
+BuildRequires: python >= 2.4.1
+BuildRequires: python-devel >= 2.4.1
+%endif
 BuildRequires: glibc-devel gcc-c++ libxml2-devel make
 BuildRequires: openssl-devel dbus-devel pam-devel
 BuildRequires: net-snmp-devel tog-pegasus-devel
@@ -52,17 +66,37 @@
 
 %prep
 %setup -q
+%if "%{include_zope_and_plone}" == yes
+CURRENT_DIR=`pwd`
+# Zope
+%setup -q -T -D -a 1
+ln -s ../%{zope_archive} luci/zope
+# Plone
+%setup -q -T -D -a 2
+ln -s ../%{plone_archive} luci/plone
+cd luci/plone
+%patch2 -p1
+rm -rf Five README.txt
+cd $CURRENT_DIR
+%endif
+
 
 %build
-#./autogen.sh
+rm -rf $RPM_BUILD_ROOT
 #./configure --arch=%{_arch} --sbindir=%{_sbindir} --libdir=%{_libdir} --docdir=%{_docdir}
-%configure --arch=%{_arch} --docdir=%{_docdir} --pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR}
+%configure      --arch=%{_arch} \
+		--docdir=%{_docdir} \
+		--pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
+		--include_zope_and_plone=%{include_zope_and_plone}
+#make %{?_smp_mflags}
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -77,37 +111,44 @@
 
 %package -n luci
 Group: System Environment/Base
-Summary: luci
+Summary: Conga Remote Management System - Management Station
+URL: http://sources.redhat.com/cluster/conga
 Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: python zope plone
-Requires: openssl mailcap stunnel
-Requires: ricci 
-Provides: luci 
+%if "%{include_zope_and_plone}" == yes
+Requires: python >= 2.4.1
+%else
+Requires: python
+Requires: zope
+Requires: plone
+%endif
+Requires: openssl mailcap stunnel 
+Requires: sed util-linux
+Requires: ricci = %{version}-%{release}
 
 
 %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. 
+It consists of luci, https frontend, and ricci, secure daemon that 
+dispatches incoming messages to underlying management modules. 
 
 This package contains Luci website.
 
 
 %files -n luci
 %defattr(-,root,root)
-%config				%{_sysconfdir}/rc.d/init.d/luci
 %config(noreplace)		%{_sysconfdir}/sysconfig/luci
+				%{_sysconfdir}/rc.d/init.d/luci
 				%{_sbindir}/luci_admin
-%attr(-,luci,root)		%{_localstatedir}/lib/luci
-%attr(600,luci,root)%config	%{_localstatedir}/lib/luci/var/Data.fs
-%config				%{_localstatedir}/lib/luci/etc/zope.conf
-%config(noreplace)		%{_localstatedir}/lib/luci/etc/logrotate.conf
-%config				%{_localstatedir}/lib/luci/etc/stunnel.conf
+%if "%{include_zope_and_plone}" == yes
+				%{_libdir}/luci/
+%endif
+				%{_docdir}/luci-%{version}/
+%defattr(-,luci,root)
+				%{_localstatedir}/lib/luci
 
 %pre -n luci
 /usr/sbin/groupadd -r -f luci >/dev/null 2>&1
-/usr/sbin/useradd -r -M -s /sbin/nologin -g luci 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
 
 %post -n luci
@@ -165,32 +206,30 @@
 
 %package -n ricci
 Group: System Environment/Base
-Summary: Remote management system, including basic management modules
+Summary: Conga Remote Management System - Managed Station
+URL: http://sources.redhat.com/cluster/conga
+
 Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: oddjob dbus libxml2 openssl pam
-Requires: ricci = %{version}-%{release}
-Requires: ricci-modrpm = %{version}-%{release}
-Requires: ricci-modstorage = %{version}-%{release}
-Requires: ricci-modservice = %{version}-%{release}
-Requires: ricci-modlog = %{version}-%{release}
+Requires: oddjob dbus openssl pam
+Requires: sed util-linux
 Requires: ricci-modcluster = %{version}-%{release}
 
-Provides: ricci ricci-modreboot 
+# modreboot
+Provides: ricci-modreboot = %{version}-%{release}
 
 # modrpm
-Provides: ricci-modrpm 
+Provides: ricci-modrpm = %{version}-%{release}
 
 # modstorage
 Requires: parted
-Provides: ricci-modstorage
+Provides: ricci-modstorage = %{version}-%{release}
 
 # modservice
 Requires: chkconfig initscripts
-Provides: ricci-modservice
+Provides: ricci-modservice = %{version}-%{release}
 
 # modlog
-Provides: ricci-modlog
+Provides: ricci-modlog = %{version}-%{release}
 
 %description -n ricci
 Conga is a project developing management system for remote stations. 
@@ -203,41 +242,40 @@
 
 %files -n ricci
 %defattr(-,root,root)
-
 # ricci
-#%doc README COPYING
-%config			%{_sysconfdir}/rc.d/init.d/ricci
 %config(noreplace)	%{_sysconfdir}/pam.d/ricci
-			%{_sysconfdir}/oddjobd.conf.d/ricci.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf
+			%{_sysconfdir}/rc.d/init.d/ricci
 %attr(-,ricci,root)	%{_localstatedir}/lib/ricci
 			%{_sbindir}/ricci
 %attr(4755,root,root)	%{_sbindir}/ricci-auth
 			%{_sbindir}/ricci-worker
+			%{_docdir}/ricci-%{version}/
 # modrpm
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf
 			%{_sbindir}/ricci-modrpm
 			%{_sbindir}/ricci-modrpm.exe
 # modstorage
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
 			%{_sbindir}/ricci-modstorage
 			%{_sbindir}/ricci-modstorage.exe
 # modservice
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
 			%{_sbindir}/ricci-modservice
 			%{_sbindir}/ricci-modservice.exe
 # modlog
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
 			%{_sbindir}/ricci-modlog
 			%{_sbindir}/ricci-modlog.exe
 
 %pre -n ricci
 /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
-/usr/sbin/useradd -r -M -s /sbin/nologin -g ricci 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
 
 %post -n ricci
@@ -252,9 +290,9 @@
 fi
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
-RUNS=(`runlevel`)
+RUNS=(`/sbin/runlevel`)
 RUNLEVEL=${RUNS[1]}
-STATE=`chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\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
@@ -269,9 +307,9 @@
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
 if [ "$1" -ge "1" ]; then
-   RUNS=(`runlevel`)
+   RUNS=(`/sbin/runlevel`)
    RUNLEVEL=${RUNS[1]}
-   STATE=`chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\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
@@ -286,11 +324,12 @@
 
 %package -n ricci-modcluster
 Group: System Environment/Base
-Summary: ricci-modcluster summary
+Summary: Conga Remote Management System - Managed Clustered Station
+URL: http://sources.redhat.com/cluster/conga
+
 Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: oddjob libxml2 openssl
-Provides: ricci-modcluster
+Requires: oddjob openssl
+Requires: sed util-linux
 Conflicts: clumon
 
 %description -n ricci-modcluster
@@ -298,26 +337,27 @@
 It consists of luci, https frontend, and ricci, secure daemon that dispatches 
 incoming messages to underlying management modules. 
 
-This package contains Red Hat Enterprise Linux Cluster Suite ricci management module. 
+This package contains Red Hat Enterprise Linux Cluster Suite 
+ricci management module. 
 
 
 %files -n ricci-modcluster
 %defattr(-,root,root)
-#%doc README
-%config			%{_sysconfdir}/rc.d/init.d/ricci-modclusterd
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modcluster.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modcluster.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modcluster.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modcluster.systembus.conf
+			%{_sysconfdir}/rc.d/init.d/ricci-modclusterd
 			%{_sbindir}/ricci-modcluster
 			%{_sbindir}/ricci-modcluster.exe
 			%{_sbindir}/ricci-modclusterd
+			%{_docdir}/ricci-modcluster-%{version}/
 
 %post -n ricci-modcluster
 /sbin/chkconfig --add ricci-modclusterd
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
-RUNS=(`runlevel`)
+RUNS=(`/sbin/runlevel`)
 RUNLEVEL=${RUNS[1]}
-STATE=`chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+STATE=`/sbin/chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
 if [ "$STATE" = "on" ]; then
    /sbin/service ricci-modclusterd restart > /dev/null 2>&1
 fi
@@ -345,10 +385,11 @@
 %package -n cluster-snmp
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
-Requires: /bin/bash
-Requires: net-snmp ricci-modcluster
-Requires: oddjob libxml2 openssl
-Provides: cluster-snmp
+URL: http://sources.redhat.com/cluster/conga
+
+Requires: ricci-modcluster = %{version}-%{release}
+Requires: net-snmp 
+Requires: oddjob openssl
 Conflicts: clumon-snmp
 
 %description -n cluster-snmp
@@ -357,11 +398,12 @@
 %files -n cluster-snmp
 %defattr(-,root,root)
 			%{_libdir}/cluster-snmp/
-%attr(644,root,root)	%{_datadir}/snmp/mibs/REDHAT-MIB
-%attr(644,root,root)	%{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB
+			%{_datadir}/snmp/mibs/REDHAT-MIB
+			%{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB
 			%{_docdir}/cluster-snmp-%{version}/
 
 %pre -n cluster-snmp
+exit 0
 
 %post -n cluster-snmp
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -370,6 +412,7 @@
 exit 0
 
 %preun -n cluster-snmp
+exit 0
 
 %postun -n cluster-snmp
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -387,10 +430,11 @@
 %package -n cluster-cim
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
-Requires: /bin/bash
-Requires: tog-pegasus ricci-modcluster
-Requires: oddjob libxml2 openssl
-Provides: cluster-cim
+URL: http://sources.redhat.com/cluster/conga
+
+Requires: ricci-modcluster = %{version}-%{release}
+Requires: tog-pegasus 
+Requires: oddjob openssl
 Conflicts: clumon-cim
 
 %description -n cluster-cim
@@ -398,10 +442,11 @@
 
 %files -n cluster-cim
 %defattr(-,root,root)
-%{PEGASUS_PROVIDERS_DIR}/libRedHatClusterProvider.so
-%{_docdir}/cluster-cim-%{version}/
+			%{PEGASUS_PROVIDERS_DIR}/libRedHatClusterProvider.so
+			%{_docdir}/cluster-cim-%{version}/
 
 %pre -n cluster-cim
+exit 0
 
 %post -n cluster-cim
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -410,6 +455,7 @@
 exit 0
 
 %preun -n cluster-cim
+exit 0
 
 %postun -n cluster-cim
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -426,6 +472,11 @@
 
 
 %changelog
+* Tue Jul 25 2006 Stanko Kupcevic <kupcevic at 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 at redhat.com> 0.8-7
+- More compliant specfile, minor fixes
 * Tue Jun 27 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-6
 - Luci persists users/clusters/systems/permissions across upgrades 
 * Fri Jun 16 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-4


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2006 21:58:36 -0000	1.5
+++ sources	25 Jul 2006 21:05:07 -0000	1.6
@@ -1 +1 @@
-134d1801b7db475801f364cd690c581b  conga-0.8.tar.gz
+df0abe025066e7a1df29686160f9f84d  conga-0.8.tar.gz

More information about the fedora-cvs-commits mailing list