RHEL/Fedora: massive updates for Fedora 17 (TDE 3.5.13 entire build)

2 files changed, 35 insertions, 9 deletions

diff --git a/redhat/applications/smb4k/smb4k-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/smb4k/smb4k-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..03048f58d
--- /dev/null
+++ b/redhat/applications/smb4k/smb4k-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,18 @@
+commit b4c7fd481649eaa362dc426e6b5f8d23b0c9e836
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1335631847 -0500
+
+    GCC 4.7 fixes.
+
+diff --git a/smb4k/configdlg/smb4kshareoptions.cpp b/smb4k/configdlg/smb4kshareoptions.cpp
+index 24e309a..6627b51 100644
+--- a/smb4k/configdlg/smb4kshareoptions.cpp
++++ b/smb4k/configdlg/smb4kshareoptions.cpp
+@@ -40,6 +40,7 @@
+ // system includes
+ #include <sys/types.h>
+ #include <pwd.h>
++#include <unistd.h>
+ 
+ // applications specific includes
+ #include "smb4kshareoptions.h"
diff --git a/redhat/applications/smb4k/trinity-smb4k.spec b/redhat/applications/smb4k/trinity-smb4k.spec
index 900e696a4..947939647 100644
--- a/redhat/applications/smb4k/trinity-smb4k.spec
+++ b/redhat/applications/smb4k/trinity-smb4k.spec
@@ -1,12 +1,12 @@
 # Default version for this component
 %define kdecomp smb4k
 %define version 0.9.4
-%define release 1
+%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -33,6 +33,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
+# [smb4k] Fix compilation with GCC 4.7 |Commit #b4c7fd48]
+Patch1:		smb4k-3.5.13-fix_gcc47_compilation.patch
+
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-kdelibs-devel
 BuildRequires:	trinity-kdebase-devel
@@ -49,15 +52,16 @@ possible.
 
 %prep
 %setup -q -n applications/%{kdecomp}
+%patch1 -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,%{_includedir}/tqt,g" \
-  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -86,13 +90,13 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 /sbin/ldconfig || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 /sbin/ldconfig || :
 
 
@@ -141,5 +145,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.4-2
+- Rebuild for Fedora 17
+- Fix compilation with GCC 4.7 |Commit #b4c7fd48]
+
 * Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.4-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16