diff options
Diffstat (limited to 'redhat/applications/kvirc/trinity-kvirc.spec')
| -rw-r--r-- | redhat/applications/kvirc/trinity-kvirc.spec | 69 |
1 files changed, 56 insertions, 13 deletions
diff --git a/redhat/applications/kvirc/trinity-kvirc.spec b/redhat/applications/kvirc/trinity-kvirc.spec index 1d4de4b88..4da540dee 100644 --- a/redhat/applications/kvirc/trinity-kvirc.spec +++ b/redhat/applications/kvirc/trinity-kvirc.spec @@ -1,12 +1,13 @@ # Default version for this component %define kdecomp kvirc %define version 3.4.0 -%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 +%define _mandir %{_datadir}/man %endif # TDE 3.5.13 specific building variables @@ -32,9 +33,30 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz + +# [kvirc] Modules do not install in correct folder [RHEL/Fedora] Patch0: kvirc-3.5.13-directories.patch +# [kvirc] FTBFS because of missing link libraries [Bug #991] Patch1: kvirc-3.5.13-ftbfs.patch +# [kvirc] Rename old tq methods that no longer need a unique name [Commit #32a249ba] +Patch2: bp000-32a249ba.diff +# [kvirc] Remove additional unneeded tq method conversions [Commit #f9114981] +Patch3: bp001-f9114981.diff +# [kvirc] Rename obsolete tq methods to standard names [Commit #2dd6d32b] +Patch4: bp002-2dd6d32b.diff +# [kvirc] Rename a few stragglers [Commit #1c00d6ff] +Patch5: bp003-1c00d6ff.diff +# [kvirc] Fix FTBFS [Commits #ff96f491, #2285efe5] +Patch6: bp004-ff96f491.diff +Patch7: bp005-2285efe5.diff +# [kvirc] Fix linear alphabet string errors [Commit #51bbe9e5] +Patch8: bp006-51bbe9e5.diff +# [kvirc] Fix inadvertent "TQ" changes. [Commit #a24a8595] +Patch9: bp007-a24a8595.diff +# [kvirc] Fix "acinclude.m4" file [Bug #980] +Patch10: kvirc-3.5.13-fix_acinclude_m4.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel @@ -86,21 +108,30 @@ with the K Desktop Environment version 3. %setup -q -n applications/%{kdecomp} %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -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" # Hardcoded absolute PATH to KDEDIR in source code ! That sucks ! -%__sed -i src/kvirc/kernel/kvi_app_fs.cpp \ - -e "s,/opt/kde3/lib,%{_prefix}/%{_lib},g" -%__sed -i src/kvirc/kernel/kvi_app_setup.cpp \ - -e "s,/opt/kde3,%{_prefix},g" +%__sed -i "src/kvirc/kernel/kvi_app_fs.cpp" \ + -e "s|/opt/kde3/lib|%{_prefix}/%{_lib}|g" +%__sed -i "src/kvirc/kernel/kvi_app_setup.cpp" \ + -e "s|/opt/kde3|%{_prefix}|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" ./autogen.sh @@ -115,8 +146,8 @@ export KDEDIR=%{_prefix} --enable-perl --with-pic --enable-wall \ --with-ix86-asm \ --with-qt-moc=%{_bindir}/tmoc \ - --with-extra-includes=%{_includedir}/tqt \ - --with-kde-services-dir=%{_datadir}/services \ + --with-extra-includes=%{_includedir}/tqt \ + --with-kde-services-dir=%{_datadir}/services \ --with-kde-library-dir=%{_libdir} \ --with-kde-include-dir=%{_includedir} @@ -165,11 +196,11 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/kvi_search_help %{_libdir}/kvirc/*/modules/caps/ %{_datadir}/applnk/Internet/kvirc.desktop -%{_datadir}/icons/hicolor/ +%{_datadir}/icons/hicolor/* %{_datadir}/kvirc %{_datadir}/mimelnk/text/*.desktop %{_datadir}/services/*.protocol -%{_mandir}/man1/kvirc.1.gz +%{_mandir}/man1/kvirc.1 %files devel %defattr(-,root,root,-) @@ -181,5 +212,17 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-2 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Rename old tq methods that no longer need a unique name [Commit #32a249ba] +- Remove additional unneeded tq method conversions [Commit #f9114981] +- Rename obsolete tq methods to standard names [Commit #2dd6d32b] +- Rename a few stragglers [Commit #1c00d6ff] +- Fix FTBFS [Commits #ff96f491, #2285efe5] +- Fix linear alphabet string errors [Commit #51bbe9e5] +- Fix inadvertent "TQ" changes. [Commit #a24a8595] +- Fix "acinclude.m4" file [Bug #980] + * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.4.0-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 |