From 2586df6a93cef8d990c66fb85f0c14084cfea5e8 Mon Sep 17 00:00:00 2001 From: Thibault North Date: Dec 12 2012 16:14:21 +0000 Subject: Update to 21.1.2 --- diff --git a/.gitignore b/.gitignore index 2db353f..c2ed378 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /autojump_v15.tar.gz /autojump_v19.tar.gz /autojump_v20.tar.gz +/autojump_v21.1.2.tar.gz diff --git a/autojump.spec b/autojump.spec index 980cddf..d4ec0a3 100644 --- a/autojump.spec +++ b/autojump.spec @@ -1,6 +1,6 @@ Name: autojump -Version: 20 -Release: 2%{?dist} +Version: 21.1.2 +Release: 1%{?dist} Summary: A fast way to navigate your filesystem from the command line @@ -11,6 +11,7 @@ Source: https://github.com/downloads/joelthelion/%{name}/%{name}_v%{vers BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: pandoc Requires: python %description @@ -31,9 +32,17 @@ autojump-zsh is designed to work with zsh. %prep %setup -q -n %{name}_v%{version} +# Fix shebang +sed -i 's|/usr/bin/env python|/usr/bin/python|' bin/%{name} +for i in bin/jumpapplet tests/runtests.py; do + sed -i 's|/usr/bin/env python2|/usr/bin/python|' "$i" +done %build +make docs +%check +python tests/runtests.py %install rm -rf $RPM_BUILD_ROOT @@ -41,15 +50,15 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} # There must be a more elegant way to do that -install -p icon.png $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.png -install -Dp %{name} $RPM_BUILD_ROOT%{_bindir}/%{name} -install -p jumpapplet $RPM_BUILD_ROOT%{_bindir}/jumpapplet -install -Dpm 644 _j $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/_j -install -Dpm 644 %{name}.bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/%{name}.bash -install -Dpm 644 %{name}.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/%{name}.sh -install -Dpm 644 %{name}.zsh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/%{name}.zsh - -install -Dpm 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +install -p bin/icon.png $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.png +install -Dp bin/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name} +install -p bin/jumpapplet $RPM_BUILD_ROOT%{_bindir}/jumpapplet +install -Dpm 644 bin/_j $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/_j +install -Dpm 644 bin/%{name}.bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/%{name}.bash +install -Dpm 644 bin/%{name}.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/%{name}.sh +install -Dpm 644 bin/%{name}.zsh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/%{name}.zsh + +install -Dpm 644 docs/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 # jumpapplet needs autojump.py ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}.py @@ -58,7 +67,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING README.md +%doc LICENSE README.md AUTHORS %{_bindir}/%{name} %{_bindir}/%{name}.py %{_bindir}/jumpapplet @@ -74,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zsh/site-functions/_j %changelog +* Wed Dec 12 2012 Thibault North - 21.1.2-1 +- Update to 21.1.2 + * Wed Jul 18 2012 Fedora Release Engineering - 20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index b449772..ed92321 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5297817c33959cb5afc070f5d174b24f autojump_v20.tar.gz +9b6dba043774db140434e18988fa9220 autojump_v21.1.2.tar.gz