rpms/condor-ec2-enhanced/devel .cvsignore, 1.2, 1.3 condor-ec2-enhanced.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3 chkconfig_off.patch, 1.1, NONE

[rrati]

Author: rrati

Update of /cvs/pkgs/rpms/condor-ec2-enhanced/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5485/devel

Modified Files:
	.cvsignore condor-ec2-enhanced.spec import.log sources 
Removed Files:
	chkconfig_off.patch 
Log Message:
- caroniad checks condor_config for its configuration before looking
  in configuration files
- Removed the init script as the daemon is controlled by condor now
- Split the documentation into two files, one for the AMI and one for
  the submit machine
- Added conflict with condor-low-latency



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jul 2009 14:52:09 -0000	1.2
+++ .cvsignore	19 Aug 2009 19:46:26 -0000	1.3
@@ -1 +1 @@
-condor-ec2-enhanced-1.0-16.tar.gz
+condor-ec2-enhanced-1.0-17.tar.gz


Index: condor-ec2-enhanced.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced/devel/condor-ec2-enhanced.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- condor-ec2-enhanced.spec	29 Jul 2009 14:52:09 -0000	1.1
+++ condor-ec2-enhanced.spec	19 Aug 2009 19:46:26 -0000	1.2
@@ -1,5 +1,5 @@
 %{!?is_fedora: %define is_fedora %(/bin/sh -c "if [ -e /etc/fedora-release ];then echo '1'; fi")}
-%define rel 16
+%define rel 17
 
 Summary: EC2 Enhanced
 Name: condor-ec2-enhanced
@@ -12,7 +12,6 @@ URL: http://www.redhat.com/mrg
 # our distribution.  Thus the source is only available from
 # within this srpm.
 Source0: %{name}-%{version}-%{rel}.tar.gz
-Patch0: chkconfig_off.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Requires: python >= 2.4
@@ -22,11 +21,7 @@ Requires: python-condor-job-hooks-common
 Requires: python-condor-ec2-enhanced-hooks-common
 Requires: python-boto >= 1.7a
 Requires: openssl
-
-Requires(post):/sbin/chkconfig
-Requires(preun):/sbin/chkconfig
-Requires(preun):/sbin/service
-Requires(postun):/sbin/service
+Conflicts: condor-low-latency
 
 %description
 The EC2 Enhanced feature allows for near seamless translation of Condor jobs
@@ -41,9 +36,6 @@ feature.
 
 %prep
 %setup -q
-%if 0%{?is_fedora} != 0
-%patch0 -p1
-%endif
 
 %build
 
@@ -51,43 +43,37 @@ feature.
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}/%{_sysconfdir}/condor
-mkdir -p %{buildroot}/%{_initrddir}
 cp -f caroniad %{buildroot}/%_sbindir
 cp -f config/caroniad.conf %{buildroot}/%{_sysconfdir}/condor
-cp -f config/condor-ec2-enhanced.init %{buildroot}/%{_initrddir}/condor-ec2-enhanced
 
 %clean
 rm -rf %{buildroot}
 
 %post
-/sbin/chkconfig --add condor-ec2-enhanced
 %if 0%{?is_fedora} == 0
 if [[ -f /etc/opt/grid/caroniad.conf ]]; then
    mv -f /etc/opt/grid/caroniad.conf /etc/condor
    rmdir --ignore-fail-on-non-empty -p /etc/opt/grid
 fi
 %endif
-
-%preun
-if [ $1 = 0 ]; then
-  /sbin/service condor-ec2-enhanced stop >/dev/null 2>&1 || :
-  /sbin/chkconfig --del condor-ec2-enhanced
-fi
-
-%postun
-if [ "$1" -ge "1" ]; then
-  /sbin/service condor-ec2-enhanced condrestart >/dev/null 2>&1 || :
-fi
+exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE-2.0.txt
+%doc LICENSE-2.0.txt INSTALL
 %config(noreplace) %_sysconfdir/condor/caroniad.conf
 %defattr(0755,root,root,-)
-%_initrddir/condor-ec2-enhanced
 %_sbindir/caroniad
 
 %changelog
+* Tue Aug 18 2009  <rrati at redhat> - 1.0-17
+- caroniad checks condor_config for its configuration before looking
+  in configuration files
+- Removed the init script as the daemon is controlled by condor now
+- Split the documentation into two files, one for the AMI and one for
+  the submit machine
+- Added conflict with condor-low-latency
+
 * Mon Jul 27 2009  <rrati at redhat> - 1.0-16
 - Fixed missed dependency renames
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Jul 2009 14:52:09 -0000	1.1
+++ import.log	19 Aug 2009 19:46:26 -0000	1.2
@@ -1 +1,2 @@
 condor-ec2-enhanced-1_0-16_fc10:HEAD:condor-ec2-enhanced-1.0-16.fc10.src.rpm:1248879115
+condor-ec2-enhanced-1_0-17_fc10:HEAD:condor-ec2-enhanced-1.0-17.fc10.src.rpm:1250711089


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 14:52:09 -0000	1.2
+++ sources	19 Aug 2009 19:46:26 -0000	1.3
@@ -1 +1 @@
-762c914ad6fc8fd3e5a9eef47eef852b  condor-ec2-enhanced-1.0-16.tar.gz
+e46a92c91f052c05b826bd2b5908d1a2  condor-ec2-enhanced-1.0-17.tar.gz


--- chkconfig_off.patch DELETED ---