Accepting request 720147 from home:scarabeus_iv:branches:Base:System

- Use python3 instead of python as we do not need to depend on
  python2
- Format with spec-cleaner
- update to 4.8.23:
  * Modify "File exists" query dialog (#3935):
  * Speed up of large directory structures delete (#3958)
  * Support key binding for menu (#212)
  * Syntax updates:
    + shell (#3981)
    + ebuild (#3988)
    + RPM spec (#3991)
  * Code cleanup (#3955)
  * Use Geeqie (a fork of GQview) as main image viewer, fallback to GQview (#3962)
  * various small fixes
- Refresh patches:
  * mc-multi-press-f-keys.patch
  * sftp_interactive_password.patch

OBS-URL: https://build.opensuse.org/request/show/720147
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=126
This commit is contained in:
2019-08-01 13:36:12 +00:00
committed by Git OBS Bridge
parent b575a4c142
commit eb8146e32e
8 changed files with 85 additions and 62 deletions

54
mc.spec
View File

@@ -12,17 +12,17 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: mc
Version: 4.8.23
Release: 0
Summary: Midnight Commander
License: GPL-3.0-or-later
Group: Productivity/File utilities
Url: http://midnight-commander.org/
Version: 4.8.22
Release: 0
URL: https://midnight-commander.org/
Source0: http://ftp.midnight-commander.org/mc-%{version}.tar.xz
Source1: x11_browser
Source2: %{name}.desktop
@@ -30,26 +30,17 @@ Source3: %{name}.png
Source4: cmake.syntax
Source6: http://ftp.midnight-commander.org/%{name}-%{version}.sha256
Patch0: mc-fix_lib_search_path.patch
Patch61: mc-extd-misc.patch
Patch62: mc-extd-video.patch
Patch63: mc-extd-doc.patch
Patch64: mc-extd-sound.patch
Patch69: mc-extd-xdg.patch
Patch71: mc-ext-audio.patch
Patch12: mc-wrapper.patch
Patch16: mc-esc-seq.patch
Patch17: mc-rpm.patch
Patch20: mc-f-keys.patch
Patch21: mc-extfs-helpers-deb.patch
# add patch. bnc#856501
# http://www.midnight-commander.org/ticket/3128
Patch22: mc-vfs-fish-deleted_source_file.patch
# changed mc-extfs-iso9660-xorriso.patch
# to reflect upstream fix
Patch23: mc-extfs-iso9660-xorriso.patch
#Debian fixes
Patch32: 20_wrong_path_to_wrappers.patch
# PATCH-FIX-UPSTREAM mc-multi-press-f-keys.patch mc287 sbrabec@suse.cz - Fixed Esc + Numeral F-key emulation.
@@ -59,11 +50,14 @@ Patch41: mc-multi-press-f-keys.patch
Patch52: mc-pie.patch
# mc-startup-timeout.patch mc3082 nadvornik@suse.cz - fix for long timeout on startup, bnc#824729
Patch60: mc-startup-timeout.patch
Patch61: mc-extd-misc.patch
Patch62: mc-extd-video.patch
Patch63: mc-extd-doc.patch
Patch64: mc-extd-sound.patch
Patch69: mc-extd-xdg.patch
Patch71: mc-ext-audio.patch
Patch100: xls2csv_update.patch
Patch101: sftp_interactive_password.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audiofile-devel
BuildRequires: e2fsprogs-devel
BuildRequires: gettext >= 0.18.1
@@ -79,7 +73,8 @@ BuildRequires: xorg-x11-devel
BuildRequires: xz
Requires(pre): permissions
Recommends: %{name}-lang = %{version}
Recommends: mkisofs xorriso
Recommends: mkisofs
Recommends: xorriso
%description
GNU Midnight Commander (also referred to as MC) is a user shell much
@@ -91,10 +86,11 @@ GNU Midnight Commander allows you to manage files while making most of
your screen and giving you a clear representation of the filesystem, yet
it's simple enough to be run over a telnet or ssh session.
MC needs several other programs for its various extfs extensions, e.g.
MC needs several other programs for its various extfs extensions, e.g.
isoinfo (from mkisofs) or xorriso for the iso:// extension.
%lang_package
%prep
echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64` %{SOURCE0}" | sha256sum -c
%setup -q
@@ -111,7 +107,7 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64` %{SOU
%patch20
%patch21
%patch22 -p1
%patch23 -p0
%patch23
%patch32
%patch41 -p1
%patch52 -p1
@@ -120,14 +116,16 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64` %{SOU
%patch101 -p1
%build
autoreconf --force --install
autoreconf -fvi
%define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security -Wno-unused-parameter
export CFLAGS="$RPM_OPT_FLAGS %{warn_flags}"
export CFLAGS="%{optflags} %{warn_flags}"
export X11_WWW="%{_datadir}/mc/x11_browser"
export PYTHON=%{_bindir}/python3
%configure \
--localstatedir=/var/lib \
--localstatedir=%{_localstatedir}/lib \
--enable-charset \
--enable-vfs-smb --with-smb-configdir=%{_sysconfdir}/samba \
--disable-vfs-fish
@@ -135,7 +133,7 @@ export X11_WWW="%{_datadir}/mc/x11_browser"
make %{?_smp_mflags} V=1
%install
make DESTDIR=%{buildroot} install
%make_install
# clean up this setuid problem for now
chmod 755 %{buildroot}/%{_libexecdir}/mc/cons.saver
@@ -147,8 +145,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/profile.d
ln -fs -t %{buildroot}%{_sysconfdir}/profile.d %{_datadir}/mc/mc.{,c}sh
#support script for calling available GUI webbrosers
install -m 755 %{SOURCE1} %{buildroot}%{_datadir}/mc/
install -D -m 644 %{S:3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -D -m 644 %{S:3} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
for f in ext.d/misc.sh ext.d/sound.sh ext.d/video.sh \
extfs.d/gitfs+ extfs.d/uace extfs.d/uarc ;
@@ -156,11 +154,11 @@ do
sed -i -e '1s@bin/sh@bin/bash@' "%{buildroot}%{_libexecdir}/mc/${f}"
done
%suse_update_desktop_file -i %name System FileManager
%suse_update_desktop_file -i %{name} System FileManager
# Remove not supported language
rm -rf %{buildroot}%{_datadir}/locale/be@tarask
%find_lang %name
%find_lang %{name}
%post
%if 0%{?suse_version} >= 1140
@@ -210,7 +208,7 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask
%dir %{_datadir}/icons/hicolor/32x32/apps
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%files lang -f %name.lang
%files lang -f %{name}.lang
%if 0%{?suse_version} < 1140 || 0%{?sles_version} && 0%{?sles_version} <= 11
%lang(sv) %dir %{_datadir}/locale/sv_SE
%lang(sv) %dir %{_datadir}/locale/sv_SE/LC_MESSAGES