Update to diff-lcs 1.1.3.

This commit is contained in:
Vít Ondruch 2012-08-17 16:24:46 +02:00
parent deea88c80f
commit ef882e6f61
3 changed files with 61 additions and 50 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
diff-lcs-1.1.2.gem diff-lcs-1.1.2.gem
/diff-lcs-1.1.3.gem

View File

@ -1,25 +1,21 @@
%global gemdir %{gem_dir} %global gem_name diff-lcs
%global gemname diff-lcs
%global gem_name %{gemname}
%global geminstdir %{gem_instdir}
%global rubyabi 1.9.1 %global rubyabi 1.9.1
Summary: Provide a list of changes between two sequenced collections Summary: Provide a list of changes between two sequenced collections
Name: rubygem-%{gemname} Name: rubygem-%{gem_name}
Version: 1.1.2 Version: 1.1.3
Release: 8%{?dist} Release: 1%{?dist}
Group: Development/Languages Group: Development/Languages
License: GPLv2+ or Ruby or Artistic License: GPLv2+ or Ruby or Artistic
URL: http://rubyforge.org/projects/ruwiki/ URL: http://rubyforge.org/projects/ruwiki/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
Requires: ruby(abi) = %{rubyabi} Requires: ruby(abi) = %{rubyabi}
Requires: rubygems Requires: rubygems
BuildRequires: rubygems-devel BuildRequires: rubygems-devel
BuildRequires: rubygem(minitest) BuildRequires: %{_bindir}/rspec
BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: ruby(abi) = %{rubyabi}
BuildArch: noarch BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version} Provides: rubygem(%{gem_name}) = %{version}
%description %description
Diff::LCS is a port of Algorithm::Diff that uses the McIlroy-Hunt longest Diff::LCS is a port of Algorithm::Diff that uses the McIlroy-Hunt longest
@ -39,28 +35,30 @@ This package contains documentation for %{name}.
%prep %prep
%setup -q -c -T %setup -q -c -T
mkdir -p .%{gemdir} mkdir -p .%{gem_dir}
gem install --local --install-dir .%{gemdir} \ gem install --local --install-dir .%{gem_dir} \
-V \ --bindir .%{_bindir} \
--force --rdoc %{SOURCE0} --force %{SOURCE0}
%build %build
%install %install
mkdir -p $RPM_BUILD_ROOT%{gemdir} mkdir -p %{buildroot}%{gem_dir}
mkdir -p $RPM_BUILD_ROOT/%{_bindir} 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} find %{buildroot}%{gem_instdir}/bin -type f |xargs chmod a+x
rmdir $RPM_BUILD_ROOT%{gemdir}/bin
find $RPM_BUILD_ROOT%{geminstdir}/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 # We strip bad shebangs (/usr/bin/env) instead of fixing them
# since these files are not executable anyways # 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 -exec grep -q '^#!' '{}' \; -print |while read F
do do
awk '/^#!/ {if (FNR == 1) next;} {print}' $F >chopped awk '/^#!/ {if (FNR == 1) next;} {print}' $F >chopped
@ -68,28 +66,40 @@ do
mv chopped $F mv chopped $F
done done
# Fix shebangs.
sed -i 's|^#!.*|#!/usr/bin/ruby|' %{buildroot}%{gem_instdir}/bin/{htmldiff,ldiff}
%check %check
pushd .%{geminstdir} pushd .%{gem_instdir}
ruby -Ilib tests/*.rb rspec spec
popd
%files %files
%{_bindir}/ldiff %{_bindir}/ldiff
%{_bindir}/htmldiff %{_bindir}/htmldiff
%dir %{geminstdir} %dir %{gem_instdir}
%{geminstdir}/bin %exclude %{gem_instdir}/.*
%{geminstdir}/lib %doc %{gem_instdir}/License.rdoc
%{geminstdir}/[A-Z]* %doc %{gem_instdir}/docs
%exclude %{geminstdir}/Rakefile %{gem_instdir}/bin
%{gemdir}/cache/%{gemname}-%{version}.gem %{gem_libdir}
%{gemdir}/specifications/%{gemname}-%{version}.gemspec %exclude %{gem_cache}
%{gem_spec}
%files doc %files doc
%{geminstdir}/Rakefile %doc %{gem_docdir}
%{geminstdir}/tests/ %doc %{gem_instdir}/History.rdoc
%{gemdir}/doc/%{gemname}-%{version} %doc %{gem_instdir}/Manifest.txt
%{gem_instdir}/Rakefile
%{gem_instdir}/diff-lcs.gemspec
%doc %{gem_instdir}/README.rdoc
%{gem_instdir}/spec
%changelog %changelog
* Fri Aug 17 2012 Vít Ondruch <vondruch@redhat.com> - 1.1.3-1
- Update to diff-lcs 1.1.3.
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-8 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

View File

@ -1 +1 @@
60524d29b37f76d56ce835323e324879 diff-lcs-1.1.2.gem 86595b4618756d1dceac28e6104e285f diff-lcs-1.1.3.gem