From 9dcce56257064046d88da77486fafe824b7a1622 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 3 Apr 2024 22:26:44 +0200 Subject: [PATCH] - drop noperl-vfs --- mc-noperl-vfs.patch | 190 -------------------------------------------- mc.spec | 23 +++--- 2 files changed, 9 insertions(+), 204 deletions(-) delete mode 100644 mc-noperl-vfs.patch diff --git a/mc-noperl-vfs.patch b/mc-noperl-vfs.patch deleted file mode 100644 index 613b3b6..0000000 --- a/mc-noperl-vfs.patch +++ /dev/null @@ -1,190 +0,0 @@ -diff -urN mc-4.6.0-orig/configure.in mc-4.6.0/configure.in ---- mc-4.6.0-orig/configure.in 2004-02-06 21:06:20.000000000 +0100 -+++ mc-4.6.0/configure.in 2004-02-06 21:09:06.553523944 +0100 -@@ -571,24 +571,14 @@ - - lib/mc.ext - --vfs/extfs/a --vfs/extfs/apt - vfs/extfs/audio --vfs/extfs/deb --vfs/extfs/deba --vfs/extfs/debd --vfs/extfs/dpkg - vfs/extfs/hp48 - vfs/extfs/lslR --vfs/extfs/mailfs --vfs/extfs/patchfs --vfs/extfs/rpms - vfs/extfs/uar - vfs/extfs/uarj - vfs/extfs/uha - vfs/extfs/ulha - vfs/extfs/urar --vfs/extfs/uzip - vfs/extfs/uzoo - - doc/mc.1 doc/mcedit.1 doc/mcview.1 doc/mcserv.8 -diff -urN mc-4.6.0-orig/vfs/extfs/Makefile.am mc-4.6.0/vfs/extfs/Makefile.am ---- mc-4.6.0-orig/vfs/extfs/Makefile.am 2004-02-06 21:06:20.000000000 +0100 -+++ mc-4.6.0/vfs/extfs/Makefile.am 2004-02-06 21:11:58.898323552 +0100 -@@ -8,46 +8,26 @@ - - # Scripts that need adaptation to the local system - source files - EXTFS_IN = \ -- a.in \ -- apt.in \ - audio.in \ -- deb.in \ -- deba.in \ -- debd.in \ -- dpkg.in \ - hp48.in \ - lslR.in \ -- mailfs.in \ -- patchfs.in \ -- rpms.in \ - uar.in \ - uarj.in \ - uha.in \ - ulha.in \ - urar.in \ -- uzip.in \ - uzoo.in - - # Scripts that need adaptation to the local system - files to install - EXTFS_OUT = \ -- a \ -- apt \ - audio \ -- deb \ -- deba \ -- debd \ -- dpkg \ - hp48 \ - lslR \ -- mailfs \ -- patchfs \ -- rpms \ - uar \ - uarj \ - uha \ - ulha \ - urar \ -- uzip \ - uzoo - - if USE_VFS -diff -urN mc-4.6.0-orig/vfs/extfs/Makefile.in mc-4.6.0/vfs/extfs/Makefile.in ---- mc-4.6.0-orig/vfs/extfs/Makefile.in 2003-02-05 19:09:10.000000000 +0100 -+++ mc-4.6.0/vfs/extfs/Makefile.in 2004-02-06 21:14:28.548573256 +0100 -@@ -193,47 +193,26 @@ - - # Scripts that need adaptation to the local system - source files - EXTFS_IN = \ -- a.in \ -- apt.in \ - audio.in \ -- deb.in \ -- deba.in \ -- debd.in \ -- dpkg.in \ - hp48.in \ - lslR.in \ -- mailfs.in \ -- patchfs.in \ -- rpms.in \ - uar.in \ - uarj.in \ - uha.in \ - ulha.in \ - urar.in \ -- uzip.in \ - uzoo.in - - - # Scripts that need adaptation to the local system - files to install - EXTFS_OUT = \ -- a \ -- apt \ - audio \ -- deb \ -- deba \ -- debd \ -- dpkg \ -- hp48 \ - lslR \ -- mailfs \ -- patchfs \ -- rpms \ - uar \ - uarj \ - uha \ - ulha \ - urar \ -- uzip \ - uzoo - - -@@ -244,17 +223,14 @@ - subdir = vfs/extfs - mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = a apt audio deb deba debd dpkg hp48 lslR mailfs \ -- patchfs rpms uar uarj uha ulha urar uzip uzoo -+CONFIG_CLEAN_FILES = audio hp48 lslR uar uarj uha ulha urar uzoo - SCRIPTS = $(extfs_SCRIPTS) - - DIST_SOURCES = - DATA = $(extfs_DATA) - --DIST_COMMON = README Makefile.am Makefile.in a.in apt.in audio.in \ -- deb.in deba.in debd.in dpkg.in hp48.in lslR.in mailfs.in \ -- patchfs.in rpms.in uar.in uarj.in uha.in ulha.in urar.in \ -- uzip.in uzoo.in -+DIST_COMMON = README Makefile.am Makefile.in audio.in hp48.in \ -+ lslR.in uar.in uarj.in uha.in ulha.in urar.in uzoo.in - all: all-am - - .SUFFIXES: -@@ -263,30 +239,12 @@ - $(AUTOMAKE) --gnu vfs/extfs/Makefile - Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --a: $(top_builddir)/config.status a.in -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --apt: $(top_builddir)/config.status apt.in -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - audio: $(top_builddir)/config.status audio.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --deb: $(top_builddir)/config.status deb.in -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --deba: $(top_builddir)/config.status deba.in -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --debd: $(top_builddir)/config.status debd.in -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --dpkg: $(top_builddir)/config.status dpkg.in -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - hp48: $(top_builddir)/config.status hp48.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - lslR: $(top_builddir)/config.status lslR.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --mailfs: $(top_builddir)/config.status mailfs.in -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --patchfs: $(top_builddir)/config.status patchfs.in -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --rpms: $(top_builddir)/config.status rpms.in -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - uar: $(top_builddir)/config.status uar.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - uarj: $(top_builddir)/config.status uarj.in -@@ -297,8 +255,6 @@ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - urar: $(top_builddir)/config.status urar.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --uzip: $(top_builddir)/config.status uzip.in -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - uzoo: $(top_builddir)/config.status uzoo.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - extfsSCRIPT_INSTALL = $(INSTALL_SCRIPT) diff --git a/mc.spec b/mc.spec index f49c4d4..48d379f 100644 --- a/mc.spec +++ b/mc.spec @@ -1,7 +1,6 @@ # # Conditional build: %bcond_with ext2undel # with ext2 undelete fs -%bcond_without perl_vfs # without perl depending vfs'es -- to avoid perl autoreq %bcond_without x # without text edit in X support # Summary: A user-friendly file manager and visual shell @@ -31,8 +30,7 @@ Source8: %{name}.png Patch1: %{name}-no-ws-visible.patch Patch2: %{name}-no-compute-totals.patch Patch3: %{name}-file-find-case-insensitive.patch -Patch4: %{name}-noperl-vfs.patch -Patch5: ebook-ext.patch +Patch4: ebook-ext.patch URL: http://www.midnight-commander.org/ BuildRequires: autoconf >= 2.64 BuildRequires: automake >= 1:1.12 @@ -165,8 +163,7 @@ tar, zip ve RPM dosyalarının içeriklerini gösterebilmesidir. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%{!?with_perl_vfs:%patch4 -p1} -%patch5 -p1 +%patch4 -p1 %{__rm} po/stamp-po @@ -310,26 +307,22 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/mc/extfs.d %{_libexecdir}/mc/extfs.d/README* -%if %{with perl_vfs} %attr(755,root,root) %{_libexecdir}/mc/extfs.d/a+ %attr(755,root,root) %{_libexecdir}/mc/extfs.d/apt+ -%attr(755,root,root) %{_libexecdir}/mc/extfs.d/deb* -%attr(755,root,root) %{_libexecdir}/mc/extfs.d/dpkg+ -%attr(755,root,root) %{_libexecdir}/mc/extfs.d/mailfs -%attr(755,root,root) %{_libexecdir}/mc/extfs.d/patchfs -%attr(755,root,root) %{_libexecdir}/mc/extfs.d/rpms+ -%attr(755,root,root) %{_libexecdir}/mc/extfs.d/ulib -%attr(755,root,root) %{_libexecdir}/mc/extfs.d/uzip -%endif %attr(755,root,root) %{_libexecdir}/mc/extfs.d/audio %attr(755,root,root) %{_libexecdir}/mc/extfs.d/bpp %attr(755,root,root) %{_libexecdir}/mc/extfs.d/changesetfs +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/deb* +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/dpkg+ %attr(755,root,root) %{_libexecdir}/mc/extfs.d/gitfs+ %attr(755,root,root) %{_libexecdir}/mc/extfs.d/hp48+ %attr(755,root,root) %{_libexecdir}/mc/extfs.d/iso9660 %attr(755,root,root) %{_libexecdir}/mc/extfs.d/lslR +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/mailfs +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/patchfs %attr(755,root,root) %{_libexecdir}/mc/extfs.d/patchsetfs %attr(755,root,root) %{_libexecdir}/mc/extfs.d/rpm +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/rpms+ %attr(755,root,root) %{_libexecdir}/mc/extfs.d/s3+ %attr(755,root,root) %{_libexecdir}/mc/extfs.d/trpm %attr(755,root,root) %{_libexecdir}/mc/extfs.d/u7z @@ -340,9 +333,11 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libexecdir}/mc/extfs.d/ucab %attr(755,root,root) %{_libexecdir}/mc/extfs.d/uha %attr(755,root,root) %{_libexecdir}/mc/extfs.d/ulha +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/ulib %attr(755,root,root) %{_libexecdir}/mc/extfs.d/unar %attr(755,root,root) %{_libexecdir}/mc/extfs.d/urar %attr(755,root,root) %{_libexecdir}/mc/extfs.d/uwim +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/uzip %attr(755,root,root) %{_libexecdir}/mc/extfs.d/uzoo %dir %{_libexecdir}/mc/shell %{_libexecdir}/mc/shell/README.shell -- 2.46.0