[condor-wallaby/f18] Update to upstream 5.0.3
rrati
rrati at fedoraproject.org
Thu Oct 25 19:49:45 UTC 2012
commit 4f1a9b5147873506edf035c5e4f22e5d650ad12b
Author: Robert Rati <rrati at redhat.com>
Date: Thu Oct 25 15:48:08 2012 -0400
Update to upstream 5.0.3
.gitignore | 5 ++
condor-wallaby.spec | 113 +++++++++++++++++++++++++++++++++++---------------
sources | 6 ++-
3 files changed, 89 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c98325..5239dcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
/condor-wallaby-4.1.2.tar.gz
+/0001-Updated-spec-for-5.0.3-1.patch
+/0002-Allow-editing-the-annotation-field-in-condor_configu.patch
+/0003-Updated-spec-for-5.0.3-2.patch
+/0004-Minor-code-cleanup.patch
+/condor-wallaby-5.0.3.tar.gz
diff --git a/condor-wallaby.spec b/condor-wallaby.spec
index 936092d..f13ec48 100644
--- a/condor-wallaby.spec
+++ b/condor-wallaby.spec
@@ -1,30 +1,42 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
%if (0%{?fedora} == 0 && 0%{?rhel} <= 5)
%global building_for_el5 1
%else
%global building_for_el5 0
%endif
+%if (0%{?fedora} >= 17)
+%global ruby_abi 1.9.1
+%global ruby_install_dir %{ruby_vendorlibdir}
+%else
+%global ruby_abi 1.8
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+%global ruby_install_dir %{ruby_sitelib}
+%endif
+
+%if %{building_for_el5} == 1
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
Name: condor-wallaby
Summary: Condor configuration using wallaby
-Version: 4.1.2
-Release: 4%{?dist}
+Version: 5.0.3
+Release: 1%{?dist}
Group: Applications/System
License: ASL 2.0
URL: http://git.fedorahosted.org/git/grid/configuration-tools.git
Source0: https://fedorahosted.org/releases/g/r/grid/%{name}-%{version}.tar.gz
-Patch0: 0001-Packaging-improvements-for-building-on-fedora.patch
-Patch1: 0002-Packaging-fixes.patch
-Patch2: 0003-Workflow-and-packaging-improvements.patch
-Patch3: 0004-Bumped-spec-to-4.1.2-2.patch
-Patch4: 0005-Fixed-dependency-version-on-python-wallabyclient.patch
-Patch5: 0006-Bumped-spec-to-4.1.2-3.patch
+Patch0: 0001-Updated-spec-for-5.0.3-1.patch
+Patch1: 0002-Allow-editing-the-annotation-field-in-condor_configu.patch
+Patch2: 0003-Updated-spec-for-5.0.3-2.patch
+Patch3: 0004-Minor-code-cleanup.patch
%if %{building_for_el5}
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-XXXXXX)
%endif
-BuildArch: noarch
BuildRequires: python >= 2.3
+BuildRequires: ruby
+BuildRequires: ruby-devel
+BuildArch: noarch
%description
The condor wallaby package provides a means to quickly and easily
@@ -38,7 +50,7 @@ Requires: condor >= 7.4.4-0.9
Requires: python >= 2.3
Requires: python-qmf >= 0.9.1073306
Requires: python-condorutils >= 1.5-4
-Requires: python-wallabyclient = %{version}
+Requires: python-wallabyclient = %{version}-%{release}
%if 0%{?fedora} == 0
Obsoletes: condor-remote-configuration
%endif
@@ -50,14 +62,13 @@ apply them to nodes.
This package provides the tools needed for managed clients
-%if 0%{?rhel} != 4 && 0%{?fedora} == 0
+%if 0%{?rhel} != 4
%package tools
Summary: Wallaby configuration tools for configuring condor
Group: Applications/System
-Requires: python >= 2.4
-Requires: python-qmf >= 0.9.1073306
-Requires: python-wallabyclient >= %{version}
-Requires: PyYAML
+Requires: ruby(abi) = %{?ruby_abi}
+Requires: ruby-%{name} = %{version}-%{release}
+Requires: wallaby-utils > 0.14.2-2
Requires: vim-minimal
%if 0%{?fedora} == 0
Obsoletes: condor-remote-configuration-server
@@ -68,7 +79,8 @@ This package provides a means to quickly and easily configure machines
running Condor by providing tools to define configurations in wallaby and
apply them to nodes.
-This package provides tools to configure condor pools and wallaby
+This package provides tools to apply configurations to nodes/groups and
+to configure entities in wallaby
%endif
%package -n python-wallabyclient
@@ -77,13 +89,19 @@ Group: Applications/System
BuildRequires: python-devel
Requires: python >= 2.3
Requires: python-condorutils >= 1.5-4
-%if 0%{?rhel} != 4
-Requires: PyYAML
-%endif
%description -n python-wallabyclient
Tools for interacting with wallaby
+%package -n ruby-%{name}
+Summary: Tools for use with wallaby shell
+Group: Applications/System
+Requires: ruby-wallaby
+Requires: ruby(abi) = %{?ruby_abi}
+
+%description -n ruby-%{name}
+Tools for executing condor specific commands in wallaby shell
+
%prep
%setup -q
@@ -91,30 +109,31 @@ Tools for interacting with wallaby
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
%install
+%if %{building_for_el5}
rm -rf %{buildroot}
+%endif
+mkdir -p %{buildroot}/%{ruby_install_dir}/condor_wallaby
+mkdir -p %{buildroot}/%{ruby_install_dir}/condor_wallaby/commands
mkdir -p %{buildroot}/%{python_sitelib}/wallabyclient
mkdir -p %{buildroot}/%_sbindir
mkdir -p %{buildroot}/%_sysconfdir/condor/config.d
mkdir -p %{buildroot}/%_mandir/man1
-%if 0%{?rhel} != 4 && 0%{?fedora} == 0
+%if 0%{?rhel} != 4
cp -f condor_configure_pool %{buildroot}/%_sbindir
cp -f condor_configure_store %{buildroot}/%_sbindir
%endif
cp -f condor_configd %{buildroot}/%_sbindir
cp -f config/99configd.config %{buildroot}/%_sysconfdir/condor/config.d
-cp -f module/*.py %{buildroot}/%{python_sitelib}/wallabyclient
-%if 0%{?rhel} != 4 && 0%{?fedora} == 0
+cp -f lib/wallabyclient/*.py %{buildroot}/%{python_sitelib}/wallabyclient
+cp -f lib/condor_wallaby/*.rb %{buildroot}/%{ruby_install_dir}/condor_wallaby
+cp -f commands/*.rb %{buildroot}/%{ruby_install_dir}/condor_wallaby/commands
+%if 0%{?rhel} != 4
cp -f doc/*.1 %{buildroot}/%_mandir/man1
%endif
-%if 0%{?rhel} == 4
-rm -f %{buildroot}/%{python_sitelib}/wallabyclient/WallabyTypes.py
-%endif
%if %{building_for_el5}
%clean
@@ -131,7 +150,7 @@ rm -rf %{buildroot}
%defattr(0644,root,root,-)
%_sysconfdir/condor/config.d/99configd.config
-%if 0%{?rhel} != 4 && 0%{?fedora} == 0
+%if 0%{?rhel} != 4
%files tools
%if %{building_for_el5}
%defattr(-,root,root,-)
@@ -144,17 +163,43 @@ rm -rf %{buildroot}
%endif
%files -n python-wallabyclient
+%if %{building_for_el5}
%defattr(-,root,root,-)
+%endif
%doc LICENSE-2.0.txt
%defattr(0644, root,root,-)
%{python_sitelib}/wallabyclient/WallabyHelpers.py*
-%if 0%{?rhel} != 4
-%{python_sitelib}/wallabyclient/WallabyTypes.py*
-%endif
%{python_sitelib}/wallabyclient/__init__.py*
%{python_sitelib}/wallabyclient/exceptions.py*
+%files -n ruby-%{name}
+%if %{building_for_el5}
+%defattr(-,root,root,-)
+%endif
+%doc LICENSE-2.0.txt
+%defattr(0644, root,root,-)
+/%{ruby_install_dir}/condor_wallaby/ccp.rb
+/%{ruby_install_dir}/condor_wallaby/ccs.rb
+/%{ruby_install_dir}/condor_wallaby/cmdline.rb
+/%{ruby_install_dir}/condor_wallaby/utils.rb
+/%{ruby_install_dir}/condor_wallaby/commands/cmd_ccp.rb
+/%{ruby_install_dir}/condor_wallaby/commands/cmd_ccs.rb
+
%changelog
+* Thu Oct 25 2012 <rrati at redhat> - 5.0.3-1
+- Enable editing annotations in condor_configure_store
+- The configd exits if it detects multiple stores (BZ851222)
+- Can use QMF_BROKER_USERNAME and QMF_BROKER_PASSWORD_FILE (BZ815653)
+- The configd won't drop privileges if run as root (BZ841173)
+- Added support to use QMF_BROKER_AUTH_MECH with configd (BZ815820)
+- The condor_configd will default to ANONYMOUS authentication with the
+ broker (BZ815528)
+- Fxed formatting issue in manpage
+- Updated condor_configure_pool manpage for skeleton group
+- Condor_configure_pool|store now use wallaby shell for their core (BZ802510)
+- Added support for the skeleton group (BZ749569)
+- EC2Enhanced configuration more flexible (BZ801503)
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 7b37bc5..bcb89d6 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
-2bc4dfcf7e6e3368c8a33d43af29406f condor-wallaby-4.1.2.tar.gz
+e95920a6a356ed54c52bbea2ca4b484b 0001-Updated-spec-for-5.0.3-1.patch
+9d1de95b3ff5dd3051eb80052ad00781 0002-Allow-editing-the-annotation-field-in-condor_configu.patch
+7f354c22fa4709995b6c3f51aa50741c 0003-Updated-spec-for-5.0.3-2.patch
+35f0b491cf39f34f46d209e4f040ea04 0004-Minor-code-cleanup.patch
+77f871280f701dbc3c401d3faa5960d4 condor-wallaby-5.0.3.tar.gz
More information about the scm-commits
mailing list