cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
* [Cluster-devel] conga ./conga.spec.in.in make/version.in
@ 2006-06-16 21:34 kupcevic
  0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-06-16 21:34 UTC (permalink / raw)
  To: cluster-devel.redhat.com

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

Modified files:
	.              : conga.spec.in.in 
	make           : version.in 

Log message:
	Move ricci-modstorage, ricci-modservice, ricci-modlog and ricci-modrpm into ricci.rpm. ricci-modcluster, cluster-snmp and cluster-cim remain individual rpms.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.4&r2=1.5

--- conga/conga.spec.in.in	2006/06/15 03:08:35	1.5
+++ conga/conga.spec.in.in	2006/06/16 21:34:25	1.6
@@ -76,7 +76,8 @@
 Requires: /bin/bash
 Requires: python zope plone
 Requires: openssl mailcap stunnel
-Provides: luci
+Requires: ricci 
+Provides: luci 
 
 
 %description -n luci
@@ -129,30 +130,43 @@
 
 
 
-
-#################  ricci  ################3
-
-
-
-### ricci base package ###
+### ricci daemon & basic modules ###
 
 
 %package -n ricci
 Group: System Environment/Base
-Summary: ricci
+Summary: Remote management system, including basic management modules
 Requires: chkconfig initscripts
 Requires: /bin/bash
 Requires: oddjob dbus libxml2 openssl pam
 Requires: ricci = %{version}-%{release}
-Requires: ricci-modcluster = %{version}-%{release}
+Requires: ricci-modrpm = %{version}-%{release}
 Requires: ricci-modstorage = %{version}-%{release}
 Requires: ricci-modservice = %{version}-%{release}
 Requires: ricci-modlog = %{version}-%{release}
-Provides: ricci ricci-modreboot ricci-modrpm
+Requires: ricci-modcluster = %{version}-%{release}
+
+Provides: ricci ricci-modreboot 
+
+# modrpm
+Provides: ricci-modrpm 
+
+# modstorage
+Requires: parted
+Provides: ricci-modstorage
+
+# modservice
+Requires: chkconfig initscripts
+Provides: ricci-modservice
+
+# modlog
+Provides: ricci-modlog
 
 %description -n ricci
 ricci description
-This package contains reboot and rpm modules
+Remote management system. 
+This package contains listening daemon, as well as reboot, rpm, storage, service and log management modules. 
+
 
 %files -n ricci
 %defattr(-,root,root)
