rpms/tuxcmd/devel tuxcmd-0.6.62-lib64.patch, NONE, 1.1 tuxcmd.spec, 1.14, 1.15

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/tuxcmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11041

Modified Files:
	tuxcmd.spec 
Added Files:
	tuxcmd-0.6.62-lib64.patch 
Log Message:
* Fri Apr 10 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.62-git20090409.2
- Fix vfs modules detection on 64bit archs
- Remove unnecessary Requires (#473992)


tuxcmd-0.6.62-lib64.patch:

--- NEW FILE tuxcmd-0.6.62-lib64.patch ---
>From 3c11c85e19dcfe73c7d6ed6e8eb4d5f3a48e89e2 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 10 Apr 2009 11:46:36 +0200
Subject: [PATCH] Silly workaround for searching plugins in lib64 paths

---
 vfs/UVFSCore.pas |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/vfs/UVFSCore.pas b/vfs/UVFSCore.pas
index 6cd1114..aaa3b49 100644
--- a/vfs/UVFSCore.pas
+++ b/vfs/UVFSCore.pas
@@ -170,6 +170,9 @@ const ConstGlobalModulePath1 = '/usr/lib/tuxcmd';
       ConstLocalModulePath1 = '~/.tuxcmd/plugins';
       ConstLocalModulePath2 = './plugins';
       ConstLocalModulePath3 = '../lib/tuxcmd';
+      ConstGlobalModulePath3 = '/usr/lib64/tuxcmd';
+      ConstGlobalModulePath4 = '/usr/local/lib64/tuxcmd';
+      ConstLocalModulePath4 = '../lib64/tuxcmd';
 
       ConstVFSVersionRequired = cVFSVersion;
 
@@ -1090,6 +1093,11 @@ begin
     QueryModules(ConstLocalModulePath1);
     QueryModules(ConstLocalModulePath2);
     QueryModules(ConstLocalModulePath3);
+{$IFDEF CPU64}
+    QueryModules(ConstGlobalModulePath3);
+    QueryModules(ConstGlobalModulePath4);
+    QueryModules(ConstLocalModulePath4);
+{$ENDIF}
   end;
 end;
 
-- 
1.6.2.2



Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/tuxcmd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tuxcmd.spec	9 Apr 2009 10:22:40 -0000	1.14
+++ tuxcmd.spec	10 Apr 2009 12:06:37 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           tuxcmd
 Version:        0.6.62
-Release:        git20090409.1%{?dist}
+Release:        git20090409.2%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
@@ -25,6 +25,9 @@
 # turn smartlinking off, not needed anymore with fpc-2.2.2-2
 Patch4: tuxcmd-disable-smartlinking.patch
 
+# enable searching for modules in lib64 dirs
+Patch5: tuxcmd-0.6.62-lib64.patch
+
 %description
 Tux Commander is open-source file manager with 2 panels side by side written
 for GTK2. The main goal of this project is to create powerful user-friendly
@@ -36,7 +39,6 @@
 Summary:        Modules for Tux Commander file manager
 Group:          Applications/File
 Requires: %{name} = %{version}-%{release}
-Requires: bzip2-libs
 BuildRequires: libarchive-devel >= 2.5.5
 BuildRequires: bzip2-devel
 
@@ -64,6 +66,7 @@
 %setup -q -b 1
 
 %patch4 -p1 -b .disable-smartlinking
+%patch5 -p1 -b .lib64
 
 %build
 
@@ -102,6 +105,7 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
+%dir %{_libdir}/tuxcmd
 %{_bindir}/tuxcmd
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/tuxcmd.png
@@ -110,7 +114,6 @@
 %defattr(-,root,root,-)
 %doc ../%{name}-modules-%{version}/doc/libarchive
 %doc ../%{name}-modules-%{version}/doc/zip
-%dir %{_libdir}/tuxcmd
 %{_libdir}/tuxcmd/libarchive_plugin.so
 %{_libdir}/tuxcmd/libzip_plugin.so
 
@@ -118,11 +121,14 @@
 %defattr(-,root,root,-)
 %doc ../%{name}-modules-%{version}/gvfs/README
 %doc ../%{name}-modules-%{version}/gvfs/COPYING
-%dir %{_libdir}/tuxcmd
 %{_libdir}/tuxcmd/libgvfs_plugin.so
 
 
 %changelog
+* Fri Apr 10 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.62-git20090409.2
+- Fix vfs modules detection on 64bit archs
+- Remove unnecessary Requires (#473992)
+
 * Thu Apr  9 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.62-git20090409.1
 - Rebase to latest git
 - Fix unowned directories (#473992)