New version 1.2.1

.gitignore

@@ -1,2 +1,3 @@
 /hiera-1.0.0rc3.tar.gz
 /hiera-1.0.0.tar.gz
+/hiera-1.2.1.tar.gz

hiera.spec

@@ -10,17 +10,14 @@
 %endif
 
 Name:           hiera
-Version:        1.0.0
-Release:        6%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        A simple hierarchical database supporting plugin data sources
 
 Group:          System Environment/Base
 License:        ASL 2.0
 URL:            http://projects.puppetlabs.com/projects/%{name}/
 Source0:        http://downloads.puppetlabs.com/hiera/%{name}-%{version}.tar.gz
-# We use a copy of misreleased 'newer' version of 1.0.0
-# http://projects.puppetlabs.com/issues/16621
-Source1:        hiera.yaml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 %if 0%{?with_checks}
@@ -43,7 +40,6 @@ A simple hierarchical database supporting plugin data sources.
 
 %prep
 %setup -q
-cp -p %{SOURCE1} hiera.yaml
 
 %build
 # Nothing to build
@@ -56,7 +52,7 @@ mkdir -p %{buildroot}%{_bindir}
 cp -pr lib/hiera %{buildroot}%{ruby_vendorlibdir} 
 cp -pr lib/hiera.rb %{buildroot}%{ruby_vendorlibdir} 
 install -p -m0755 bin/hiera %{buildroot}%{_bindir}
-install -p -m0644 hiera.yaml %{buildroot}%{_sysconfdir}
+install -p -m0644 ext/hiera.yaml %{buildroot}%{_sysconfdir}
 mkdir -p %{buildroot}%{_var}/lib/hiera
 
 %check
@@ -74,10 +70,13 @@ rm -rf %{buildroot}
 %{ruby_vendorlibdir}/hiera
 %dir %{_var}/lib/hiera
 %config(noreplace) %{_sysconfdir}/hiera.yaml
-%doc CHANGELOG COPYING README.md LICENSE
+%doc COPYING README.md LICENSE
 
 
 %changelog
+* Mon Sep 16 2013 Steve Traylen <steve.traylen@cern.ch> - 1.2.1-1
+- New version 1.2.1
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

sources

@@ -1 +1 @@
-31083205f08525debca8ce39f6a3ee67  hiera-1.0.0.tar.gz
+3c8f60fab2a4a023fba8d3494b13a57d  hiera-1.2.1.tar.gz