From 6581dc50b83f203d65eac61c00a159ab2a6ddb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 30 Jan 2021 14:34:02 +0100 Subject: RPM: massive update and cleanup --- redhat/applications/krusader/krusader-14.0.0.spec | 183 --------------------- .../krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch | 62 ------- .../applications/krusader/krusader-3.5.13.2.spec | 155 ----------------- redhat/applications/krusader/krusader.spec | 183 +++++++++++++++++++++ 4 files changed, 183 insertions(+), 400 deletions(-) delete mode 100644 redhat/applications/krusader/krusader-14.0.0.spec delete mode 100644 redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch delete mode 100644 redhat/applications/krusader/krusader-3.5.13.2.spec create mode 100644 redhat/applications/krusader/krusader.spec (limited to 'redhat/applications/krusader') diff --git a/redhat/applications/krusader/krusader-14.0.0.spec b/redhat/applications/krusader/krusader-14.0.0.spec deleted file mode 100644 index 260c97e4a..000000000 --- a/redhat/applications/krusader/krusader-14.0.0.spec +++ /dev/null @@ -1,183 +0,0 @@ -# -# spec file for package krusader (version R14) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 2 -%if "%{?tde_version}" == "" -%define tde_version 14.0.0 -%endif -%define tde_pkg krusader -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_tdeappdir %{tde_datadir}/applications/tde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 1.90.0 -Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: Twin-panel (commander-style) file manager for TDE (and other desktops) -Group: Applications/Utilities -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils -BuildRequires: trinity-tdebindings-devel >= %{tde_version} - -BuildRequires: autoconf automake libtool m4 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: fdupes - -# SUSE desktop files utility -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif - -%if 0%{?opensuse_bs} && 0%{?suse_version} -# for xdg-menu script -BuildRequires: brp-check-trinity -%endif - - -%description -Krusader is a simple, easy, powerful, twin-panel (commander-style) file -manager for TDE and other desktops, similar to Midnight Commander (C) or Total -Commander (C). - -It provides all the file management features you could possibly want. - -Plus: extensive archive handling, mounted filesystem support, FTP, -advanced search module, viewer/editor, directory synchronisation, -file content comparisons, powerful batch renaming and much much more. - -It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar, -zip and 7-zip. - -It handles KIOSlaves such as smb:// or fish://. - -Almost completely customizable, Krusader is very user friendly, fast and looks -great on your desktop. - - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" -%suse_update_desktop_file krusader System FileManager -%suse_update_desktop_file krusader_root-mode System FileManager -%endif - - -%clean -%__rm -rf %{buildroot} - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING FAQ README TODO -%{tde_bindir}/krusader -%{tde_tdelibdir}/tdeio_krarc.la -%{tde_tdelibdir}/tdeio_krarc.so -%{tde_tdelibdir}/tdeio_virt.la -%{tde_tdelibdir}/tdeio_virt.so -%{tde_tdeappdir}/krusader.desktop -%{tde_tdeappdir}/krusader_root-mode.desktop -%{tde_datadir}/apps/krusader -%{tde_datadir}/icons/crystalsvg/*/apps/*.png -%{tde_datadir}/icons/locolor/*/apps/*.png -%{tde_datadir}/services/krarc.protocol -%{tde_datadir}/services/virt.protocol -%{tde_mandir}/man1/krusader.1 -%{tde_tdedocdir}/HTML/en/krusader/ -%{tde_tdedocdir}/HTML/en/tdeioslave/krarc/ -%{tde_tdedocdir}/HTML/en/tdeioslave/virt/ -%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/ - - -%changelog diff --git a/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch b/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch deleted file mode 100644 index eb1f41ffd..000000000 --- a/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/krusader/VFS/temp_vfs.cpp b/krusader/VFS/temp_vfs.cpp -index 25f3a15..ee68521 100644 ---- a/krusader/VFS/temp_vfs.cpp -+++ b/krusader/VFS/temp_vfs.cpp -@@ -56,7 +56,7 @@ temp_vfs::temp_vfs( TQString origin, TQString type, TQWidget* panel, bool ): - } - - temp_vfs::~temp_vfs(){ -- if( vfs_type == "-iso" ){ -+ if( tmpvfs_type == ISO ){ - // unmount the ISO image - KShellProcess umount; - umount << "umount -f" << tmpDir; -@@ -94,6 +94,13 @@ bool temp_vfs::vfs_refresh(const KURL& origin){ - } - - void temp_vfs::handleAceArj(TQString origin, TQString type){ -+ if (type == "-ace") { -+ tmpvfs_type = ACE; -+ } -+ else if (type == "-arj") { -+ tmpvfs_type = ARJ; -+ } -+ - // for ace and arj we just unpack to the tmpDir - if( !KRarcHandler::arcHandled(type) ){ - if (!quietMode) KMessageBox::error(krApp,"This archive type is NOT supported"); -@@ -117,6 +124,7 @@ void temp_vfs::handleRpm(TQString origin){ - rpm.clearArguments(); - rpm << "rpm -lpq"<<"\""+origin+"\""+" > "+tmpDir+"/filelist.txt"; - rpm.start(KProcess::Block); -+ tmpvfs_type = RPM; - } - - void temp_vfs::handleIso(TQString origin){ -@@ -124,4 +132,5 @@ void temp_vfs::handleIso(TQString origin){ - KShellProcess mount; - mount << KrServices::fullPathName( "mount" ) << "-o loop" << origin << tmpDir; - mount.start(KProcess::Block); -+ tmpvfs_type = ISO; - } -diff --git a/krusader/VFS/temp_vfs.h b/krusader/VFS/temp_vfs.h -index 3b94248..d35169b 100644 ---- a/krusader/VFS/temp_vfs.h -+++ b/krusader/VFS/temp_vfs.h -@@ -37,6 +37,8 @@ - - class temp_vfs : public normal_vfs { - public: -+ enum TMPVFS_TYPE{ERROR=0,ACE,ARJ,RPM,ISO}; -+ - temp_vfs( TQString origin, TQString type, TQWidget* panel, bool writeable); - ~temp_vfs(); - TQString vfs_workingDir(); -@@ -50,6 +52,7 @@ protected: - void handleAceArj(TQString origin, TQString type); - void handleRpm(TQString origin); - void handleIso(TQString origin); -+ TMPVFS_TYPE tmpvfs_type; //< the tmp vfs type. - TQString tmpDir; - - }; diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec deleted file mode 100644 index 615b95ea4..000000000 --- a/redhat/applications/krusader/krusader-3.5.13.2.spec +++ /dev/null @@ -1,155 +0,0 @@ -# Default version for this component -%define tde_pkg krusader -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: twin-panel (commander-style) file manager for TDE (and other desktops) -Version: 1.90.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch0: krusader-3.5.13.2-tmpvfs-ftbfs.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-tdebindings-devel >= %{tde_version} - - -%description -Krusader is a simple, easy, powerful, twin-panel (commander-style) file -manager for TDE and other desktops, similar to Midnight Commander (C) or Total -Commander (C). - -It provides all the file management features you could possibly want. - -Plus: extensive archive handling, mounted filesystem support, FTP, -advanced search module, viewer/editor, directory synchronisation, -file content comparisons, powerful batch renaming and much much more. - -It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar, -zip and 7-zip. - -It handles KIOSlaves such as smb:// or fish://. - -Almost completely customizable, Krusader is very user friendly, fast and looks -great on your desktop. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .ftbfs - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING FAQ README TODO -%{tde_bindir}/krusader -%{tde_tdelibdir}/kio_krarc.la -%{tde_tdelibdir}/kio_krarc.so -%{tde_tdelibdir}/kio_virt.la -%{tde_tdelibdir}/kio_virt.so -%{tde_tdeappdir}/krusader.desktop -%{tde_tdeappdir}/krusader_root-mode.desktop -%{tde_datadir}/apps/krusader -%{tde_tdedocdir}/HTML/en/krusader/ -%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/ -%{tde_datadir}/icons/crystalsvg/*/apps/*.png -%{tde_datadir}/icons/locolor/*/apps/*.png -%{tde_datadir}/services/krarc.protocol -%{tde_datadir}/services/virt.protocol -%{tde_mandir}/man1/krusader.1 - - -%changelog diff --git a/redhat/applications/krusader/krusader.spec b/redhat/applications/krusader/krusader.spec new file mode 100644 index 000000000..cf314c68f --- /dev/null +++ b/redhat/applications/krusader/krusader.spec @@ -0,0 +1,183 @@ +# +# spec file for package krusader (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.0 +%endif +%define tde_pkg krusader +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.90.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Twin-panel (commander-style) file manager for TDE (and other desktops) +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils +BuildRequires: trinity-tdebindings-devel >= %{tde_version} + +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +Krusader is a simple, easy, powerful, twin-panel (commander-style) file +manager for TDE and other desktops, similar to Midnight Commander (C) or Total +Commander (C). + +It provides all the file management features you could possibly want. + +Plus: extensive archive handling, mounted filesystem support, FTP, +advanced search module, viewer/editor, directory synchronisation, +file content comparisons, powerful batch renaming and much much more. + +It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar, +zip and 7-zip. + +It handles KIOSlaves such as smb:// or fish://. + +Almost completely customizable, Krusader is very user friendly, fast and looks +great on your desktop. + + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" + +# Warning: --enable-final causes FTBFS +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --disable-final \ + --enable-closure \ + --enable-rpath \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{tde_pkg} + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" +%suse_update_desktop_file krusader System FileManager +%suse_update_desktop_file krusader_root-mode System FileManager +%endif + + +%clean +%__rm -rf %{buildroot} + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING FAQ README TODO +%{tde_bindir}/krusader +%{tde_tdelibdir}/tdeio_krarc.la +%{tde_tdelibdir}/tdeio_krarc.so +%{tde_tdelibdir}/tdeio_virt.la +%{tde_tdelibdir}/tdeio_virt.so +%{tde_tdeappdir}/krusader.desktop +%{tde_tdeappdir}/krusader_root-mode.desktop +%{tde_datadir}/apps/krusader +%{tde_datadir}/icons/crystalsvg/*/apps/*.png +%{tde_datadir}/icons/locolor/*/apps/*.png +%{tde_datadir}/services/krarc.protocol +%{tde_datadir}/services/virt.protocol +%{tde_mandir}/man1/krusader.1 +%{tde_tdedocdir}/HTML/en/krusader/ +%{tde_tdedocdir}/HTML/en/tdeioslave/krarc/ +%{tde_tdedocdir}/HTML/en/tdeioslave/virt/ +%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/ + + +%changelog -- cgit v1.2.1