François Andriot
9 years ago
parent
07d8f15f3a
commit
4af4e847e3
@ -1,20 +0,0 @@
|
||||
commit fdf6d34084255fa4e17833f8ef93626e5dd926e6
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1335632256 -0500
|
||||
|
||||
GCC 4.7 fixes.
|
||||
|
||||
diff --git a/krusader/UserAction/tstring.h b/krusader/UserAction/tstring.h
|
||||
index 94ece59..9356e5c 100644
|
||||
--- a/krusader/UserAction/tstring.h
|
||||
+++ b/krusader/UserAction/tstring.h
|
||||
@@ -14,6 +14,9 @@
|
||||
#include <tqvaluelist.h>
|
||||
#include <utility>
|
||||
#include <cassert>
|
||||
+
|
||||
+using namespace std;
|
||||
+
|
||||
template <class T>
|
||||
class TagString_t
|
||||
{
|
||||
@ -1,11 +0,0 @@
|
||||
--- krusader/krusader/main.cpp.ORI 2012-08-06 00:19:36.475622376 +0200
|
||||
+++ krusader/krusader/main.cpp 2012-08-06 00:19:48.867387323 +0200
|
||||
@@ -199,7 +199,7 @@
|
||||
exit( 0 );
|
||||
TQCString regName = client->registerAs( KApplication::kApplication() ->name(), !singleInstanceMode );
|
||||
if( singleInstanceMode && regName != KApplication::kApplication()->name() ) {
|
||||
- fprintf( stderr, i18n( "Application already running!\n" ).ascii() );
|
||||
+ fprintf( stderr, "%s", i18n( "Application already running!\n" ).ascii() );
|
||||
|
||||
DCOPClient::mainClient()->send( KApplication::kApplication() ->name(), "Krusader-Interface",
|
||||
"moveToTop()", TQByteArray() );
|
||||
@ -1,164 +0,0 @@
|
||||
# Default version for this component
|
||||
%define kdecomp krusader
|
||||
|
||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||
%if "%{?tde_prefix}" != "/usr"
|
||||
%define _variant .opt
|
||||
%endif
|
||||
|
||||
# TDE 3.5.13 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-%{kdecomp}
|
||||
Summary: twin-panel (commander-style) file manager for KDE (and other desktops)
|
||||
Version: 1.90.0
|
||||
Release: 3%{?dist}%{?_variant}
|
||||
|
||||
License: GPLv2+
|
||||
Group: Applications/Utilities
|
||||
|
||||
Vendor: Trinity Project
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
URL: http://www.trinitydesktop.org/
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: %{kdecomp}-3.5.13.1.tar.gz
|
||||
|
||||
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
|
||||
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
|
||||
BuildRequires: trinity-tdebase-devel >= 3.5.13.1
|
||||
BuildRequires: trinity-tdebindings-devel >= 3.5.13.1
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
|
||||
%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 %{kdecomp}-3.5.13.1
|
||||
|
||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||
%__sed -i admin/acinclude.m4.in \
|
||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
|
||||
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
|
||||
|
||||
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f "admin/Makefile.common"
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR; . /etc/profile.d/qt3.sh
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
||||
|
||||
%configure \
|
||||
--prefix=%{tde_prefix} \
|
||||
--exec-prefix=%{tde_prefix} \
|
||||
--bindir=%{tde_bindir} \
|
||||
--datadir=%{tde_datadir} \
|
||||
--libdir=%{tde_libdir} \
|
||||
--mandir=%{tde_mandir} \
|
||||
--includedir=%{tde_tdeincludedir} \
|
||||
--disable-rpath \
|
||||
--with-extra-includes=%{tde_includedir}/tqt
|
||||
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{buildroot}
|
||||
|
||||
%find_lang %{kdecomp}
|
||||
|
||||
%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 %{kdecomp}.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
|
||||
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-3
|
||||
- Initial release for TDE 3.5.13.1
|
||||
|
||||
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2
|
||||
- Rebuild for Fedora 17
|
||||
- GCC 4.7 fixes. [Commit #fdf6d340]
|
||||
|
||||
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
|
||||
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
|
||||
|
||||
@ -1,163 +0,0 @@
|
||||
# Default version for this component
|
||||
%define kdecomp krusader
|
||||
|
||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||
%if "%{?tde_prefix}" != "/usr"
|
||||
%define _variant .opt
|
||||
%endif
|
||||
|
||||
# TDE 3.5.13 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}/kde
|
||||
%define tde_tdeincludedir %{tde_includedir}/kde
|
||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||
|
||||
%define _docdir %{tde_docdir}
|
||||
|
||||
|
||||
Name: trinity-%{kdecomp}
|
||||
Summary: twin-panel (commander-style) file manager for KDE (and other desktops)
|
||||
Version: 1.90.0
|
||||
Release: 2%{?dist}%{?_variant}
|
||||
|
||||
License: GPLv2+
|
||||
Group: Applications/Utilities
|
||||
|
||||
Vendor: Trinity Project
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
URL: http://www.trinitydesktop.org/
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: %{kdecomp}-3.5.13.tar.gz
|
||||
|
||||
# [krusader] GCC 4.7 fixes. [Commit #fdf6d340]
|
||||
Patch1: krusader-3.5.13-fix_gcc47_compilation.patch
|
||||
# [krusader] Fix "not a string literal" error
|
||||
Patch2: krusader-3.5.13-fix_not_a_string_literal_error.patch
|
||||
|
||||
BuildRequires: tqtinterface-devel
|
||||
BuildRequires: trinity-tdelibs-devel
|
||||
BuildRequires: trinity-tdebase-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
BuildRequires: trinity-tdebindings-devel
|
||||
|
||||
%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.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n applications/%{kdecomp}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||
%__sed -i admin/acinclude.m4.in \
|
||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
|
||||
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
|
||||
|
||||
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f "admin/Makefile.common"
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR; . /etc/profile.d/qt.sh
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
||||
|
||||
%configure \
|
||||
--prefix=%{tde_prefix} \
|
||||
--exec-prefix=%{tde_prefix} \
|
||||
--bindir=%{tde_bindir} \
|
||||
--datadir=%{tde_datadir} \
|
||||
--libdir=%{tde_libdir} \
|
||||
--mandir=%{tde_mandir} \
|
||||
--includedir=%{tde_tdeincludedir} \
|
||||
--disable-rpath \
|
||||
--with-extra-includes=%{tde_includedir}/tqt
|
||||
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{buildroot}
|
||||
|
||||
%find_lang %{kdecomp}
|
||||
|
||||
%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 %{kdecomp}.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
|
||||
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2
|
||||
- Rebuild for Fedora 17
|
||||
- GCC 4.7 fixes. [Commit #fdf6d340]
|
||||
|
||||
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
|
||||
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
|
||||
|
||||
Loading…
Reference in new issue