summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Dreyer <ktdreyer@ktdreyer.com>2016-03-07 08:05:21 -0700
committerKen Dreyer <ktdreyer@ktdreyer.com>2016-03-07 08:05:21 -0700
commit373d2ea65ecd4dc7518f21d055c160a5711ff3b6 (patch)
treea6b715b39e748faa30041ae1a46ddc7cb8e649af
parent39d38c10f24dc4bbe2959c6817153eab51a2ab9f (diff)
downloadceph-ansible-373d2ea65ecd4dc7518f21d055c160a5711ff3b6.tar.gz
ceph-ansible-373d2ea65ecd4dc7518f21d055c160a5711ff3b6.tar.xz
ceph-ansible-373d2ea65ecd4dc7518f21d055c160a5711ff3b6.zip
Update to latest upstream release
- Correct License field (rhbz#1313477)
-rw-r--r--.gitignore2
-rw-r--r--ceph-ansible.spec27
-rw-r--r--sources2
3 files changed, 17 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index fd9a744..d04c240 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/ceph-ansible-0-f9c3159.tar.gz
+/ceph-ansible-v1.0.1.tar.gz
diff --git a/ceph-ansible.spec b/ceph-ansible.spec
index 6fb97b7..1ce36e6 100644
--- a/ceph-ansible.spec
+++ b/ceph-ansible.spec
@@ -1,27 +1,26 @@
-# We are packaging git snapshots until upstream starts using real version
-# numbers. https://github.com/ceph/ceph-ansible/issues/557
-
-%global commitdate 20160229
-%global commit f9c3159e0d0e20dc3c8362e6f0258f666d9210b8
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
Name: ceph-ansible
-Version: 0
-Release: 0.1.%{commitdate}git%{shortcommit}%{?dist}
+Version: 1.0.1
+Release: 2%{?dist}
Summary: Ansible playbooks for Ceph
-License: MIT
+# Some files have been copied from Ansbile (GPLv3+). For example:
+# library/ceph_facts
+# plugins/actions/config_template.py
+# roles/ceph-common/plugins/actions/config_template.py
+License: ASL 2.0 and GPLv3+
URL: https://github.com/ceph/ceph-ansible
-Source0: https://github.com/ceph/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+Source0: https://github.com/ceph/%{name}/archive/v%{version}/%{name}-v%{version}.tar.gz
BuildArch: noarch
BuildRequires: ansible
+Requires: ansible
+
%description
Ansible playbooks for Ceph
%prep
-%autosetup -p1 -n %{name}-%{commit}
+%autosetup -p1
%build
@@ -42,5 +41,9 @@ ansible-playbook -i dummy-ansible-hosts test.yml --syntax-check
%{_datarootdir}/ceph-ansible
%changelog
+* Mon Mar 07 2016 Ken Dreyer <ktdreyer@ktdreyer.com> - 1.0.1-1
+- Update to latest upstream release
+- Correct License field (rhbz#1313477)
+
* Mon Feb 29 2016 Ken Dreyer <kdreyer@redhat.com> - 0-0.1.20160229gitf9c3159
- initial package
diff --git a/sources b/sources
index 7c2b864..69f1e79 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee2d9e1e60cf39a969e9ca228cce3489 ceph-ansible-0-f9c3159.tar.gz
+9a971584e4d7562cd809586ea3b1ffbc ceph-ansible-v1.0.1.tar.gz