diff --git a/.gitignore b/.gitignore index 835291c..a860afa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ -/hiera-1.0.0rc3.tar.gz -/hiera-1.0.0.tar.gz -/hiera-1.2.1.tar.gz -/hiera-1.3.1.tar.gz -/hiera-1.3.2.tar.gz -/hiera-1.3.3.tar.gz -/hiera-1.3.4.tar.gz +*~ +*.rpm +*.tar.gz +*.tar.gz.asc +/hiera-*/ +/.build*.log diff --git a/0001-Fix-errors-with-Puppet-4.patch b/0001-Fix-errors-with-Puppet-4.patch deleted file mode 100644 index 890cce7..0000000 --- a/0001-Fix-errors-with-Puppet-4.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 376cbbe7cf344f395087dfb04c509bff47b105a2 Mon Sep 17 00:00:00 2001 -From: Haikel Guemar -Date: Mon, 18 May 2015 19:48:04 +0200 -Subject: [PATCH] Fix errors with Puppet 4 - -Patch provided by Lukas Bezdicka ---- - lib/hiera/config.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/hiera/config.rb b/lib/hiera/config.rb -index d29da7d..fe854cb 100644 ---- a/lib/hiera/config.rb -+++ b/lib/hiera/config.rb -@@ -67,7 +67,7 @@ class Hiera::Config - # - # @return [Object] return value of {YAML.load_file} - def yaml_load_file(source) -- YAML.load_file(source) -+ YAML.unsafe_load_file(source) - end - private :yaml_load_file - --- -2.4.0 - diff --git a/hiera.spec b/hiera.spec index 6b7bf84..96002dc 100644 --- a/hiera.spec +++ b/hiera.spec @@ -12,14 +12,13 @@ Name: hiera Version: 1.3.4 -Release: 3%{?dist} +Release: 4%{?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 -Patch0: 0001-Fix-errors-with-Puppet-4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %if 0%{?with_checks} @@ -43,7 +42,6 @@ A simple hierarchical database supporting plugin data sources. %prep %setup -q -%patch0 -p1 -b .puppet4 %build # Nothing to build @@ -78,6 +76,9 @@ rm -rf %{buildroot} %changelog +* Thu Jul 30 2015 Gaƫl Chamoulaud - 1.3.4-4 +- Removed 0001-Fix-errors-with-Puppet-4.patch + * Wed Jun 17 2015 Fedora Release Engineering - 1.3.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -85,7 +86,7 @@ rm -rf %{buildroot} - Fix errors with Puppet4 (patch from Lukas Bezdicka) * Wed Jun 11 2014 Steve Traylen - 1.3.4-1 -- New version 1.3.4 +- New version 1.3.4 * Sat Jun 07 2014 Fedora Release Engineering - 1.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild