From ef882e6f61cf3b2fe4e37f449abdbaddf02de889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 17 Aug 2012 16:24:46 +0200 Subject: [PATCH] Update to diff-lcs 1.1.3. --- .gitignore | 1 + rubygem-diff-lcs.spec | 108 +++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 61 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 6f9301e..4360215 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ diff-lcs-1.1.2.gem +/diff-lcs-1.1.3.gem diff --git a/rubygem-diff-lcs.spec b/rubygem-diff-lcs.spec index caa921c..23aca63 100644 --- a/rubygem-diff-lcs.spec +++ b/rubygem-diff-lcs.spec @@ -1,25 +1,21 @@ -%global gemdir %{gem_dir} -%global gemname diff-lcs -%global gem_name %{gemname} -%global geminstdir %{gem_instdir} +%global gem_name diff-lcs +%global rubyabi 1.9.1 -%global rubyabi 1.9.1 - -Summary: Provide a list of changes between two sequenced collections -Name: rubygem-%{gemname} -Version: 1.1.2 -Release: 8%{?dist} -Group: Development/Languages -License: GPLv2+ or Ruby or Artistic -URL: http://rubyforge.org/projects/ruwiki/ -Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem -Requires: ruby(abi) = %{rubyabi} -Requires: rubygems -BuildRequires: rubygems-devel -BuildRequires: rubygem(minitest) -BuildRequires: ruby(abi) = %{rubyabi} -BuildArch: noarch -Provides: rubygem(%{gemname}) = %{version} +Summary: Provide a list of changes between two sequenced collections +Name: rubygem-%{gem_name} +Version: 1.1.3 +Release: 1%{?dist} +Group: Development/Languages +License: GPLv2+ or Ruby or Artistic +URL: http://rubyforge.org/projects/ruwiki/ +Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem +Requires: ruby(abi) = %{rubyabi} +Requires: rubygems +BuildRequires: rubygems-devel +BuildRequires: %{_bindir}/rspec +BuildRequires: ruby(abi) = %{rubyabi} +BuildArch: noarch +Provides: rubygem(%{gem_name}) = %{version} %description Diff::LCS is a port of Algorithm::Diff that uses the McIlroy-Hunt longest @@ -28,39 +24,41 @@ two sequenced enumerable containers. The implementation is based on Mario I. Wolczko's Smalltalk version (1.2, 1993) and Ned Konz's Perl version (Algorithm::Diff). -%package doc -Summary: Documentation for %{name} -Group: Documentation +%package doc +Summary: Documentation for %{name} +Group: Documentation -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} -%description doc +%description doc This package contains documentation for %{name}. %prep %setup -q -c -T -mkdir -p .%{gemdir} -gem install --local --install-dir .%{gemdir} \ - -V \ - --force --rdoc %{SOURCE0} +mkdir -p .%{gem_dir} +gem install --local --install-dir .%{gem_dir} \ + --bindir .%{_bindir} \ + --force %{SOURCE0} %build %install -mkdir -p $RPM_BUILD_ROOT%{gemdir} -mkdir -p $RPM_BUILD_ROOT/%{_bindir} +mkdir -p %{buildroot}%{gem_dir} +mkdir -p %{buildroot}/%{_bindir} -cp -a .%{gemdir}/* $RPM_BUILD_ROOT%{gemdir} +cp -a .%{gem_dir}/* %{buildroot}%{gem_dir} +cp -a .%{_bindir}/* %{buildroot}/%{_bindir} -mv $RPM_BUILD_ROOT%{gemdir}/bin/* $RPM_BUILD_ROOT/%{_bindir} -rmdir $RPM_BUILD_ROOT%{gemdir}/bin -find $RPM_BUILD_ROOT%{geminstdir}/bin -type f |xargs chmod a+x +find %{buildroot}%{gem_instdir}/bin -type f |xargs chmod a+x + +# Remove the bad shebangs. +# https://github.com/halostatue/diff-lcs/pull/9 # We strip bad shebangs (/usr/bin/env) instead of fixing them # since these files are not executable anyways -find $RPM_BUILD_ROOT%{gemdir} \( -name '*.rb' -o -name 'Rakefile' \) \ +find %{buildroot}%{gem_dir} \( -name '*.rb' -o -name 'Rakefile' \) \ -exec grep -q '^#!' '{}' \; -print |while read F do awk '/^#!/ {if (FNR == 1) next;} {print}' $F >chopped @@ -68,28 +66,40 @@ do mv chopped $F done +# Fix shebangs. +sed -i 's|^#!.*|#!/usr/bin/ruby|' %{buildroot}%{gem_instdir}/bin/{htmldiff,ldiff} + %check -pushd .%{geminstdir} -ruby -Ilib tests/*.rb +pushd .%{gem_instdir} +rspec spec +popd %files %{_bindir}/ldiff %{_bindir}/htmldiff -%dir %{geminstdir} -%{geminstdir}/bin -%{geminstdir}/lib -%{geminstdir}/[A-Z]* -%exclude %{geminstdir}/Rakefile -%{gemdir}/cache/%{gemname}-%{version}.gem -%{gemdir}/specifications/%{gemname}-%{version}.gemspec +%dir %{gem_instdir} +%exclude %{gem_instdir}/.* +%doc %{gem_instdir}/License.rdoc +%doc %{gem_instdir}/docs +%{gem_instdir}/bin +%{gem_libdir} +%exclude %{gem_cache} +%{gem_spec} %files doc -%{geminstdir}/Rakefile -%{geminstdir}/tests/ -%{gemdir}/doc/%{gemname}-%{version} +%doc %{gem_docdir} +%doc %{gem_instdir}/History.rdoc +%doc %{gem_instdir}/Manifest.txt +%{gem_instdir}/Rakefile +%{gem_instdir}/diff-lcs.gemspec +%doc %{gem_instdir}/README.rdoc +%{gem_instdir}/spec %changelog +* Fri Aug 17 2012 Vít Ondruch - 1.1.3-1 +- Update to diff-lcs 1.1.3. + * Sat Jul 21 2012 Fedora Release Engineering - 1.1.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 5609f69..549966f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -60524d29b37f76d56ce835323e324879 diff-lcs-1.1.2.gem +86595b4618756d1dceac28e6104e285f diff-lcs-1.1.3.gem