@@ -165,14 +179,28 @@
 			%{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf
 %attr(-,ricci,root)	%{_localstatedir}/lib/ricci
 			%{_sbindir}/ricci
-			%{_sbindir}/ricci-worker
 %attr(4755,root,root)	%{_sbindir}/ricci-auth
-
+			%{_sbindir}/ricci-worker
 # modrpm
 			%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
 			%{_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
+			%{_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
+			%{_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
+			%{_sbindir}/ricci-modlog
+			%{_sbindir}/ricci-modlog.exe
 
 %pre -n ricci
 /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
@@ -208,12 +236,18 @@
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
 if [ "$1" -ge "1" ]; then
-   /sbin/service ricci condrestart > /dev/null 2>&1
+   RUNS=(`runlevel`)
+   RUNLEVEL=${RUNS[1]}
+   STATE=`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
 fi
 exit 0
 
 
 
+
 ###  cluster module  ###
 
 
@@ -224,7 +258,6 @@
 Requires: /bin/bash
 Requires: oddjob libxml2 openssl
 Provides: ricci-modcluster
-Conflicts: ricci-cluster
 Conflicts: clumon
 
 %description -n ricci-modcluster
@@ -267,118 +300,6 @@
 
 
 
-###  storage module  ###
-
-
-%package -n ricci-modstorage
-Group: System Environment/Base
-Summary: ricci-modstorage summary
-Requires: /bin/bash
-Requires: oddjob libxml2 openssl
-Requires: parted 
-Provides: ricci-modstorage
-Conflicts: ricci-storage
-
-%description -n ricci-modstorage
-ricci-modstorage description
-
-%files -n ricci-modstorage
-%defattr(-,root,root)
-#%doc README
-%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
-%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
-%{_sbindir}/ricci-modstorage
-%{_sbindir}/ricci-modstorage.exe
-
-%post -n ricci-modstorage
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-exit 0
-
-%preun -n ricci-modstorage
-
-%postun -n ricci-modstorage
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-exit 0
-
-
-
-
-###  service module  ###
-
-
-%package -n ricci-modservice
-Group: System Environment/Base
-Summary: ricci-modservice summary
-Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: oddjob libxml2 openssl
-Provides: ricci-modservice
-
-%description -n ricci-modservice
-ricci-modservice description
-
-%files -n ricci-modservice
-%defattr(-,root,root)
-#%doc README
-%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
-%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
-%{_sbindir}/ricci-modservice
-%{_sbindir}/ricci-modservice.exe
-
-%post -n ricci-modservice
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-exit 0
-
-%preun -n ricci-modservice
-
-%postun -n ricci-modservice
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-exit 0
-
-
-
-
-###  logging module  ###
-
-
-%package -n ricci-modlog
-Group: System Environment/Base
-Summary: ricci-modlog summary
-Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: oddjob libxml2 openssl
-Provides: ricci-modlog
-
-%description -n ricci-modlog
-ricci-modlog description
-
-%files -n ricci-modlog
-%defattr(-,root,root)
-#%doc README
-%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
-%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
-%{_sbindir}/ricci-modlog
-%{_sbindir}/ricci-modlog.exe
-
-%post -n ricci-modlog
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-exit 0
-
-%preun -n ricci-modlog
-
-%postun -n ricci-modlog
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-exit 0
-
-
-
-
 
 ###  cluster-snmp  ###
 
@@ -467,6 +388,8 @@
 
 
 %changelog
+* 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)
--- conga/make/version.in	2006/06/15 03:08:35	1.4
+++ conga/make/version.in	2006/06/16 21:34:25	1.5
@@ -1,2 +1,2 @@
 VERSION=0.8
-RELEASE=3.FC5
+RELEASE=4.FC5



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Cluster-devel] conga ./conga.spec.in.in make/version.in
@ 2006-06-27 21:15 kupcevic
  0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-06-27 21:15 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-06-27 21:15:31

Modified files:
	.              : conga.spec.in.in 
	make           : version.in 

Log message:
	Luci persists users/clusters/systems/permissions across upgrades; version bump to 0.8-6

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.6&r2=1.7

--- conga/conga.spec.in.in	2006/06/19 21:21:54	1.8
+++ conga/conga.spec.in.in	2006/06/27 21:15:30	1.9
@@ -42,7 +42,13 @@
 BuildRequires: net-snmp-devel tog-pegasus-devel
 
 %description
-conga source rpm
+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 source code of Conga and 
+Red Hat Enterprise Linux Cluster Suite ricci/SNMP/CIM module/agent/provider. 
+
 
 %prep
 %setup -q
@@ -81,8 +87,11 @@
 
 
 %description -n luci
-luci description
-This package contains Luci website
+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.
 
 
 %files -n luci
@@ -103,20 +112,40 @@
 
 %post -n luci
 /sbin/chkconfig --add luci
+if [ -e /var/lib/luci/var/luci_backup.xml ]; then
+   /sbin/service luci status >/dev/null 2>$1
+   LUCI_RUNNING=$?
+   if [ "$LUCI_RUNNING" = "0" ]; then
+      /sbin/service luci stop >/dev/null 2>$1
+   fi
+   /usr/sbin/luci_admin restore >/dev/null 2>$1
+   if [ "$LUCI_RUNNING" = "0" ]; then
+      /sbin/service luci start >/dev/null 2>$1
+   fi
+fi
 if [ ! -e /var/lib/luci/var/certs/privkey.pem ]; then
-	# no privkey.pem -> luci not initialized
-	# set initial random admin password
-	T_PASS=`dd if=/dev/urandom bs=5M count=1 2> /dev/null | sha1sum`
-	for i in $T_PASS; do
-	   if [ "-" != $i ] ; then
-		echo -n "admin:{SHA}$i" > /var/lib/luci/inituser
-	   fi
-	done
-	/bin/chmod 600 /var/lib/luci/inituser
-	/bin/chown luci /var/lib/luci/inituser
+   # no privkey.pem -> luci not initialized
+   # set initial random admin password
+   T_PASS=`dd if=/dev/urandom bs=5M count=1 2> /dev/null | sha1sum`
+   for i in $T_PASS; do
+      if [ "-" != $i ] ; then
+	echo -n "admin:{SHA}$i" > /var/lib/luci/inituser
+      fi
+   done
+   /bin/chmod 600 /var/lib/luci/inituser
+   /bin/chown luci /var/lib/luci/inituser
 fi
 
 %preun -n luci
+/sbin/service luci status >/dev/null 2>$1
+LUCI_RUNNING=$?
+if [ "$LUCI_RUNNING" = "0" ]; then
+   /sbin/service luci stop >/dev/null 2>$1
+fi
+/usr/sbin/luci_admin backup >/dev/null 2>$1
+if [ "$LUCI_RUNNING" = "0" ]; 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
@@ -163,9 +192,12 @@
 Provides: ricci-modlog
 
 %description -n ricci
-ricci description
-Remote management system. 
-This package contains listening daemon, as well as reboot, rpm, storage, service and log 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. 
 
 
 %files -n ricci
@@ -261,7 +293,12 @@
 Conflicts: clumon
 
 %description -n ricci-modcluster
-ricci-modcluster 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. 
+
+This package contains Red Hat Enterprise Linux Cluster Suite ricci management module. 
+
 
 %files -n ricci-modcluster
 %defattr(-,root,root)
@@ -314,7 +351,7 @@
 Conflicts: clumon-snmp
 
 %description -n cluster-snmp
-SNMP agent for Red Hat Enterprise Linux Cluster Suite
+SNMP agent for Red Hat Enterprise Linux Cluster Suite.
 
 %files -n cluster-snmp
 %defattr(-,root,root)
@@ -356,7 +393,7 @@
 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)
@@ -388,13 +425,15 @@
 
 
 %changelog
+* 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 8181
+- 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
--- conga/make/version.in	2006/06/19 21:21:54	1.6
+++ conga/make/version.in	2006/06/27 21:15:31	1.7
@@ -1,2 +1,2 @@
 VERSION=0.8
-RELEASE=5.FC6
+RELEASE=6



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Cluster-devel] conga ./conga.spec.in.in make/version.in
@ 2006-07-25 19:51 kupcevic
  0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-07-25 19:51 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-07-25 19:51:01

Modified files:
	.              : conga.spec.in.in 
	make           : version.in 

Log message:
	Build 0.8-8

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.8&r2=1.9

--- conga/conga.spec.in.in	2006/07/24 20:17:01	1.17
+++ conga/conga.spec.in.in	2006/07/25 19:50:59	1.18
@@ -472,6 +472,8 @@
 
 
 %changelog
+* Tue Jul 25 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-8
+- New build with a lot of implementation details on Luci
 * 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
--- conga/make/version.in	2006/07/06 20:35:06	1.8
+++ conga/make/version.in	2006/07/25 19:51:01	1.9
@@ -1,2 +1,2 @@
 VERSION=0.8
-RELEASE=7
+RELEASE=8



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Cluster-devel] conga ./conga.spec.in.in make/version.in
@ 2006-08-03 20:54 kupcevic
  0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-08-03 20:54 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-03 20:54:05

Modified files:
	.              : conga.spec.in.in 
	make           : version.in 

Log message:
	Version bump

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.11&r2=1.12

--- conga/conga.spec.in.in	2006/08/03 20:53:15	1.21
+++ conga/conga.spec.in.in	2006/08/03 20:54:04	1.22
@@ -472,6 +472,9 @@
 
 
 %changelog
+* Thu Aug 03 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-10
+- Added zopectl to luci
+- 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
--- conga/make/version.in	2006/07/28 17:33:37	1.11
+++ conga/make/version.in	2006/08/03 20:54:04	1.12
@@ -1,2 +1,2 @@
 VERSION=0.8
-RELEASE=9.1
+RELEASE=10



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Cluster-devel] conga ./conga.spec.in.in make/version.in
@ 2007-03-27 17:14 rmccabe
  0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2007-03-27 17:14 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-03-27 18:14:46

Modified files:
	.              : conga.spec.in.in 
	make           : version.in 

Log message:
	- Changelog update
	- Version bump

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.6&r2=1.67.2.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.28.2.3&r2=1.28.2.4

--- conga/conga.spec.in.in	2007/03/20 20:52:52	1.67.2.6
+++ conga/conga.spec.in.in	2007/03/27 17:14:45	1.67.2.7
@@ -289,6 +289,10 @@
 
 %changelog
 
+* Tue Mar 27 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-7
+- Fixed bz234196 (CVE-2007-0240 Conga includes version of Zope that is vulnerable to a XSS attack)
+- Resolves: bz234196
+
 * Tue Mar 20 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-6
 - Do not fail on i18n machines
 - Fixed bz225747 (Create/delete cluster - then access disk on node = Generic error on host: cluster tools: cman_tool errored)
--- conga/make/version.in	2007/03/20 20:52:53	1.28.2.3
+++ conga/make/version.in	2007/03/27 17:14:45	1.28.2.4
@@ -1,5 +1,5 @@
 VERSION=0.9.1
-RELEASE=6
+RELEASE=7
 # Remove "_UNRELEASED" at release time.
 # Put release num at the beggining, 
 # so that after it gets released, it has 



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Cluster-devel] conga ./conga.spec.in.in make/version.in
@ 2008-09-23 16:05 rmccabe
  0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2008-09-23 16:05 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-09-23 16:05:08

Modified files:
	.              : conga.spec.in.in 
	make           : version.in 

Log message:
	fix bz463220 (with spec file magic lifted from the cman spec file)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.103&r2=1.45.2.104
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.45&r2=1.21.2.46

--- conga/conga.spec.in.in	2008/09/18 15:19:34	1.45.2.103
+++ conga/conga.spec.in.in	2008/09/23 16:05:07	1.45.2.104
@@ -31,6 +31,8 @@
 %endif
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%define my_requires %{_builddir}/my_requires
+%define _use_internal_dependency_generator 0
 %define virt_support 0
 
 %ifarch i386 x86_64 ia64
@@ -47,6 +49,14 @@
 It consists of luci, https frontend, and ricci, secure daemon that dispatches
 incoming messages to underlying management modules.
 
+%{__cat} <<EOF >%{my_requires}
+#!/bin/sh
+%{__find_requires} | grep -v '^libvirt'
+exit 0
+EOF
+chmod +x %{my_requires}
+%define __find_requires %{my_requires}
+
 %prep
 %setup -q
 %if "%{include_zope_and_plone}" == "yes"
--- conga/make/version.in	2008/08/27 14:59:18	1.21.2.45
+++ conga/make/version.in	2008/09/23 16:05:08	1.21.2.46
@@ -1,2 +1,2 @@
 VERSION=0.12.1
-RELEASE=4
+RELEASE=5



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Cluster-devel] conga ./conga.spec.in.in make/version.in
@ 2008-09-29 17:11 rmccabe
  0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2008-09-29 17:11 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-09-29 17:11:14

Modified files:
	.              : conga.spec.in.in 
	make           : version.in 

Log message:
	Update changelog and version

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.106&r2=1.45.2.107
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.47&r2=1.21.2.48

--- conga/conga.spec.in.in	2008/09/23 17:42:41	1.45.2.106
+++ conga/conga.spec.in.in	2008/09/29 17:11:13	1.45.2.107
@@ -323,6 +323,9 @@
 
 ###  changelog ###
 %changelog
+* Thu Sep 25 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.1-7
+- Fix a typo in the fix for bz459562
+
 * Tue Sep 23 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.1-6
  - Fix bz463220
 
--- conga/make/version.in	2008/09/23 17:42:41	1.21.2.47
+++ conga/make/version.in	2008/09/29 17:11:14	1.21.2.48
@@ -1,2 +1,2 @@
 VERSION=0.12.1
-RELEASE=6
+RELEASE=7



^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2008-09-29 17:11 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-08-03 20:54 [Cluster-devel] conga ./conga.spec.in.in make/version.in kupcevic
  -- strict thread matches above, loose matches on Subject: below --
2008-09-29 17:11 rmccabe
2008-09-23 16:05 rmccabe
2007-03-27 17:14 rmccabe
2006-07-25 19:51 kupcevic
2006-06-27 21:15 kupcevic
2006-06-16 21:34 kupcevic

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).