[openshift-origin-cartridge-abstract] update to 1.2.8

tdawson tdawson at fedoraproject.org
Wed Dec 19 16:45:23 UTC 2012


commit 84e91e4ebe9f8caf9c65d5565b7edf37657c2ac4
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Dec 19 10:45:19 2012 -0600

    update to 1.2.8

 .gitignore                               |    1 +
 openshift-origin-cartridge-abstract.spec |   60 +++++++++++++++++++++++++++---
 sources                                  |    2 +-
 3 files changed, 56 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d1c3ad..3b27dda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /openshift-origin-cartridge-abstract-0.14.4.tar.gz
 /openshift-origin-cartridge-abstract-1.0.4.tar.gz
 /openshift-origin-cartridge-abstract-1.1.7.tar.gz
+/openshift-origin-cartridge-abstract-1.2.8.tar.gz
diff --git a/openshift-origin-cartridge-abstract.spec b/openshift-origin-cartridge-abstract.spec
index aba50b4..dc6d3da 100644
--- a/openshift-origin-cartridge-abstract.spec
+++ b/openshift-origin-cartridge-abstract.spec
@@ -2,7 +2,7 @@
 
 Summary:   OpenShift common cartridge components
 Name:      openshift-origin-cartridge-abstract
-Version:   1.1.7
+Version: 1.2.8
 Release:   1%{?dist}
 Group:     Network/Daemons
 License:   ASL 2.0
@@ -50,10 +50,11 @@ openshift jboss cartridges.
 %build
 
 %install
+rm -rf %{buildroot}
 mkdir -p %{buildroot}%{cartdir}
-cp -rvp abstract %{buildroot}%{cartdir}/
-cp -rvp abstract-httpd %{buildroot}%{cartdir}/
-cp -rvp abstract-jboss %{buildroot}%{cartdir}/
+cp -rv -p abstract %{buildroot}%{cartdir}/
+cp -rv -p abstract-httpd %{buildroot}%{cartdir}/
+cp -rv -p abstract-jboss %{buildroot}%{cartdir}/
 
 # Remove bundled library
 rm -f %{buildroot}%{cartdir}/abstract-jboss/info/data/mysql.tar
@@ -68,7 +69,10 @@ rm -f %{buildroot}%{cartdir}/abstract-jboss/info/data/mysql.tar
 %attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract-httpd/info/bin/
 %dir %attr(0755,root,root) %{_libexecdir}/openshift/cartridges/abstract/
 %dir %attr(0755,root,root) %{_libexecdir}/openshift/cartridges/abstract/info/
-%attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/hooks/
+%dir %attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/hooks
+%attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/hooks/*
+# tidy is now a cartridge hook and should be accessible to gear users
+%attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/hooks/tidy
 %attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/bin/
 %attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/lib/
 %attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/connection-hooks/
@@ -83,8 +87,52 @@ rm -f %{buildroot}%{cartdir}/abstract-jboss/info/data/mysql.tar
 %attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract-jboss/info/data/
 
 %changelog
-* Mon Nov 26 2012 Adam Miller <admiller at redhat.com> 1.1.7-1
+* Tue Dec 11 2012 Adam Miller <admiller at redhat.com> 1.2.8-1
+- Merge pull request #1029 from bdecoste/master (openshift+bot at redhat.com)
+- removed ews2.0 and sy xslt (bdecoste at gmail.com)
+- ews2 and bugs (bdecoste at gmail.com)
+
+* Fri Dec 07 2012 Adam Miller <admiller at redhat.com> 1.2.7-1
+- Merge pull request #1035 from abhgupta/abhgupta-dev
+  (openshift+bot at redhat.com)
+- fix for bugs 883554 and 883752 (abhgupta at redhat.com)
+
+* Fri Dec 07 2012 Adam Miller <admiller at redhat.com> 1.2.6-1
+- Fix for Bug 880013 (jhonce at redhat.com)
+
+* Thu Dec 06 2012 Adam Miller <admiller at redhat.com> 1.2.5-1
+- Merge pull request #1023 from ramr/dev/websockets (openshift+bot at redhat.com)
+- Node web sockets and http(s) proxy support with spec file and package.
+  (ramr at redhat.com)
+
+* Wed Dec 05 2012 Adam Miller <admiller at redhat.com> 1.2.4-1
+- Make tidy hook accessible to gear users (ironcladlou at gmail.com)
+
+* Tue Dec 04 2012 Adam Miller <admiller at redhat.com> 1.2.3-1
+- Refactor tidy into the node library (ironcladlou at gmail.com)
+- Move add/remove alias to the node API. (rmillner at redhat.com)
+
+* Thu Nov 29 2012 Adam Miller <admiller at redhat.com> 1.2.2-1
+- Fix state transitions during build cycle (ironcladlou at gmail.com)
+- Merge pull request #985 from ironcladlou/US2770 (openshift+bot at redhat.com)
+- Merge pull request #984 from jwhonce/dev/rm_phpmoadmin
+  (openshift+bot at redhat.com)
+- Merge pull request #983 from jwhonce/dev/rm_post-install
+  (openshift+bot at redhat.com)
+- Remove unused phpmoadmin cartridge (jhonce at redhat.com)
+- Merge pull request #982 from bdecoste/master (openshift+bot at redhat.com)
+- [cartridges-new] Re-implement scripts (part 1) (jhonce at redhat.com)
+- BZ880429 (bdecoste at gmail.com)
+- Move force-stop into the the node library (ironcladlou at gmail.com)
+- US2770: [cartridges-new] Re-implement scripts (part 1) (jhonce at redhat.com)
+- Merge pull request #973 from bdecoste/master (openshift+bot at redhat.com)
+- use /bin/env (dmcphers at redhat.com)
 - Changing same uid move to rsync (dmcphers at redhat.com)
+- ews2 (bdecoste at gmail.com)
+- add oo-ruby (dmcphers at redhat.com)
+
+* Sat Nov 17 2012 Adam Miller <admiller at redhat.com> 1.2.1-1
+- bump_minor_versions for sprint 21 (admiller at redhat.com)
 
 * Fri Nov 16 2012 Adam Miller <admiller at redhat.com> 1.1.6-1
 - Merge pull request #926 from jwhonce/dev/bz877172 (dmcphers at redhat.com)
diff --git a/sources b/sources
index 93e5924..e60ac3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abbe0d6ffeca18c681c48dbb1fc47d52  openshift-origin-cartridge-abstract-1.1.7.tar.gz
+27cfd3dbbe9839a2b8c72fe2e6116e3d  openshift-origin-cartridge-abstract-1.2.8.tar.gz


More information about the scm-commits mailing list