diff --git a/less.changes b/less.changes index 8da4da6..c23455c 100644 --- a/less.changes +++ b/less.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 24 16:35:20 UTC 2014 - tchvatal@suse.com + +- Spec-cleaner +- Remove jless less-normal provides/obsoletes they are from 2000 + ------------------------------------------------------------------- Tue Jul 29 14:06:26 UTC 2014 - pgajdos@suse.com diff --git a/less.spec b/less.spec index c5a726f..b6a7c95 100644 --- a/less.spec +++ b/less.spec @@ -17,12 +17,6 @@ Name: less -BuildRequires: automake -BuildRequires: ncurses-devel -Obsoletes: jless -Provides: jless -Provides: normal-less -Requires: file Version: 458 Release: 0 Summary: Text File Browser and Pager Similar to more @@ -40,6 +34,9 @@ Patch25: %{name}-429-widechars.patch Patch26: %{name}-429-shell.patch Patch27: %{name}-429-save_line_position.patch Patch28: %{name}-429-more.patch +BuildRequires: automake +BuildRequires: ncurses-devel +Requires: file BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,33 +58,30 @@ start an editor at any time from within less. # rather fix permissions for all files chmod u+w * # -cp %{S:1} %{S:2} %{S:3} %{S:4} . +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} . %build autoreconf -fiv %configure --with-pic # # regenerate help.c because less.hlp was patched -make mkhelp +make %{?_smp_mflags} mkhelp ./mkhelp help.c # # build less make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT/ install +%make_install # # lesskey -install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir} -install -m 644 lesskey.src $RPM_BUILD_ROOT/%{_sysconfdir}/lesskey -$RPM_BUILD_ROOT%{_bindir}/lesskey -o $RPM_BUILD_ROOT%{_sysconfdir}/lesskey.bin $RPM_BUILD_ROOT%{_sysconfdir}/lesskey +install -m 755 -d %{buildroot}/%{_sysconfdir} +install -m 644 lesskey.src %{buildroot}/%{_sysconfdir}/lesskey +%{buildroot}%{_bindir}/lesskey -o %{buildroot}%{_sysconfdir}/lesskey.bin %{buildroot}%{_sysconfdir}/lesskey # # preprocessor -install -m 755 lessopen.sh lessclose.sh $RPM_BUILD_ROOT/%{_bindir} -%__chmod -x LICENSE COPYING NEWS README.SUSE - -%clean -rm -rf $RPM_BUILD_ROOT +install -m 755 lessopen.sh lessclose.sh %{buildroot}/%{_bindir} +chmod -x LICENSE COPYING NEWS README.SUSE %files %defattr(-, root, root)