#1 Update to 1.9.1
Closed 5 years ago by filiperosset. Opened 6 years ago by fszymanski.
rpms/ fszymanski/ranger master  into  master

Update to 1.9.1
Filip Szymański • 6 years ago  
@@ -1,16 +0,0 @@ 

- diff -u -r -U5 --no-dereference ranger-1.7.1/ranger/ext/img_display.py ranger-1.7.1.w3m-img-path/ranger/ext/img_display.py

- --- ranger-1.7.1/ranger/ext/img_display.py	2015-05-04 13:36:50.000000000 -0400

- +++ ranger-1.7.1.w3m-img-path/ranger/ext/img_display.py	2015-09-26 14:30:15.297490819 -0400

- @@ -19,11 +19,11 @@

-  import sys

-  import termios

-  from ranger.core.shared import FileManagerAware

-  from subprocess import Popen, PIPE

-  

- -W3MIMGDISPLAY_PATH = '/usr/lib/w3m/w3mimgdisplay'

- +W3MIMGDISPLAY_PATH = '/usr/libexec/w3m/w3mimgdisplay'

-  W3MIMGDISPLAY_OPTIONS = []

-  

-  class ImgDisplayUnsupportedException(Exception):

-      pass

-  

file modified
+27 -21
@@ -1,20 +1,16 @@ 

  Name:           ranger

- Version:        1.7.2

- Release:        8%{?dist}

- Summary:        A flexible console file manager

+ Version:        1.9.1

+ Release:        1%{?dist}

+ Summary:        A vim-like file manager

  

- Group:          Development/Languages

  License:        GPLv3+

- URL:            http://savannah.nongnu.org/projects/ranger/

- Source0:        http://git.savannah.gnu.org/cgit/%{name}.git/snapshot/%{name}-%{version}.tar.gz

- 

- # Fedora-specific patches

- # w3mimgdisplay is in /usr/libexec on Fedora

- Patch101:       ranger-fedora-1.7.1-w3m-img-path.patch

+ URL:            https://github.com/%{name}/%{name}

+ Source0:        https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz

  

  BuildArch:      noarch

+ BuildRequires:  desktop-file-utils

  BuildRequires:  python3-devel

- 

+ BuildRequires:  python3-setuptools

  #Suggests:       w3m-img

  

  %description
@@ -26,30 +22,40 @@ 

  

  

  %prep

- %setup -q

- %patch101 -p1 -b .w3m-img-path

+ %autosetup

+ 

+ sed -i -e '1d;2i#!/usr/bin/python3' %{name}.py

  

  

  %build

- %{__python3} setup.py build

+ %py3_build

  

  

  %install

- %{__python3} setup.py install -O1 --skip-build --root %{buildroot}

- mv %{buildroot}%{_docdir}/%{name} rpmdocs

- find rpmdocs -type f -exec chmod -v -R -X '{}' \;

+ %py3_install

+ 

+ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop

+ 

+ mv %{buildroot}%{_pkgdocdir} _doc

+ find _doc -type f -exec chmod -R -x '{}' \;

  

  

  %files

- %doc rpmdocs/*

- %{_bindir}/ranger

+ %license LICENSE

+ %doc _doc/*

+ %{_bindir}/%{name}

  %{_bindir}/rifle

+ %{_datadir}/applications/%{name}.desktop

+ %{_mandir}/man1/%{name}.1*

+ %{_mandir}/man1/rifle.1*

  %{python3_sitelib}/*

- %{_mandir}/man1/ranger.1.gz

- %{_mandir}/man1/rifle.1.gz

  

  

  %changelog

+ * Mon Apr 30 2018 Filip Szymański <fszymanski@fedoraproject.org> - 1.9.1-1

+ - Update to 1.9.1

+ - Major spec file cleanup

+ 

  * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-8

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

  

no initial comment

Can not be merged due to conflicts. Is it possible to resolve/rebase it?

I'll update to 1.9.2 today.

Pull-Request has been closed by filiperosset

5 years ago