rpms/tuxcmd/devel tuxcmd-disable-smartlinking.patch, NONE, 1.1 tuxcmd.spec, 1.9, 1.10

[Tomas Bzatek]

Author: tbzatek

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

Modified Files:
	tuxcmd.spec 
Added Files:
	tuxcmd-disable-smartlinking.patch 
Log Message:
* Tue Oct 21 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.50-4
- Turn smartlinking off, not needed with fpc-2.2.2-2 anymore
- Enable debuginfo generation on x86_64 again


tuxcmd-disable-smartlinking.patch:

--- NEW FILE tuxcmd-disable-smartlinking.patch ---
diff -up tuxcmd-0.6.50/Makefile.orig tuxcmd-0.6.50/Makefile
--- tuxcmd-0.6.50/Makefile.orig	2008-08-21 20:54:24.000000000 +0200
+++ tuxcmd-0.6.50/Makefile	2008-10-21 11:12:40.437300575 +0200
@@ -40,7 +40,7 @@ LIB_SUFFIX=`if test \`uname -m\` = x86_6
 # -Cg generates internal compiler errors on i386
 # -XX prevents linking errors of unresolved and unused symbols
 # "-k-z noexecstack" (with quotes as a single parameter) avoids marking stack as executable, allowing to work correctly with SELinux in Enforcing mode
-CFLAGS= -vweh -Un -Ci -Co -XX "-k-z noexecstack"
+CFLAGS= -vweh -Un -Ci -Co "-k-z noexecstack"
 
 
 


Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/tuxcmd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tuxcmd.spec	13 Oct 2008 08:37:31 -0000	1.9
+++ tuxcmd.spec	21 Oct 2008 09:25:18 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           tuxcmd
 Version:        0.6.50
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
@@ -16,14 +16,18 @@
 Source3:        tuxcmd.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: fpc >= 2.2.2
+BuildRequires: fpc >= 2.2.2-2
 BuildRequires: gtk2-devel
 BuildRequires: desktop-file-utils
 
+# patches from git/head
 Patch1: tuxcmd-0.6.52-null-mounts.patch
 Patch2: tuxcmd-0.6.52-anon-ftp.patch
 Patch3: tuxcmd-0.6.52-connmgr-save.patch
 
+# turn smartlinking off, not needed anymore with fpc-2.2.2-2
+Patch4: tuxcmd-disable-smartlinking.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
@@ -64,17 +68,14 @@
 
 %patch1 -p1 -b .null-mounts
 %patch3 -p1 -b .connmgr-save
+%patch4 -p1 -b .disable-smartlinking
 cd ../%{name}-modules-%{version}
 %patch2 -p1 -b .anon-ftp
 
 
 %build
 
-%ifarch x86_64
-make
-%else
 make debug
-%endif
 
 # build modules
 cd ../%{name}-modules-%{version}
@@ -128,6 +129,10 @@
 
 
 %changelog
+* Tue Oct 21 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.50-4
+- Turn smartlinking off, not needed with fpc-2.2.2-2 anymore
+- Enable debuginfo generation on x86_64 again
+
 * Mon Oct 13 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.50-3
 - Connection Manager: Fix restoring last used item