diff --git a/.gitignore b/.gitignore index caad451..5ab3946 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ haml-2.2.24.gem +haml-3.0.17.gem diff --git a/rubygem-haml.spec b/rubygem-haml.spec index 7e7ce2f..718a8d8 100644 --- a/rubygem-haml.spec +++ b/rubygem-haml.spec @@ -5,7 +5,7 @@ Summary: An elegant, structured XHTML/XML templating engine Name: rubygem-%{gemname} -Version: 3.0.15 +Version: 3.0.17 Release: 1%{?dist} Group: Development/Languages License: MIT and WTFPL @@ -19,11 +19,15 @@ Requires: ruby(abi) = 1.8 Requires: rubygem(hpricot) Requires: rubygem(yard) >= 0.5.3 Requires: rubygem(maruku) >= 0.5.9 +# TODO: Not packaged yet, only required in lib/sass/plugin.rb watch() +#Requires: rubygem(fssm) BuildRequires: rubygems BuildRequires: ruby BuildRequires: rubygem(rails) BuildRequires: rubygem(hpricot) +BuildRequires: rubygem(erubis) +BuildRequires: rubygem(ruby_parser) BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} @@ -83,6 +87,9 @@ find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \; # Find files that are not readable find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \; +# Don't search env - use the expected ruby +find %{buildroot}%{geminstdir}/bin -type f | \ + xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"' %clean rm -rf %{buildroot} @@ -102,11 +109,13 @@ rm -rf %{buildroot} %{geminstdir}/lib %{geminstdir}/rails %{geminstdir}/test +%{geminstdir}/VERSION +%{geminstdir}/VERSION_NAME +# No vendored libraries thanks +%exclude %{geminstdir}/vendor %doc %{gemdir}/doc/%{gemname}-%{version} -%doc %{geminstdir}/VERSION %doc %{geminstdir}/MIT-LICENSE %doc %{geminstdir}/README.md -%doc %{geminstdir}/VERSION_NAME %doc %{geminstdir}/REVISION %doc %{geminstdir}/CONTRIBUTING %{gemdir}/cache/%{gemname}-%{version}.gem @@ -114,6 +123,14 @@ rm -rf %{buildroot} %changelog +* Thu Aug 26 2010 Matthew Kent - 3.0.17-1 +- New upstream version. +- Include VERSION and VERSION_NAME in main package (#627454). +- Exclude vendored copy of fssm. + +* Thu Aug 12 2010 Matthew Kent - 3.0.15-2 +- New BR on rubygem-erubis and ruby_parser. + * Wed Jul 28 2010 Matthew Kent - 3.0.15-1 - New upstream version. - New dependencies on yard/maruku. diff --git a/sources b/sources index 870317a..2757cdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebbe1f6430d86978ff731c2a701c8eab haml-3.0.15.gem +63612cfb698c6dc9312f973f19139cd4 haml-3.0.17.gem