[openshift-origin-cartridge-cron-1.4] updating to 1.9.1

tdawson tdawson at fedoraproject.org
Wed Jun 12 22:04:40 UTC 2013


commit 92aa822a3d8bf8026b8d69591e25d93963841dd7
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Jun 12 17:04:31 2013 -0500

    updating to 1.9.1

 .gitignore                               |    1 +
 openshift-origin-cartridge-cron-1.4.spec |   73 ++++++++++++++++-------------
 sources                                  |    2 +-
 3 files changed, 42 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e1d8aa..ab0e8f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /openshift-origin-cartridge-cron-1.4-1.3.2.tar.gz
 /openshift-origin-cartridge-cron-1.4-1.4.3.tar.gz
 /openshift-origin-cartridge-cron-1.4-1.5.3.tar.gz
+/openshift-origin-cartridge-cron-1.4-1.9.1.tar.gz
diff --git a/openshift-origin-cartridge-cron-1.4.spec b/openshift-origin-cartridge-cron-1.4.spec
index ac81dfc..3ed9f8e 100644
--- a/openshift-origin-cartridge-cron-1.4.spec
+++ b/openshift-origin-cartridge-cron-1.4.spec
@@ -3,18 +3,16 @@
 
 Summary:       Embedded cron support for express
 Name:          openshift-origin-cartridge-cron-1.4
-Version:       1.5.3
+Version:       1.9.1
 Release:       1%{?dist}
 Group:         Network/Daemons
 License:       ASL 2.0
-URL:           http://openshift.redhat.com
+URL:           http://www.openshift.com
 Source0:       http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
 Requires:      openshift-origin-cartridge-abstract
 Requires:      rubygem(openshift-origin-node)
-Requires:      cronie
-Requires:      crontabs
+Requires:      openshift-origin-node-util
 BuildArch:     noarch
-Obsoletes:     cartridge-cron-1.4
 
 %description
 Provides OpenShift cron cartridge support
@@ -27,29 +25,9 @@ Provides OpenShift cron cartridge support
 %install
 mkdir -p %{buildroot}%{cartridgedir}
 mkdir -p %{buildroot}/%{_sysconfdir}/openshift/cartridges
-mkdir -p %{buildroot}/%{_sysconfdir}/cron.d
-mkdir -p %{buildroot}/%{_sysconfdir}/cron.minutely
-mkdir -p %{buildroot}/%{_sysconfdir}/cron.hourly
-mkdir -p %{buildroot}/%{_sysconfdir}/cron.daily
-mkdir -p %{buildroot}/%{_sysconfdir}/cron.weekly
-mkdir -p %{buildroot}/%{_sysconfdir}/cron.monthly
-cp -p jobs/1minutely %{buildroot}/%{_sysconfdir}/cron.d
 cp -rp info %{buildroot}%{cartridgedir}/
-cp -rp jobs %{buildroot}%{cartridgedir}/
 ln -s %{cartridgedir} %{buildroot}/%{frameworkdir}
 ln -s %{cartridgedir}/info/configuration/ %{buildroot}/%{_sysconfdir}/openshift/cartridges/%{name}
-ln -s %{cartridgedir}/jobs/openshift-origin-cron-minutely %{buildroot}/%{_sysconfdir}/cron.minutely/
-ln -s %{cartridgedir}/jobs/openshift-origin-cron-hourly %{buildroot}/%{_sysconfdir}/cron.hourly/
-ln -s %{cartridgedir}/jobs/openshift-origin-cron-daily %{buildroot}/%{_sysconfdir}/cron.daily/
-ln -s %{cartridgedir}/jobs/openshift-origin-cron-weekly %{buildroot}/%{_sysconfdir}/cron.weekly/
-ln -s %{cartridgedir}/jobs/openshift-origin-cron-monthly %{buildroot}/%{_sysconfdir}/cron.monthly/
-
-%post
-%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
-  systemctl restart  crond.service || :
-%else
-  service crond restart || :
-%endif
 
 %files
 %doc COPYRIGHT LICENSE
@@ -59,21 +37,50 @@ ln -s %{cartridgedir}/jobs/openshift-origin-cron-monthly %{buildroot}/%{_sysconf
 %attr(0750,-,-) %{cartridgedir}/info/build/
 %config(noreplace) %{cartridgedir}/info/configuration/
 %attr(0755,-,-) %{cartridgedir}/info/bin/
-%attr(0755,-,-) %{cartridgedir}/jobs/
 %attr(0755,-,-) %{frameworkdir}
-%dir %{_sysconfdir}/cron.minutely
-%config(noreplace) %attr(0644,-,-) %{_sysconfdir}/cron.d/1minutely
-%attr(0755,-,-) %{_sysconfdir}/cron.minutely/openshift-origin-cron-minutely
-%attr(0755,-,-) %{_sysconfdir}/cron.hourly/openshift-origin-cron-hourly
-%attr(0755,-,-) %{_sysconfdir}/cron.daily/openshift-origin-cron-daily
-%attr(0755,-,-) %{_sysconfdir}/cron.weekly/openshift-origin-cron-weekly
-%attr(0755,-,-) %{_sysconfdir}/cron.monthly/openshift-origin-cron-monthly
 %{_sysconfdir}/openshift/cartridges/%{name}
 %{cartridgedir}/info/changelog
 %{cartridgedir}/info/control
 %{cartridgedir}/info/manifest.yml
 
 %changelog
+* Wed May 08 2013 Adam Miller <admiller at redhat.com> 1.9.1-1
+- bump_minor_versions for sprint 28 (admiller at redhat.com)
+
+* Mon May 06 2013 Adam Miller <admiller at redhat.com> 1.8.2-1
+- Add Cartridge-Vendor to manifest.yml in v1. (asari.ruby at gmail.com)
+
+* Thu Apr 25 2013 Adam Miller <admiller at redhat.com> 1.8.1-1
+- Update outdated links in 'cartridges' directory. (asari.ruby at gmail.com)
+- Bug 928675 (asari.ruby at gmail.com)
+- bump_minor_versions for sprint 2.0.26 (tdawson at redhat.com)
+
+* Fri Apr 12 2013 Adam Miller <admiller at redhat.com> 1.7.4-1
+- SELinux, ApplicationContainer and UnixUser model changes to support oo-admin-
+  ctl-gears operating on v1 and v2 cartridges. (rmillner at redhat.com)
+
+* Wed Apr 10 2013 Adam Miller <admiller at redhat.com> 1.7.3-1
+- Bug 950224: Remove unnecessary Endpoints (ironcladlou at gmail.com)
+- Delete move/pre-move/post-move hooks, these hooks are no longer needed.
+  (rpenta at redhat.com)
+
+* Mon Apr 08 2013 Adam Miller <admiller at redhat.com> 1.7.2-1
+- Moving root cron configuration out of cartridges and into node
+  (calfonso at redhat.com)
+
+* Thu Mar 28 2013 Adam Miller <admiller at redhat.com> 1.7.1-1
+- bump_minor_versions for sprint 26 (admiller at redhat.com)
+
+* Thu Mar 14 2013 Adam Miller <admiller at redhat.com> 1.6.2-1
+- Refactor Endpoints to support frontend mapping (ironcladlou at gmail.com)
+- Merge pull request #1625 from tdawson/tdawson/remove-obsoletes
+  (dmcphers+openshiftbot at redhat.com)
+- minor cleanup of some cartridge spec files (tdawson at redhat.com)
+- remove old obsoletes (tdawson at redhat.com)
+
+* Thu Mar 07 2013 Adam Miller <admiller at redhat.com> 1.6.1-1
+- bump_minor_versions for sprint 25 (admiller at redhat.com)
+
 * Tue Feb 19 2013 Adam Miller <admiller at redhat.com> 1.5.3-1
 - WIP Cartridge Refactor (jhonce at redhat.com)
 
diff --git a/sources b/sources
index 19cb82d..e267e45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6b8de04ecc8fb43c3cc363e68f8ec52  openshift-origin-cartridge-cron-1.4-1.5.3.tar.gz
+1dc6790fecd8d7bd5de4c1d026e16458  openshift-origin-cartridge-cron-1.4-1.9.1.tar.gz


More information about the scm-commits mailing list