RHEL/Fedora: fix basket for GCC 4.7

pull/3/head
Francois Andriot 13 years ago
parent 706fd716a8
commit 64d0df3758

@ -0,0 +1,10 @@
--- basket/src/likeback.cpp.ORI 2012-05-01 13:57:36.852590875 +0200
+++ basket/src/likeback.cpp 2012-05-01 13:57:51.403632210 +0200
@@ -50,6 +50,7 @@
#include <pwd.h>
#include <iostream>
+#include <unistd.h>
#include "likeback.h"
#include "likeback_private.h"

@ -1,7 +1,7 @@
# Default version for this component
%define kdecomp basket
%define version 1.0.3.1
%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"
@ -33,6 +33,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
# [basket] Fix compilation with GCC 4.7
Patch1: basket-3.5.13-fix_gcc47_compilation.patch
BuildRequires: tqtinterface-devel
BuildRequires: trinity-kdelibs-devel
BuildRequires: trinity-kdebase-devel
@ -53,15 +56,16 @@ baskets to HTML.
%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"
@ -88,13 +92,17 @@ export PATH="%{_bindir}:${PATH}"
%post
touch --no-create %{_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
for f in crystalsvg ; do
touch --no-create %{_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
done
/sbin/ldconfig
%postun
touch --no-create %{_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
for f in crystalsvg ; do
touch --no-create %{_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
done
/sbin/ldconfig
@ -104,7 +112,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_bindir}/*
%{_datadir}/applications/*/*.desktop
%{_datadir}/apps/*/
%{_datadir}/icons/*/*/*/*
%{_datadir}/icons/crystalsvg/*/*/*
%{_datadir}/locale/*/*/*.mo
%{tde_docdir}/HTML/en/*/
%{_datadir}/services/*.desktop
@ -119,6 +127,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%Changelog
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-2
- Fix build, post and postun
- Fix compilation with GCC 4.7
* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-1
- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16

Loading…
Cancel
Save