diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-05-07 01:06:08 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-05-07 01:06:08 +0200 |
| commit | 9750a057f2f36c5b88a5bc53c0a051b605dac061 (patch) | |
| tree | 4f205d3ed4ecf8d2df665b566674d12372363c7f /redhat/applications/piklab/trinity-piklab.spec | |
| parent | 6bb431be79e8f75c26bbf0f81749fa7738965f65 (diff) | |
| download | tde-packaging-9750a057f2f36c5b88a5bc53c0a051b605dac061.tar.gz tde-packaging-9750a057f2f36c5b88a5bc53c0a051b605dac061.zip | |
RHEL/Fedora: massive updates for Fedora 17 (TDE 3.5.13 entire build)
Diffstat (limited to 'redhat/applications/piklab/trinity-piklab.spec')
| -rw-r--r-- | redhat/applications/piklab/trinity-piklab.spec | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/redhat/applications/piklab/trinity-piklab.spec b/redhat/applications/piklab/trinity-piklab.spec index a2c698665..f1ccb45be 100644 --- a/redhat/applications/piklab/trinity-piklab.spec +++ b/redhat/applications/piklab/trinity-piklab.spec @@ -1,12 +1,13 @@ # Default version for this component %define kdecomp piklab %define version 0.15.2 -%define release 2 +%define release 3 # 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 +%define _mandir %{_datadir}/man %endif # TDE 3.5.13 specific building variables @@ -33,6 +34,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [piklab] Fix compilation with GCC 4.7 [Bug #958] +Patch1: piklab-3.5.13-fix_gcc47_compilation.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel @@ -53,15 +57,16 @@ are supported. A command-line programmer and debugger are also available. %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" @@ -114,13 +119,17 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{tde_docdir}/HTML/en/piklab %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/mimelnk/application/x-piklab.desktop -%{_mandir}/man1/piklab-coff.1.gz -%{_mandir}/man1/piklab-hex.1.gz -%{_mandir}/man1/piklab-prog.1.gz -%{_mandir}/man1/piklab.1.gz +%{_mandir}/man1/piklab-coff.1 +%{_mandir}/man1/piklab-hex.1 +%{_mandir}/man1/piklab-prog.1 +%{_mandir}/man1/piklab.1 %Changelog +* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3 +- Fix MAN directory location +- Fix compilation with GCC 4.7 [Bug #958] + * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-2 - Fix HTML directory location |