From 23921d42c670b601f623ddf441bdddde446ddefc Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 4 Aug 2012 22:17:21 +0200 Subject: [PATCH] MGA2/MDV2012: add some applications ... --- .../amarok-3.5.13-fix_linear_alphabet.patch | 46 +++ .../applications/amarok/trinity-amarok.spec | 15 +- .../dolphin/trinity-dolphin-3.5.13.spec | 86 +++--- .../trinity-filelight-l10n.spec | 65 +++-- .../filelight-3.5.13-disable_l10n.patch | 13 + .../filelight/trinity-filelight-3.5.13.spec | 85 +++--- ...usion-icon-3.5.13-fix_python_sitelib.patch | 17 ++ .../fusion-icon/trinity-fusion-icon.spec | 76 +++-- .../gtk-qt-engine/trinity-gtk-qt-engine.spec | 72 +++-- .../gwenview-3.5.13-fix_libmng_check.patch | 27 ++ .../gwenview-3.5.13-missing_ldflags.patch | 11 + .../gwenview/trinity-gwenview-3.5.13.spec | 148 +++++++--- .../k3b-3.5.13-fix_dbus_tqt_detection.patch | 22 ++ .../k3b/k3b-3.5.13-missing_ldflags.patch | 131 +++++++++ .../applications/k3b/trinity-k3b-3.5.13.spec | 268 ++++++++++++------ ...5.13-fix_another_string_format_error.patch | 19 ++ ...3.5.13-fix_format_not_string_literal.patch | 53 ++++ ...5.13-fix_format_not_string_literal_2.patch | 23 ++ ...9copy-3.5.13-fix_format_string_error.patch | 28 ++ .../k9copy/k9copy-3.5.13-fix_ftbfs.patch | 19 ++ .../k9copy/k9copy-3.5.13-fix_ftbfs_2.patch | 19 ++ ...3-fix_remaining_string_format_errors.patch | 150 ++++++++++ .../k9copy/k9copy-3.5.13-ftbfs.patch | 12 - .../k9copy-3.5.13-missing_ldflags.patch | 11 + .../applications/k9copy/trinity-k9copy.spec | 120 +++++--- .../trinity-kaffeine-mozilla.spec | 60 ++-- .../katapult/trinity-katapult-3.5.13.spec | 148 +++++++--- ...5.13-fix_format_not_a_string_literal.patch | 27 ++ .../kbarcode/kbarcode-3.5.13-fix_ftbfs.patch | 19 ++ ...-3.5.13-fix_remaining_string_literal.patch | 32 +++ .../kbarcode/trinity-kbarcode.spec | 107 ++++--- .../kbfx-3.5.13-fix_install_directories.patch | 8 + .../kbfx/kbfx-3.5.13-missing_ldflags.patch | 20 ++ redhat/applications/kbfx/trinity-kbfx.spec | 147 ++++++---- .../trinity-kbookreader-3.5.13.spec | 77 ++--- ...> kchmviewer-3.5.13-missing_ldflags.patch} | 0 .../kchmviewer/trinity-kchmviewer.spec | 73 +++-- .../trinity-kcmautostart-3.5.13.spec | 64 +++-- .../kcpuload/trinity-kcpuload.spec | 69 +++-- redhat/genrpm.sh | 1 + 40 files changed, 1763 insertions(+), 625 deletions(-) create mode 100644 redhat/applications/amarok/amarok-3.5.13-fix_linear_alphabet.patch create mode 100644 redhat/applications/filelight/filelight-3.5.13-disable_l10n.patch create mode 100644 redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch create mode 100644 redhat/applications/gwenview/gwenview-3.5.13-fix_libmng_check.patch create mode 100644 redhat/applications/gwenview/gwenview-3.5.13-missing_ldflags.patch create mode 100644 redhat/applications/k3b/k3b-3.5.13-fix_dbus_tqt_detection.patch create mode 100644 redhat/applications/k3b/k3b-3.5.13-missing_ldflags.patch create mode 100644 redhat/applications/k9copy/k9copy-3.5.13-fix_another_string_format_error.patch create mode 100644 redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal.patch create mode 100644 redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal_2.patch create mode 100644 redhat/applications/k9copy/k9copy-3.5.13-fix_format_string_error.patch create mode 100644 redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs.patch create mode 100644 redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs_2.patch create mode 100644 redhat/applications/k9copy/k9copy-3.5.13-fix_remaining_string_format_errors.patch delete mode 100644 redhat/applications/k9copy/k9copy-3.5.13-ftbfs.patch create mode 100644 redhat/applications/k9copy/k9copy-3.5.13-missing_ldflags.patch create mode 100644 redhat/applications/kbarcode/kbarcode-3.5.13-fix_format_not_a_string_literal.patch create mode 100644 redhat/applications/kbarcode/kbarcode-3.5.13-fix_ftbfs.patch create mode 100644 redhat/applications/kbarcode/kbarcode-3.5.13-fix_remaining_string_literal.patch create mode 100644 redhat/applications/kbfx/kbfx-3.5.13-fix_install_directories.patch create mode 100644 redhat/applications/kbfx/kbfx-3.5.13-missing_ldflags.patch rename redhat/applications/kchmviewer/{kchmviewer-3.5.13-ftbfs.patch => kchmviewer-3.5.13-missing_ldflags.patch} (100%) diff --git a/redhat/applications/amarok/amarok-3.5.13-fix_linear_alphabet.patch b/redhat/applications/amarok/amarok-3.5.13-fix_linear_alphabet.patch new file mode 100644 index 000000000..82d3542c6 --- /dev/null +++ b/redhat/applications/amarok/amarok-3.5.13-fix_linear_alphabet.patch @@ -0,0 +1,46 @@ +commit 6e5a3b666215cef086b9116b834475227dbf9343 +Author: Timothy Pearson +Date: 1327529588 -0600 + + Fix linear alphabet string errors + +diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c +index 1d55403..2b1d3e0 100644 +--- a/amarok/src/sqlite/sqlite3.c ++++ b/amarok/src/sqlite/sqlite3.c +@@ -11964,7 +11964,7 @@ int os2OpenDirectory( + SQLITE_PRIVATE int sqlite3Os2TempFileName( char *zBuf ){ + static const unsigned char zChars[] = + "abcdefghijklmnopqrstuvwxyz" +- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789"; + int i, j; + PSZ zTempPath = 0; +@@ -13914,7 +13914,7 @@ SQLITE_PRIVATE int sqlite3UnixTempFileName(char *zBuf){ + }; + static const unsigned char zChars[] = + "abcdefghijklmnopqrstuvwxyz" +- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789"; + int i, j; + struct stat buf; +@@ -17014,7 +17014,7 @@ static int winOpenDirectory( + SQLITE_PRIVATE int sqlite3WinTempFileName(char *zBuf){ + static char zChars[] = + "abcdefghijklmnopqrstuvwxyz" +- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789"; + int i, j; + char zTempPath[SQLITE_TEMPNAME_SIZE]; +@@ -48880,7 +48880,7 @@ static void loadExt(sqlite3_context *context, int argc, sqlite3_value **argv){ + static void randStr(sqlite3_context *context, int argc, sqlite3_value **argv){ + static const unsigned char zSrc[] = + "abcdefghijklmnopqrstuvwxyz" +- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789" + ".-!,:*^+=_|?/<> "; + int iMin, iMax, n, r, i; diff --git a/redhat/applications/amarok/trinity-amarok.spec b/redhat/applications/amarok/trinity-amarok.spec index 3252bd4fa..a5eb0d8ae 100644 --- a/redhat/applications/amarok/trinity-amarok.spec +++ b/redhat/applications/amarok/trinity-amarok.spec @@ -25,7 +25,7 @@ Name: trinity-%{kdecomp} Summary: Media player Version: 1.4.10 -Release: 6%{?dist}%{?_variant} +Release: 7%{?dist}%{?_variant} Group: Applications/Multimedia License: GPLv2+ @@ -49,6 +49,8 @@ Patch7: amarok-3.5.13-fix_gcc47_compilation.patch # [amarok] Fix inotify detection [Commit #899586da] Patch11: amarok-3.5.13-fix_inotify_support.patch +# [amarok] Fix linear alphabet string errors [Commit #6e5a3b66] +Patch12: amarok-3.5.13-fix_linear_alphabet.patch BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -147,7 +149,8 @@ Amarok is a multimedia player with: %{tde_datadir}/services/amaroklastfm.protocol %{tde_datadir}/services/amarokpcast.protocol # -libs ? -- Rex -%{tde_libdir}/libamarok.* +%{tde_libdir}/libamarok.so.0 +%{tde_libdir}/libamarok.so.0.0.0 # DAAP %{tde_bindir}/amarok_daapserver.rb %{tde_tdelibdir}/libamarok_daap-mediadevice.* @@ -273,6 +276,7 @@ use any of xmms' visualisation plugins with Amarok. %patch7 -p1 %patch11 -p1 -b .inotify +%patch12 -p1 -b .alphabet %build @@ -317,7 +321,8 @@ cd build # unpackaged files %__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la - +# Removes '.so' to avoid automatic -devel dependency +%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so # HTML for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do @@ -347,6 +352,10 @@ done %changelog +* Sat Aug 04 2012 Francois Andriot - 1.4.10-7 +- Fix linear alphabet string errors [Commit #6e5a3b66] +- Fix dependencies issues with -devel packages. + * Mon Apr 29 2012 Francois Andriot - 1.4.10-6 - Rebuilt for Fedora 17 - Fix compilation with GCC 4.7 diff --git a/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec b/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec index 40b78393b..667efc4f7 100644 --- a/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec +++ b/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec @@ -2,16 +2,24 @@ %define kdecomp dolphin # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man + +%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} @@ -32,8 +40,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils BuildRequires: gettext @@ -49,9 +57,9 @@ interface for the task of file management. # 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" +%__sed -i "admin/acinclude.m4.in" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/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/ltmain.sh" "admin/ltmain.sh" @@ -59,29 +67,36 @@ interface for the task of file management. %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --docdir=%{tde_tdedocdir} \ + --libdir=%{tde_libdir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} # TDE 3.5.12: dirty hack to prevent duplicate line in file 'd3lphin.desktop' -sed -i "%{buildroot}%{_datadir}/applications/kde/d3lphin.desktop" \ +sed -i "%{buildroot}%{tde_datadir}/applications/kde/d3lphin.desktop" \ -e "/^Name\[pa\].*/d" desktop-file-install --vendor "" \ --delete-original \ - --dir %{buildroot}%{_datadir}/applications/ \ - %{buildroot}%{_datadir}/applications/kde/d3lphin.desktop + --dir %{buildroot}%{tde_datadir}/applications/ \ + %{buildroot}%{tde_datadir}/applications/kde/d3lphin.desktop ## File lists @@ -103,42 +118,43 @@ done fi # Makes 'media_safelyremove.desktop' an alternative -%__mv -f %{buildroot}%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin -%__ln_s /etc/alternatives/media_safelyremove.desktop_d3lphin %{buildroot}%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop +%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin +%__ln_s /etc/alternatives/media_safelyremove.desktop_d3lphin %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop + +%find_lang d3lphin %clean %__rm -rf %{buildroot} %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : alternatives --install \ - %{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \ + %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \ media_safelyremove.desktop_d3lphin \ - %{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \ + %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \ 10 %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : if [ $1 -eq 0 ]; then alternatives --remove \ media_safelyremove.desktop_d3lphin \ - %{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin + %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin fi -%files +%files -f d3lphin.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING TODO -%{_bindir}/* -%{_datadir}/applications/*.desktop -%{_datadir}/apps/*/ -%doc %lang(en) %{tde_docdir}/HTML/en/*/ -%{_datadir}/icons/hicolor/*/apps/*.png -%{_datadir}/locale/*/*/d3lphin.mo +%{tde_bindir}/d3lphin +%{tde_datadir}/applications/d3lphin.desktop +%{tde_datadir}/apps/d3lphin/ +%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png +%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/ %Changelog diff --git a/redhat/applications/filelight-l10n/trinity-filelight-l10n.spec b/redhat/applications/filelight-l10n/trinity-filelight-l10n.spec index 81670381d..cb1920957 100644 --- a/redhat/applications/filelight-l10n/trinity-filelight-l10n.spec +++ b/redhat/applications/filelight-l10n/trinity-filelight-l10n.spec @@ -1,28 +1,33 @@ # Default version for this component %define kdecomp filelight-l10n -%define version 1.0 -%define release 2 %define debug_package %{nil} # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: Localization (l10n) for Filelight, disk space usage tool [Trinity] -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 1.0 +Release: 2%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -36,16 +41,17 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch Source0: %{kdecomp}-3.5.13.tar.gz BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils BuildRequires: gettext -Requires: trinity-filelight +Requires: trinity-filelight %description This package provides localization(l10n) files (translations and docs) for @@ -59,33 +65,44 @@ See the 'filelight' package description for more information. %prep %setup -q -n applications/%{kdecomp} +# Removes 'en' (primary) language HTML doc, since it is already in main package. +%__rm -rf doc/filelight + # 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|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/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/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" -%build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" -%configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{_includedir}" + +./configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --datadir=%{tde_datadir} \ + --docdir=%{tde_tdedocdir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +%find_lang filelight --with-kde + %clean %__rm -rf %{buildroot} @@ -93,10 +110,8 @@ export PATH="%{_bindir}:${PATH}" -%files +%files -f filelight.lang %defattr(-,root,root,-) -%{tde_docdir}/HTML/*/filelight -%{_datadir}/locale/*/LC_MESSAGES/filelight.mo %Changelog diff --git a/redhat/applications/filelight/filelight-3.5.13-disable_l10n.patch b/redhat/applications/filelight/filelight-3.5.13-disable_l10n.patch new file mode 100644 index 000000000..be98c9a0f --- /dev/null +++ b/redhat/applications/filelight/filelight-3.5.13-disable_l10n.patch @@ -0,0 +1,13 @@ +--- filelight/Makefile.am.ORI 2012-08-04 10:34:47.712896146 +0200 ++++ filelight/Makefile.am 2012-08-04 10:34:52.911800735 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS = src misc doc po ++SUBDIRS = src misc doc + + messages: rc.cpp + $(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` >> rc.cpp +--- filelight/doc/Makefile.am.ORI 2012-08-04 10:36:33.894947477 +0200 ++++ filelight/doc/Makefile.am 2012-08-04 10:36:38.509862783 +0200 +@@ -1 +1 @@ +-SUBDIRS = $(AUTODIRS) ++SUBDIRS = filelight diff --git a/redhat/applications/filelight/trinity-filelight-3.5.13.spec b/redhat/applications/filelight/trinity-filelight-3.5.13.spec index 7dac5417d..77fc17afa 100644 --- a/redhat/applications/filelight/trinity-filelight-3.5.13.spec +++ b/redhat/applications/filelight/trinity-filelight-3.5.13.spec @@ -1,25 +1,31 @@ # Default version for this component %define kdecomp filelight -%define version 1.0 -%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man + +%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: Graphical disk usage display -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 1.0 +Release: 4%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -33,10 +39,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [filelight] Disable translation build, it is a separate package +Patch1: filelight-3.5.13-disable_l10n.patch BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils %description @@ -46,12 +54,13 @@ directories on your computer. %prep %setup -q -n applications/%{kdecomp} +%patch1 -p1 -b .l10n # 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|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/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/ltmain.sh" "admin/ltmain.sh" @@ -59,19 +68,25 @@ directories on your computer. %build -unset QTDIR || : ; source /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --docdir=%{tde_tdedocdir} \ + --libdir=%{tde_libdir} \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -82,34 +97,30 @@ export PATH="%{_bindir}:${PATH}" %post for f in crystalsvg hicolor ; do - touch --no-create %{_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : done %postun for f in crystalsvg hicolor ; do - touch --no-create %{_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : done %files %defattr(-,root,root,-) %doc AUTHORS COPYING -%{_bindir}/* -%{_datadir}/applications/*/*.desktop -%{_datadir}/apps/*/ -%{_datadir}/icons/crystalsvg/*/*/* -%{_datadir}/icons/hicolor/*/*/* -%{_datadir}/config/filelightrc -%{_datadir}/services/*.desktop - -%{tde_libdir}/*.so -%exclude %{tde_libdir}/*.la - -# Translations files are packaged in 'filelight-l10n' -%exclude %{tde_docdir}/HTML/*/*/ -%exclude %{_datadir}/locale/ +%{tde_bindir}/filelight +%{tde_tdeappdir}/filelight.desktop +%{tde_datadir}/apps/filelight/ +%{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png +%{tde_datadir}/icons/hicolor/*/apps/filelight.png +%{tde_datadir}/config/filelightrc +%{tde_datadir}/services/*.desktop +%{tde_tdelibdir}/libfilelight.so +%{tde_tdelibdir}/libfilelight.la +%{tde_tdedocdir}/HTML/en/filelight/ %Changelog * Tue May 01 2012 Francois Andriot - 1.0-4 diff --git a/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch b/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch new file mode 100644 index 000000000..6ad5c045c --- /dev/null +++ b/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch @@ -0,0 +1,17 @@ +--- fusion-icon/Makefile.ori 2012-08-04 11:13:26.208733002 +0200 ++++ fusion-icon/Makefile 2012-08-04 11:16:13.354858961 +0200 +@@ -1,12 +1,13 @@ + PREFIX = '/usr' + DESTDIR = '/' ++PYTHON_SITELIB = '/usr/lib/python2.7/site-packages' + #interfaces = 'gtk qt4' + + all: + @python setup.py build + + install: +- @python setup.py install --prefix=${PREFIX} --root=${DESTDIR} ++ @python setup.py install --prefix=${PREFIX} --root=${DESTDIR} --install-lib=${PYTHON_SITELIB} + + uninstall: + @python setup.py uninstall diff --git a/redhat/applications/fusion-icon/trinity-fusion-icon.spec b/redhat/applications/fusion-icon/trinity-fusion-icon.spec index 53bbee44c..3b430508a 100644 --- a/redhat/applications/fusion-icon/trinity-fusion-icon.spec +++ b/redhat/applications/fusion-icon/trinity-fusion-icon.spec @@ -1,22 +1,36 @@ # Default version for this component %define kdecomp fusion-icon -%define _prefix /usr %if "%{?python2_sitelib}" == "" %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %endif + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man + +%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: tray icon to launch and manage Compiz Fusion [Trinity] Version: 0.0.0+git20071028 -Release: 1%{?dist}%{?_variant} +Release: 2%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -30,9 +44,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [fusion-icon] Allow python installation under /usr instead of tde_prefix +Patch1: fusion-icon-3.5.13-fix_python_sitelib.patch + BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils BuildRequires: python Requires: python @@ -48,20 +65,27 @@ decorators. %prep %setup -q -n applications/%{kdecomp} +%patch1 -p1 -%__sed -i Makefile \ - -e "s,^PREFIX = .*,PREFIX = '%{_prefix}'," \ - -e "s,^DESTDIR = .*,DESTDIR = '%{buildroot}'," %build -export PATH="%{_bindir}:${PATH}" +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + %__make %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install \ + DESTDIR=%{buildroot} \ + PREFIX=%{tde_prefix} \ + PYTHON_SITELIB=%{?python2_sitelib} + +# Removes 'egg-info' +find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete %clean @@ -69,28 +93,26 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) -%{_bindir}/fusion-icon +%{tde_bindir}/fusion-icon %{python2_sitelib}/FusionIcon/ -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 -%{python2_sitelib}/fusion_icon-0.0.0_git-py*.egg-info -%endif -%{_datadir}/applications/fusion-icon.desktop -%{_datadir}/icons/hicolor/22x22/apps/fusion-icon.png -%{_datadir}/icons/hicolor/24x24/apps/fusion-icon.png -%{_datadir}/icons/hicolor/48x48/apps/fusion-icon.png -%{_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg +%{tde_datadir}/applications/fusion-icon.desktop +%{tde_datadir}/icons/hicolor/*/apps/fusion-icon.png +%{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg %Changelog +* Sat Aug 04 2012 Francois Andriot - 0.0.0+git20071028-2 +- Fix python module installation + * Sat Nov 19 2011 Francois Andriot - 0.0.0+git20071028-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec b/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec index 2d84bc729..7456ffd9d 100644 --- a/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec +++ b/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp gtk-qt-engine -%define version 0.8 -%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" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: theme engine using Qt for GTK+ 2.x and Trinity -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 0.8 +Release: 2%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -37,8 +44,8 @@ Source0: %{kdecomp}-3.5.13.tar.gz Patch1: gtk-qt-engine-3.5.13-fix_glib_include.patch BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils BuildRequires: gettext @@ -57,44 +64,61 @@ a way to configure it from within KControl. %setup -q -n applications/%{kdecomp} %patch1 -p1 +# Renames the '.po' files +for f in po/*/*.po; do + pushd ${f%/*} + mv -f *.po gtk-qt-engine.po + popd +done + # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i CMakeLists.txt \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i "CMakeLists.txt" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -%__mkdir build +%if 0%{?rhel} || 0%{?fedora} +%__mkdir_p build cd build +%endif + %cmake \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DDATA_INSTALL_DIR=%{tde_datadir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ .. %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{kdecomp} %clean %__rm -rf %{buildroot} -%files +%files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_libdir}/kcm_kcmgtk.la -%{tde_libdir}/kcm_kcmgtk.so -%{_datadir}/applications/kcmgtk.desktop -%{_usr}/%{_lib}/gtk-2.0/2.10.0/engines/libqtengine.so -%{_usr}/share/themes/Qt/gtk-2.0/gtkrc -%{_datadir}/locale/*/LC_MESSAGES/*.mo +%{tde_tdelibdir}/kcm_kcmgtk.la +%{tde_tdelibdir}/kcm_kcmgtk.so +%{tde_appdir}/kcmgtk.desktop + +# The following files are outside TDE's directory +%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so +%{_datadir}/themes/Qt/gtk-2.0/gtkrc %Changelog diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_libmng_check.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_libmng_check.patch new file mode 100644 index 000000000..80ea42ef7 --- /dev/null +++ b/redhat/applications/gwenview/gwenview-3.5.13-fix_libmng_check.patch @@ -0,0 +1,27 @@ +commit 59c7639f5e9f3ef40b06cb0e011216cc748e3f85 +Author: Timothy Pearson +Date: 1337933593 -0500 + + Define QT_CLEAN_NAMESPACE during libmng checks + +diff --git a/configure.in.in b/configure.in.in +index f5e959c..1cdda0b 100644 +--- a/configure.in.in ++++ b/configure.in.in +@@ -98,6 +98,8 @@ AC_SUBST(GV_ASM_DEFS) + # libmng check (for gvmngformattype.*) + # + LIBMNG= ++CXXFLAGS_SAVE="$CXXFLAGS" ++CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE" + KDE_CHECK_HEADER(libmng.h, + [ + KDE_CHECK_LIB(mng, mng_initialize, +@@ -106,6 +108,7 @@ KDE_CHECK_HEADER(libmng.h, + LIBMNG="-lmng $LIBZ -lm" + ], [], $LIBZ -lm) + ]) ++CXXFLAGS="$CXXFLAGS_SAVE" + AC_SUBST(LIBMNG) + if test -z "$LIBMNG"; then + AC_WARN([Can't find libmng.h, Gwenview won't be compiled with MNG support]) diff --git a/redhat/applications/gwenview/gwenview-3.5.13-missing_ldflags.patch b/redhat/applications/gwenview/gwenview-3.5.13-missing_ldflags.patch new file mode 100644 index 000000000..bcf206288 --- /dev/null +++ b/redhat/applications/gwenview/gwenview-3.5.13-missing_ldflags.patch @@ -0,0 +1,11 @@ +--- gwenview/src/gvcore/Makefile.am.ORI 2012-08-04 12:50:37.306573906 +0200 ++++ gwenview/src/gvcore/Makefile.am 2012-08-04 12:50:46.112710411 +0200 +@@ -6,7 +6,7 @@ + + libgwenviewcore_la_LIBADD = \ + $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_QT) \ +- $(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2)\ ++ $(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2) $(LIB_KPARTS) -lkdefx \ + -lkmediaplayer ../imageutils/libgvimageutils.la \ + ../tsthread/libtsthread.la + diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec index 2946df28c..e2c3d63bc 100644 --- a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec +++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec @@ -1,26 +1,32 @@ # Default version for this component %define kdecomp gwenview -%define version 1.4.2 -%define release 7 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc -%define _mandir %{_datadir}/man %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: Gwenview is an image viewer for KDE. -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 1.4.2 +Release: 8%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -53,18 +59,25 @@ Patch8: gwenview-3.5.13-fix_building_libpng15.patch # [gwenview] Fix inadvertent tqt changes. Part of an extensive cleanup of various problems # with kipi-plugins, digikam, and gwenview to resolve bug reports 241, 962, 963. [Commit #1eac443e] Patch9: gwenview-3.5.13-fix_various_problems.patch - +# [gwenview] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011 +Patch10: gwenview-3.5.13-missing_ldflags.patch +# [gwenview] Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f] +Patch11: gwenview-3.5.13-fix_libmng_check.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils BuildRequires: gettext +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}exiv2-devel +%else BuildRequires: exiv2-devel +%endif -%if "%{?_prefix}" == "/usr" +%if "%{?tde_prefix}" == "/usr" Conflicts: kdegraphics %endif @@ -94,13 +107,14 @@ KIPI image framework. %patch7 -p1 %patch8 -p1 %patch9 -p1 - +%patch10 -p1 -b .ldflags +%patch11 -p1 -b .libmng # 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|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/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/ltmain.sh" "admin/ltmain.sh" @@ -109,20 +123,26 @@ KIPI image framework. %build unset QTDIR || : ; source /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt \ - --enable-closure + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --docdir=%{tde_tdedocdir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure -%__make -# %{?_smp_mflags} +%__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -146,6 +166,14 @@ for lang_dir in %{buildroot}$HTML_DIR/* ; do done fi +%if 0%{?rhel} == 5 +echo "%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/" >"%{kdecomp}.lang" +%else +%find_lang %{kdecomp} --with-kde --without-mo +%endif + +# Removes useless files (-devel ?) +%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so %clean %__rm -rf %{buildroot} @@ -153,40 +181,66 @@ fi %post for f in crystalsvg hicolor ; do - touch --no-create %{_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : done /sbin/ldconfig %postun for f in crystalsvg hicolor ; do - touch --no-create %{_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : done /sbin/ldconfig -%files +%files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING -%{_bindir}/* -%{_libdir}/*.so.* -%{_datadir}/applications/*/*.desktop -%{_datadir}/services/*.desktop -%{_datadir}/apps/*/ -%{_datadir}/config.kcfg/* -%{tde_docdir}/HTML/en/*/ -%{_datadir}/icons/crystalsvg/*/*/* -%{_datadir}/icons/hicolor/*/*/* -%{_mandir}/man*/* - -%{_libdir}/*.so -%{_libdir}/*.la -%{tde_libdir}/*.so -%{tde_libdir}/*.la - +%{tde_bindir}/gwenview +%{tde_libdir}/libgwenviewcore.la +%{tde_libdir}/libgwenviewcore.so.1 +%{tde_libdir}/libgwenviewcore.so.1.0.0 +%{tde_libdir}/libkdeinit_gwenview.la +%{tde_libdir}/libkdeinit_gwenview.so +%{tde_tdelibdir}/gwenview.la +%{tde_tdelibdir}/gwenview.so +%{tde_tdelibdir}/libgvdirpart.la +%{tde_tdelibdir}/libgvdirpart.so +%{tde_tdelibdir}/libgvimagepart.la +%{tde_tdelibdir}/libgvimagepart.so +%{tde_tdeappdir}/gwenview.desktop +%{tde_datadir}/apps/gwenview/ +%{tde_datadir}/apps/gvdirpart/gvdirpart.rc +%{tde_datadir}/apps/gvimagepart/gvimagepart.rc +%{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc +%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.sh +%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.upd +%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.sh +%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.upd +%{tde_datadir}/apps/konqueror/servicemenus/konqgwenview.desktop +%{tde_datadir}/config.kcfg/fileoperationconfig.kcfg +%{tde_datadir}/config.kcfg/fileviewconfig.kcfg +%{tde_datadir}/config.kcfg/fullscreenconfig.kcfg +%{tde_datadir}/config.kcfg/gvdirpartconfig.kcfg +%{tde_datadir}/config.kcfg/imageviewconfig.kcfg +%{tde_datadir}/config.kcfg/miscconfig.kcfg +%{tde_datadir}/config.kcfg/slideshowconfig.kcfg +%{tde_datadir}/icons/crystalsvg/*/apps/gvdirpart.png +%{tde_datadir}/icons/crystalsvg/scalable/apps/gvdirpart.svg +%{tde_datadir}/icons/hicolor/*/apps/gwenview.png +%{tde_datadir}/icons/hicolor/*/apps/gvdirpart.png +%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg +%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz +%{tde_datadir}/man/man1/gwenview.1* +%{tde_datadir}/services/gvdirpart.desktop +%{tde_datadir}/services/gvimagepart.desktop %Changelog +* Sat Aug 04 2012 Francois Andriot - 1.4.2-8 +- Add support for Mageia 2 and Mandriva 2011 +- Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f] + * Tue May 01 2012 Francois Andriot - 1.4.2-7 - Rebuilt for Fedora 17 - Fix post and postun diff --git a/redhat/applications/k3b/k3b-3.5.13-fix_dbus_tqt_detection.patch b/redhat/applications/k3b/k3b-3.5.13-fix_dbus_tqt_detection.patch new file mode 100644 index 000000000..fcd293c01 --- /dev/null +++ b/redhat/applications/k3b/k3b-3.5.13-fix_dbus_tqt_detection.patch @@ -0,0 +1,22 @@ +--- k3b/applications/k3b/libk3bdevice/configure.in.in.ORI 2012-08-04 14:47:03.081813892 +0200 ++++ k3b/applications/k3b/libk3bdevice/configure.in.in 2012-08-04 14:47:25.421612485 +0200 +@@ -165,7 +165,7 @@ + dbusqt_lib=NOTFOUND + dbusqt=NOTFOUND + +- search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0" ++ search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /opt/trinity/include/dbus-1.0" + AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir) + + if test -r $dbusqt_incdir/dbus/connection.h ; then +--- k3b/libk3bdevice/configure.in.in.ORI 2012-08-04 14:57:19.624255359 +0200 ++++ k3b/libk3bdevice/configure.in.in 2012-08-04 14:57:33.719128285 +0200 +@@ -165,7 +165,7 @@ + dbusqt_lib=NOTFOUND + dbusqt=NOTFOUND + +- search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0" ++ search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /opt/trinity/include/dbus-1.0" + AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir) + + if test -r $dbusqt_incdir/dbus/connection.h ; then diff --git a/redhat/applications/k3b/k3b-3.5.13-missing_ldflags.patch b/redhat/applications/k3b/k3b-3.5.13-missing_ldflags.patch new file mode 100644 index 000000000..1ae2079e9 --- /dev/null +++ b/redhat/applications/k3b/k3b-3.5.13-missing_ldflags.patch @@ -0,0 +1,131 @@ +--- k3b/libk3bdevice/Makefile.am.ORI 2012-08-04 14:09:53.794930123 +0200 ++++ k3b/libk3bdevice/Makefile.am 2012-08-04 14:10:08.246593402 +0200 +@@ -6,7 +6,7 @@ + + lib_LTLIBRARIES = libk3bdevice.la + +-libk3bdevice_la_LIBADD = $(LIB_KIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS) ++libk3bdevice_la_LIBADD = $(LIB_KIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS) $(LIB_QT) $(LIB_KDECORE) + + # lib version 5 for K3b 1.0 + libk3bdevice_la_LDFLAGS = $(all_libraries) -version-info 5:0:0 -no-undefined +--- k3b/libk3b/Makefile.am.ORI 2012-08-04 14:13:26.067400663 +0200 ++++ k3b/libk3b/Makefile.am 2012-08-04 14:13:34.150243648 +0200 +@@ -16,7 +16,7 @@ + plugin/libk3bplugin.la \ + tools/libk3btools.la \ + jobs/libjobs.la \ +- $(VIDEODVDLIB) \ ++ $(VIDEODVDLIB) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIBDL) -lkdefx -lDCOP \ + ../libk3bdevice/libk3bdevice.la + + libk3b_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined +--- k3b/plugins/decoder/wave/Makefile.am.ORI 2012-08-04 15:26:55.434435396 -0400 ++++ k3b/plugins/decoder/wave/Makefile.am 2012-08-04 15:27:06.802685139 -0400 +@@ -4,7 +4,7 @@ + + libk3bwavedecoder_la_SOURCES = k3bwavedecoder.cpp + +-libk3bwavedecoder_la_LIBADD = $(LIB_KDECORE) ../../../libk3b/libk3b.la ++libk3bwavedecoder_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la + libk3bwavedecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + + pluginsdir = $(kde_datadir)/k3b/plugins +--- k3b/plugins/decoder/ogg/Makefile.am.ORI 2012-08-04 15:33:41.805310213 -0400 ++++ k3b/plugins/decoder/ogg/Makefile.am 2012-08-04 15:34:09.767685132 -0400 +@@ -5,6 +5,6 @@ + libk3boggvorbisdecoder_la_SOURCES = k3boggvorbisdecoder.cpp + +-libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la -logg -lvorbis -lvorbisfile ++libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3b/plugin/libk3bplugin.la ../../../libk3bdevice/libk3bdevice.la -logg -lvorbis -lvorbisfile $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) + libk3boggvorbisdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + + pluginsdir = $(kde_datadir)/k3b/plugins +--- k3b/plugins/decoder/flac/Makefile.am.ORI 2012-08-04 15:39:28.418435409 -0400 ++++ k3b/plugins/decoder/flac/Makefile.am 2012-08-04 15:39:41.490685093 -0400 +@@ -4,7 +4,7 @@ + + libk3bflacdecoder_la_SOURCES = k3bflacdecoder.cpp + +-libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lFLAC++ -lFLAC $(taglib_libs) ++libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lFLAC++ -lFLAC $(taglib_libs) + libk3bflacdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + + pluginsdir = $(kde_datadir)/k3b/plugins +--- k3b/plugins/decoder/libsndfile/Makefile.am.ORI 2012-08-04 15:43:24.035435310 -0400 ++++ k3b/plugins/decoder/libsndfile/Makefile.am 2012-08-04 15:43:33.579684947 -0400 +@@ -4,7 +4,7 @@ + + libk3blibsndfiledecoder_la_SOURCES = k3blibsndfiledecoder.cpp + +-libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lsndfile ++libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lsndfile + libk3blibsndfiledecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + + pluginsdir = $(kde_datadir)/k3b/plugins +--- k3b/plugins/decoder/musepack/Makefile.am.ORI 2012-08-04 15:46:29.503435327 -0400 ++++ k3b/plugins/decoder/musepack/Makefile.am 2012-08-04 15:46:37.662685065 -0400 +@@ -7,7 +7,7 @@ + + libk3bmpcdecoder_la_SOURCES = k3bmpcdecoder.cpp k3bmpcwrapper.cpp + +-libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(MPC_LIBS) ++libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(MPC_LIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) + libk3bmpcdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + + pluginsdir = $(kde_datadir)/k3b/plugins +--- k3b/plugins/encoder/sox/Makefile.am.ORI 2012-08-04 15:48:44.045310191 -0400 ++++ k3b/plugins/encoder/sox/Makefile.am 2012-08-04 15:48:53.509685113 -0400 +@@ -4,7 +4,7 @@ + + libk3bsoxencoder_la_SOURCES = base_k3bsoxencoderconfigwidget.ui k3bsoxencoder.cpp + +-libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) ++libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDECORE) $(LIB_QT) + libk3bsoxencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + + pluginsdir = $(kde_datadir)/k3b/plugins +--- k3b/plugins/encoder/external/Makefile.am.ORI 2012-08-04 15:51:06.900310165 -0400 ++++ k3b/plugins/encoder/external/Makefile.am 2012-08-04 15:51:16.084435154 -0400 +@@ -6,7 +6,7 @@ + base_k3bexternalencodereditwidget.ui k3bexternalencoder.cpp \ + k3bexternalencoderconfigwidget.cpp k3bexternalencodercommand.cpp + +-libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) ++libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI) + libk3bexternalencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + + pluginsdir = $(kde_datadir)/k3b/plugins +--- k3b/plugins/encoder/ogg/Makefile.am.ORI 2012-08-04 15:53:42.509310180 -0400 ++++ k3b/plugins/encoder/ogg/Makefile.am 2012-08-04 15:53:52.493684861 -0400 +@@ -4,7 +4,7 @@ + + libk3boggvorbisencoder_la_SOURCES = base_k3boggvorbisencodersettingswidget.ui k3boggvorbisencoder.cpp + +-libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) -logg -lvorbis -lvorbisenc ++libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) -logg -lvorbis -lvorbisenc $(LIB_QT) $(LIB_KDEUI) + libk3boggvorbisencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + + pluginsdir = $(kde_datadir)/k3b/plugins +--- k3b/plugins/audiooutput/arts/Makefile.am.ORI 2012-08-04 15:56:16.309435344 -0400 ++++ k3b/plugins/audiooutput/arts/Makefile.am 2012-08-04 15:56:26.541685090 -0400 +@@ -4,7 +4,7 @@ + + libk3bartsoutputplugin_la_SOURCES = k3bartsoutputplugin.cpp + +-libk3bartsoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la -lartsc ++libk3bartsoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la -lartsc $(LIB_KDECORE) $(LIB_QT) + libk3bartsoutputplugin_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + + pluginsdir = $(kde_datadir)/k3b/plugins +--- k3b/plugins/audiooutput/alsa/Makefile.am.ORI 2012-08-04 15:58:27.539435332 -0400 ++++ k3b/plugins/audiooutput/alsa/Makefile.am 2012-08-04 15:58:42.595685074 -0400 +@@ -5,7 +5,7 @@ + libk3balsaoutputplugin_la_SOURCES = k3balsaoutputplugin.cpp + + libk3balsaoutputplugin_la_CFLAGS = $(ALSA_CFLAGS) +-libk3balsaoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la $(ALSA_LIBS) ++libk3balsaoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la $(ALSA_LIBS) $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI) + libk3balsaoutputplugin_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + + pluginsdir = $(kde_datadir)/k3b/plugins diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec index 544b3ca5b..d33cfb2fe 100644 --- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec +++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec @@ -1,54 +1,66 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity -Name: trinity-k3b -Summary: CD/DVD burning application -Version: 3.5.13 -Release: 4%{?dist}%{?_variant} +%define _docdir %{tde_docdir} + + +Name: trinity-k3b +Summary: CD/DVD burning application +Version: 3.5.13 +Release: 5%{?dist}%{?_variant} Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{?_prefix}" == "/usr" Obsoletes: k3b %endif -Group: Applications/Archiving -License: GPLv2+ +Group: Applications/Archiving +License: GPLv2+ -Source0: k3b-%{version}.tar.gz -Source2: k3brc +Source0: k3b-%{version}.tar.gz +Source2: k3brc # Legacy RedHat / Fedora patches # manual bufsize (upstream?) -Patch4: k3b-1.0.4-manualbufsize.patch - +Patch4: k3b-1.0.4-manualbufsize.patch # RHEL6: Fix K3B icon -Patch106: trinity-k3b-icons.patch - +Patch106: trinity-k3b-icons.patch # [k3b] Fix compilation with GCC 4.7 [Bug #958] Patch108: k3b-3.5.13-fix_Range_r_3-gcc47.patch - -BuildRequires: trinity-kdelibs-devel +# [k3b] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011 +Patch109: k3b-3.5.13-missing_ldflags.patch +# [k3b] Fix dbus-tqt header detection, required for HAL support +Patch110: k3b-3.5.13-fix_dbus_tqt_detection.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-arts-devel BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel BuildRequires: audiofile-devel BuildRequires: dbus-tqt-devel hal-devel -BuildRequires: flac-devel BuildRequires: gettext BuildRequires: libdvdread-devel BuildRequires: libmpcdec-devel @@ -58,9 +70,14 @@ BuildRequires: libsndfile-devel BuildRequires: libvorbis-devel BuildRequires: taglib-devel BuildRequires: zlib-devel +BuildRequires: %{_lib}resmgr-devel -Obsoletes: k3b-extras < 0:1.0-1 -Provides: k3b-extras = %{version}-%{release} +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}flac-devel +BuildRequires: %{_lib}flac++-devel +%else +BuildRequires: flac-devel +%endif Requires(post): coreutils Requires(postun): coreutils @@ -79,30 +96,137 @@ steps of the burning process the beginner may find comfort in the automatic settings and the reasonable k3b defaults which allow a quick start. +%files +%defattr(-,root,root,-) +%doc AUTHORS README COPYING TODO ChangeLog +%{tde_bindir}/k3b +%{tde_tdelibdir}/kfile_k3b.la +%{tde_tdelibdir}/kfile_k3b.so +%{tde_tdelibdir}/kio_videodvd.la +%{tde_tdelibdir}/kio_videodvd.so +%{tde_tdelibdir}/libk3balsaoutputplugin.la +%{tde_tdelibdir}/libk3balsaoutputplugin.so +%{tde_tdelibdir}/libk3bartsoutputplugin.la +%{tde_tdelibdir}/libk3bartsoutputplugin.so +%{tde_tdelibdir}/libk3baudiometainforenamerplugin.la +%{tde_tdelibdir}/libk3baudiometainforenamerplugin.so +%{tde_tdelibdir}/libk3baudioprojectcddbplugin.la +%{tde_tdelibdir}/libk3baudioprojectcddbplugin.so +%{tde_tdelibdir}/libk3bexternalencoder.la +%{tde_tdelibdir}/libk3bexternalencoder.so +%{tde_tdelibdir}/libk3bflacdecoder.la +%{tde_tdelibdir}/libk3bflacdecoder.so +%{tde_tdelibdir}/libk3blibsndfiledecoder.la +%{tde_tdelibdir}/libk3blibsndfiledecoder.so +%{tde_tdelibdir}/libk3bmpcdecoder.la +%{tde_tdelibdir}/libk3bmpcdecoder.so +%{tde_tdelibdir}/libk3boggvorbisdecoder.la +%{tde_tdelibdir}/libk3boggvorbisdecoder.so +%{tde_tdelibdir}/libk3boggvorbisencoder.la +%{tde_tdelibdir}/libk3boggvorbisencoder.so +%{tde_tdelibdir}/libk3bsoxencoder.la +%{tde_tdelibdir}/libk3bsoxencoder.so +%{tde_tdelibdir}/libk3bwavedecoder.la +%{tde_tdelibdir}/libk3bwavedecoder.so +%lang(en) %{tde_tdedocdir}/HTML/en/k3b/ + + +########## + %package common Summary: Common files of %{name} Group: Applications/Archiving Requires: %{name} = %{version}-%{release} -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} BuildArch: noarch %endif + %description common %{summary}. +%files common +%defattr(-,root,root,-) +%{tde_tdeappdir}/k3b.desktop +%{tde_datadir}/applnk/.hidden/k3b-cue.desktop +%{tde_datadir}/applnk/.hidden/k3b-iso.desktop +%{tde_datadir}/apps/k3b/ +%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop +%{tde_datadir}/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop +%{tde_datadir}/apps/konqueror/servicemenus/k3b_cd_copy.desktop +%{tde_datadir}/apps/konqueror/servicemenus/k3b_dvd_copy.desktop +%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop +%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop +%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop +%{tde_datadir}/config/k3brc +%{tde_datadir}/mimelnk/application/x-k3b.desktop +%{tde_datadir}/icons/hicolor/*/apps/k3b.png +%{tde_datadir}/services/kfile_k3b.desktop +%{tde_datadir}/services/videodvd.protocol +%{tde_datadir}/sounds/k3b_error1.wav +%{tde_datadir}/sounds/k3b_success1.wav +%{tde_datadir}/sounds/k3b_wait_media1.wav + + +%post common +touch --no-create %{tde_datadir}/icons/hicolor ||: + +%postun common +if [ $1 -eq 0 ] ; then + touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null + gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : + update-desktop-database %{tde_appdir} -q &> /dev/null +fi + +%posttrans common +gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : +update-desktop-database %{tde_appdir} -q &> /dev/null + +########## + %package libs Summary: Runtime libraries for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} + %description libs %{summary}. +%files libs +%defattr(-,root,root,-) +%{tde_libdir}/libk3b.so.3 +%{tde_libdir}/libk3b.so.3.0.0 +%{tde_libdir}/libk3bdevice.so.5 +%{tde_libdir}/libk3bdevice.so.5.0.0 + +%post libs +/sbin/ldconfig + +%postun libs +/sbin/ldconfig + +########## + %package devel Summary: Files for the development of applications which will use %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} + %description devel %{summary}. +%files devel +%defattr(-,root,root,-) +%{tde_includedir}/k3b/ +%{tde_libdir}/libk3b.so +%{tde_libdir}/libk3bdevice.so + +%post devel +/sbin/ldconfig + +%postun devel +/sbin/ldconfig + +########## %prep %setup -q -a 0 -n applications/k3b @@ -111,13 +235,15 @@ Requires: %{name}-libs = %{version}-%{release} %patch4 -p1 -b .manualbufsize %patch106 -p1 -b .desktopfile %patch108 -p1 +%patch109 -p1 -b .ldflags +%patch110 -p1 -b .dbustqt # 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" +%__sed -i "admin/acinclude.m4.in" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/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/ltmain.sh" "admin/ltmain.sh" @@ -126,13 +252,17 @@ Requires: %{name}-libs = %{version}-%{release} %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -CFLAGS="%optflags -fno-strict-aliasing" \ -CXXFLAGS="%optflags -fno-strict-aliasing" \ %configure \ - --includedir=%{_includedir}/k3b \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --includedir=%{tde_includedir}/k3b \ --disable-rpath \ --enable-new-ldflags \ --disable-debug --disable-warnings \ @@ -147,85 +277,35 @@ CXXFLAGS="%optflags -fno-strict-aliasing" \ --with-sndfile \ --without-ffmpeg --without-lame --without-libmad \ --with-musepack \ - --with-extra-includes=%{_includedir}/tqt + --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir} %__make %{?_smp_mflags} %install +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc +%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc # remove the .la files -%__rm -f %{buildroot}%{_libdir}/libk3b*.la +%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la # remove i18n for Plattdeutsch (Low Saxon) -#%__rm -fr %{buildroot}%{_datadir}/locale/nds - +#%__rm -fr %{buildroot}%{tde_datadir}/locale/nds -%check -export PATH="%{_bindir}:${PATH}" -desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b.desktop %clean %__rm -rf %{buildroot} -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig - -%post common -touch --no-create %{_datadir}/icons/hicolor ||: - -%postun common -if [ $1 -eq 0 ] ; then -touch --no-create %{_datadir}/icons/hicolor &> /dev/null -gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : -update-desktop-database -q &> /dev/null -fi - -%posttrans common -gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : -update-desktop-database -q &> /dev/null - - -%files -%defattr(-,root,root,-) -%doc AUTHORS README COPYING TODO ChangeLog -%{_bindir}/k3b -%{tde_libdir}/*.so -%{tde_libdir}/*.la -%{tde_docdir}/HTML/en/k3b - -%files common -%defattr(-,root,root,-) -%{_datadir}/applications/kde/*.desktop -%{_datadir}/applnk/.hidden/*.desktop -%{_datadir}/apps/k3b/ -%{_datadir}/apps/konqueror/servicemenus/*.desktop -%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop -%{_datadir}/config/k3brc -%{_datadir}/mimelnk/application/x-k3b.desktop -%{_datadir}/icons/hicolor/*/*/* -%{_datadir}/services/kfile_k3b.desktop -%{_datadir}/services/videodvd.protocol -%{_datadir}/sounds/k3b_*.wav - -%files libs -%defattr(-,root,root,-) -%{_libdir}/libk3b.so.3* -%{_libdir}/libk3bdevice.so.5* - -%files devel -%defattr(-,root,root,-) -%{_includedir}/* -%{_libdir}/libk3b.so -%{_libdir}/libk3bdevice.so - %changelog +* Sat Aug 04 2012 Francois Andriot - 3.5.13-5 +- Add support for Mageia 2 and Mandriva 2011 +- Fix DBUS-TQT detection that prevented HAL support +- Adds requirement for resmgr + * Wed May 09 2012 Francois Andriot - 3.5.13-4 - Removes i18 files (built separately) diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_another_string_format_error.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_another_string_format_error.patch new file mode 100644 index 000000000..e9b026778 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_another_string_format_error.patch @@ -0,0 +1,19 @@ +commit b3bb8a8f4438bdab23809387e9f6b85a5b5914f3 +Author: Timothy Pearson +Date: 1336103211 -0500 + + Fix another string format error + +diff --git a/libk9copy/k9saveimage.cpp b/libk9copy/k9saveimage.cpp +index edc4162..23613d8 100644 +--- a/libk9copy/k9saveimage.cpp ++++ b/libk9copy/k9saveimage.cpp +@@ -76,7 +76,7 @@ void k9SaveImage::run() { + TQString sFileName=m_tempFile->name(); + m_image.save(sFileName,"PNG"); + sFileName="\rINFOIMAGE:"+sFileName; +- fprintf(stderr,sFileName.utf8()); ++ fprintf(stderr,"%s",sFileName.utf8()); + + m_mutex.unlock(); + } diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal.patch new file mode 100644 index 000000000..db4c99a63 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal.patch @@ -0,0 +1,53 @@ +commit 3bfc84b0fc3558c377e2f5a99548a6903a9ee7c3 +Author: Timothy Pearson +Date: 1336066302 -0500 + + Fix 'format not a string literal' error + Clean up warning + +diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp +index e6f6675..9f95352 100644 +--- a/libk9copy/k9burndvd.cpp ++++ b/libk9copy/k9burndvd.cpp +@@ -112,7 +112,7 @@ void k9BurnDVD::mkisoSizeStdout(KProcess *proc, char *buffer, int buflen) { + ; + } + +-const TQString &k9BurnDVD::getImageSize() { ++const TQString k9BurnDVD::getImageSize() { + TQString c; + c="mkisofs"; + proc2=new k9Process; +@@ -215,8 +215,8 @@ void k9BurnDVD::burnWithGenisoimage() { + if ( KMessageBox::warningContinueCancel ( 0,i18n("Insert a recordable DVD"), i18n("DVD burning"))!=KMessageBox::Continue) + cancelled=true; + } +- qDebug(proc->debug()); +- } ++ qDebug("%s", proc->debug()); ++ } + + + if (!cancelled) { +@@ -239,7 +239,7 @@ void k9BurnDVD::burnWithGenisoimage() { + } + } + } +- } ++ } + } + } + +diff --git a/libk9copy/k9burndvd.h b/libk9copy/k9burndvd.h +index fc2edce..94e1e71 100644 +--- a/libk9copy/k9burndvd.h ++++ b/libk9copy/k9burndvd.h +@@ -71,7 +71,7 @@ private: + void getWodimCmd(k9Process *proc); + + void burnWithK3b(); +- const TQString &getImageSize(); ++ const TQString getImageSize(); + TQString imageSize; + TQString m_speed; + private slots: // Private slots diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal_2.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal_2.patch new file mode 100644 index 000000000..561bcbb22 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal_2.patch @@ -0,0 +1,23 @@ +commit d9ed8b3291e596eafed777956a062dc8816d0d3c +Author: Timothy Pearson +Date: 1336083386 -0500 + + Fix 'format not a string literal' error + +diff --git a/libk9copy/k9cellcopylist.cpp b/libk9copy/k9cellcopylist.cpp +index be4e406..31e85a3 100644 +--- a/libk9copy/k9cellcopylist.cpp ++++ b/libk9copy/k9cellcopylist.cpp +@@ -294,10 +294,10 @@ double k9CellCopyList::getMinFactor(bool _withMenus) { + double totalSize=gettotalSize()+menuSize - (fforced) -m_inbytes; + totalSize/=2.50; + +-qDebug(TQString("totalSize(%1)=gettotalSize()(%2)+menuSize(%3) -(fforced(%4))-m_inbytes(%6)").tqarg(totalSize).tqarg(gettotalSize()).tqarg(menuSize).tqarg(fforced).tqarg(m_frcinbytes).tqarg(m_inbytes)); ++ qDebug("%s", (TQString("totalSize(%1)=gettotalSize()(%2)+menuSize(%3) -(fforced(%4))-m_inbytes(%6)").tqarg(totalSize).tqarg(gettotalSize()).tqarg(menuSize).tqarg(fforced).tqarg(m_frcinbytes).tqarg(m_inbytes)).ascii()); + + double minFactor=(fforced-m_frcinbytes) /(MaxSize- (totalSize +m_outbytes) - m_frcoutbytes) ; +- qDebug(TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes)); ++ qDebug("%s", (TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes)).ascii()); + + if (minFactor<1) + minFactor=1; diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_format_string_error.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_string_error.patch new file mode 100644 index 000000000..7ab4962e0 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_string_error.patch @@ -0,0 +1,28 @@ +commit a016df82c8970a2aaccbf3b061e102af3a3f04ab +Author: Timothy Pearson +Date: 1336190259 -0500 + + Fix format string error + +diff --git a/k9vamps/k9vamps.cpp b/k9vamps/k9vamps.cpp +index d7bd43d..ebf4164 100755 +--- a/k9vamps/k9vamps.cpp ++++ b/k9vamps/k9vamps.cpp +@@ -399,7 +399,7 @@ int k9vamps::check_video_packet (uchar *ptr) { + pad_packet_start_code |= (uint32_t) (ptr [3]); + + if (pad_packet_start_code != 0x000001be) +- qDebug (TQString("Bad padding packet start code at %1: %2").tqarg(rtell (ptr + vid_packet_length)).tqarg(pad_packet_start_code)); ++ qDebug ("%s", (TQString("Bad padding packet start code at %1: %2").tqarg(rtell (ptr + vid_packet_length)).tqarg(pad_packet_start_code)).ascii()); + else { + pad_packet_length = ptr [4] << 8; + pad_packet_length |= ptr [5]; +@@ -409,7 +409,7 @@ int k9vamps::check_video_packet (uchar *ptr) { + + // length of video packet plus padding packet must always match sector size + if (14 + vid_packet_length + pad_packet_length != SECT_SIZE) +- qDebug (TQString("Bad video packet length at %1: %2").tqarg(rtell (ptr)).tqarg(vid_packet_length)); ++ qDebug ("%s", (TQString("Bad video packet length at %1: %2").tqarg(rtell (ptr)).tqarg(vid_packet_length)).ascii()); + + return rc; + } diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs.patch new file mode 100644 index 000000000..f6dc49802 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs.patch @@ -0,0 +1,19 @@ +commit 62acebb74cc50671eebf21a314912b12b082be1d +Author: Timothy Pearson +Date: 1336073612 -0500 + + Fix FTBFS + +diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp +index 9f95352..3860b79 100644 +--- a/libk9copy/k9burndvd.cpp ++++ b/libk9copy/k9burndvd.cpp +@@ -215,7 +215,7 @@ void k9BurnDVD::burnWithGenisoimage() { + if ( KMessageBox::warningContinueCancel ( 0,i18n("Insert a recordable DVD"), i18n("DVD burning"))!=KMessageBox::Continue) + cancelled=true; + } +- qDebug("%s", proc->debug()); ++ qDebug("%s", proc->debug().ascii()); + } + + diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs_2.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs_2.patch new file mode 100644 index 000000000..f78d858df --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs_2.patch @@ -0,0 +1,19 @@ +commit ca864edeed0fe99b91c63616d4ec6d31ecdee217 +Author: Timothy Pearson +Date: 1336121912 -0500 + + Fix FTBFS + +diff --git a/libk9copy/k9saveimage.cpp b/libk9copy/k9saveimage.cpp +index 23613d8..758f8de 100644 +--- a/libk9copy/k9saveimage.cpp ++++ b/libk9copy/k9saveimage.cpp +@@ -76,7 +76,7 @@ void k9SaveImage::run() { + TQString sFileName=m_tempFile->name(); + m_image.save(sFileName,"PNG"); + sFileName="\rINFOIMAGE:"+sFileName; +- fprintf(stderr,"%s",sFileName.utf8()); ++ fprintf(stderr,"%s",sFileName.data()); + + m_mutex.unlock(); + } diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_remaining_string_format_errors.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_remaining_string_format_errors.patch new file mode 100644 index 000000000..fbf9cd56a --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_remaining_string_format_errors.patch @@ -0,0 +1,150 @@ +commit a8e98ad9ce209af0aba35ce26ec9200761b397df +Author: Timothy Pearson +Date: 1336091322 -0500 + + Fix remaining string format errors + +diff --git a/k9author/k9menu.cpp b/k9author/k9menu.cpp +index 29f2b02..ea9c622 100644 +--- a/k9author/k9menu.cpp ++++ b/k9author/k9menu.cpp +@@ -143,7 +143,7 @@ void k9Menu::convertJpegToMpeg(const TQString &_imageJpg,const TQString &_imageM + if (!process->normalExit()) { + qDebug("error converting jpeg to mpeg"); + } +- qDebug(process->debug().latin1()); ++ qDebug("%s", process->debug().latin1()); + } + + void k9Menu::createAudio(const TQString & _audioFile) { +diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp +index a2c02e7..454099e 100644 +--- a/k9author/k9newdvd.cpp ++++ b/k9author/k9newdvd.cpp +@@ -257,7 +257,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile * + *process << "-mpegopts" << "format=dvd" << "-vf" << "scale="+scale+",harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000"; + *process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").tqarg(m_videoBitrate).tqarg(m_config->getPrefAudioBitrate()).tqarg(m_config->getPrefAudioFormat().lower()); + *process << "-ofps" << fps << "-o" << fileName << "-ss" << t1 << "-endpos" << t2 << _aviFile->getFileName(); +- qDebug(process->debug()); ++ qDebug("%s", process->debug().ascii()); + /* + if (!m_progress->execute()) { + m_cancel=true; +diff --git a/k9devices/k9halconnection.cpp b/k9devices/k9halconnection.cpp +index 76c6882..e55c0b3 100644 +--- a/k9devices/k9halconnection.cpp ++++ b/k9devices/k9halconnection.cpp +@@ -41,7 +41,7 @@ k9HalConnection::k9HalConnection(TQObject *parent, const char *name) + dbus_error_init( &error ); + m_dbusConnect = dbus_bus_get( DBUS_BUS_SYSTEM, &error ); + if( dbus_error_is_set(&error) ) { +- qDebug(TQString("Error connecting to DBUS : %1").tqarg(error.message)); ++ qDebug("%s", (TQString("Error connecting to DBUS : %1").tqarg(error.message)).ascii()); + return; + } + +diff --git a/k9devices/k9haldevice.cpp b/k9devices/k9haldevice.cpp +index 9ddff76..0129efe 100644 +--- a/k9devices/k9haldevice.cpp ++++ b/k9devices/k9haldevice.cpp +@@ -95,7 +95,7 @@ void k9HalDevice::getDriveProperties() { + m_canReadDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDROM)==LIBHAL_DRIVE_CDROM_CAPS_DVDROM; + m_canBurnDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDR)==LIBHAL_DRIVE_CDROM_CAPS_DVDR; + m_model=TQString(libhal_drive_get_model(drive)); +- // qDebug(TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").tqarg(m_canReadDvd).tqarg(m_canBurnDvd).tqarg(m_model)); ++ // qDebug("%s", (TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").tqarg(m_canReadDvd).tqarg(m_canBurnDvd).tqarg(m_model)).ascii()); + + + libhal_drive_free(drive); +diff --git a/k9vamps/k9vamps.cpp b/k9vamps/k9vamps.cpp +index f910979..d7bd43d 100755 +--- a/k9vamps/k9vamps.cpp ++++ b/k9vamps/k9vamps.cpp +@@ -368,7 +368,7 @@ int k9vamps::check_video_packet (uchar *ptr) { + + if (ptr [7]) { + if ((ptr [7] & 0xc0) != 0xc0) +- qDebug (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").tqarg(rtell (ptr)).tqarg(ptr [7])); ++ qDebug ("%s", (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").tqarg(rtell (ptr)).tqarg(ptr [7])).ascii()); + else { + sequence_header_code = (uint32_t) (ptr [6 + 3 + ptr [8] + 0]) << 24; + sequence_header_code |= (uint32_t) (ptr [6 + 3 + ptr [8] + 1]) << 16; +diff --git a/libk9copy/k9cellcopylist.cpp b/libk9copy/k9cellcopylist.cpp +index 31e85a3..fe880ac 100644 +--- a/libk9copy/k9cellcopylist.cpp ++++ b/libk9copy/k9cellcopylist.cpp +@@ -298,7 +298,7 @@ double k9CellCopyList::getMinFactor(bool _withMenus) { + + double minFactor=(fforced-m_frcinbytes) /(MaxSize- (totalSize +m_outbytes) - m_frcoutbytes) ; + qDebug("%s", (TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes)).ascii()); +- ++ + if (minFactor<1) + minFactor=1; + return minFactor; +@@ -347,7 +347,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) { + + if (dvdSize2 <0) { + factor=2.5; +- //qDebug(TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").tqarg(dvdSize).tqarg(m_outbytes).tqarg(fforcedsh).tqarg(dvdSize2)); ++ //qDebug("%s", (TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").tqarg(dvdSize).tqarg(m_outbytes).tqarg(fforcedsh).tqarg(dvdSize2).ascii())); + } + else { + factor=(totalSize +menuSize - fforced -m_inbytes)/ dvdSize2 ; +@@ -361,7 +361,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) { + uint64_t i=m_inbytes; + //if (o==0) + // o=1; +- //qDebug(TQString("factor : %1 realise : %2").tqarg(factor).tqarg((double)i/(double)o)); ++ //qDebug("%s", (TQString("factor : %1 realise : %2").tqarg(factor).tqarg((double)i/(double)o).ascii())); + + if (factor<=1) + factor=1; +diff --git a/libk9copy/k9dvdauthor.cpp b/libk9copy/k9dvdauthor.cpp +index 3676109..256cf53 100755 +--- a/libk9copy/k9dvdauthor.cpp ++++ b/libk9copy/k9dvdauthor.cpp +@@ -505,7 +505,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) { + // m_copied+=totalBytes - m_lastPos; + m_copied=totalBytes; + m_lastPos=totalBytes; +- //qDebug(TQString("copied : %1 totalSize : %2").tqarg(m_copied).tqarg(m_totalSize*512)); ++ //qDebug("%s", (TQString("copied : %1 totalSize : %2").tqarg(m_copied).tqarg(m_totalSize*512).ascii()); + m_percent=(float)m_copied / (float)(m_totalSize/DVD_VIDEO_LB_LEN ); + + +@@ -526,7 +526,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) { + } + /* else { + if (!m_stderr.startsWith("libdvdread") && m_stderr.startsWith("libdvdnav")) +- qDebug(m_stderr); ++ qDebug("%s", m_stderr.ascii()); + } + */ + int end; +diff --git a/libk9copy/k9ifo2.cpp b/libk9copy/k9ifo2.cpp +index 57643c4..8c73213 100644 +--- a/libk9copy/k9ifo2.cpp ++++ b/libk9copy/k9ifo2.cpp +@@ -870,7 +870,7 @@ void k9Ifo2::checkBuffer(TQString lib,uchar* _buffer) { + if (memcmp(bufCopy,_buffer,bufCopySize)!=0) { + TQString c; + c="Buffer de sortie altéré: " +lib; +- qDebug(c.latin1()); ++ qDebug("%s", c.latin1()); + } + } + +diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp +index e29f206..0f4aaca 100644 +--- a/libk9copy/k9mp4enc.cpp ++++ b/libk9copy/k9mp4enc.cpp +@@ -392,7 +392,7 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) + TQCString str=* ( m_process->args().at ( i ) ); + s +=TQString ( str ) +" "; + } +- qDebug ( s ); ++ qDebug ( "%s", s.ascii() ); + time->start(); + m_timer3.start(); + connect ( m_process, TQT_SIGNAL ( receivedStdout ( KProcess *, char *, int ) ),this, TQT_SLOT ( getStdout ( KProcess *, char *, int ) ) ); diff --git a/redhat/applications/k9copy/k9copy-3.5.13-ftbfs.patch b/redhat/applications/k9copy/k9copy-3.5.13-ftbfs.patch deleted file mode 100644 index 67c2464cd..000000000 --- a/redhat/applications/k9copy/k9copy-3.5.13-ftbfs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar k9copy.ORI/src/Makefile.am k9copy.P/src/Makefile.am ---- k9copy.ORI/src/Makefile.am 2011-11-21 00:08:57.943296860 +0100 -+++ k9copy.P/src/Makefile.am 2011-11-21 00:18:50.559281008 +0100 -@@ -30,7 +30,7 @@ - kconfigdlg.cpp kviewmpeg2.cpp kviewmpeg2.h langselectw.ui main.cpp mencoderCmdGen.ui \ - playbackoptionsw.ui prefAuthor.ui prefDVD.ui prefMPEG4.ui prefMencoder.ui prefpreview.ui \ - titlefactor.ui viewmpeg2.ui --k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) -+k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) $(LIBDL) - k9copy_LDADD = $(top_builddir)/k9Mplayer/libk9mplayer.la \ - $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ - $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ diff --git a/redhat/applications/k9copy/k9copy-3.5.13-missing_ldflags.patch b/redhat/applications/k9copy/k9copy-3.5.13-missing_ldflags.patch new file mode 100644 index 000000000..3cce7ea00 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-missing_ldflags.patch @@ -0,0 +1,11 @@ +--- k9copy/src/Makefile.am.ldflags 2011-10-15 01:43:52.000000000 +0200 ++++ k9copy/src/Makefile.am 2012-08-04 17:40:13.574823034 +0200 +@@ -35,7 +35,7 @@ + $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ + $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ + $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ +- $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi ++ $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) + + # this is where the desktop file will go + shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/redhat/applications/k9copy/trinity-k9copy.spec b/redhat/applications/k9copy/trinity-k9copy.spec index d56c14c08..ad0f6f317 100644 --- a/redhat/applications/k9copy/trinity-k9copy.spec +++ b/redhat/applications/k9copy/trinity-k9copy.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp k9copy -%define version 1.2.3 -%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" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif -# TDE 3.5.12 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: DVD backup tool for Trinity -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 1.2.3 +Release: 2%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -28,18 +35,35 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz -Patch0: k9copy-3.5.13-ftbfs.patch + +# [k9copy] Missing LDFLAGS cause FTBFS +Patch0: k9copy-3.5.13-missing_ldflags.patch +# [k9copy] Fix 'format not a string literal' error. Clean up warning. [Commit #3bfc84b0] +Patch1: k9copy-3.5.13-fix_format_not_string_literal.patch +# [k9copy] Fix FTBFS [Commit #62acebb7] +Patch2: k9copy-3.5.13-fix_ftbfs.patch +# [k9copy] Fix 'format not a string literal' error [Commit #d9ed8b32] +Patch3: k9copy-3.5.13-fix_format_not_string_literal_2.patch +# [k9copy] Fix remaining string format errors [Commit #a8e98ad9] +Patch4: k9copy-3.5.13-fix_remaining_string_format_errors.patch +# [k9copy] Fix another string format error [Commit #b3bb8a8f] +Patch5: k9copy-3.5.13-fix_another_string_format_error.patch +# [k9copy] Fix FTBFS [Commit #ca864ede] +Patch6: k9copy-3.5.13-fix_ftbfs_2.patch +# [k9copy] Fix format string error [Commit #a016df82] +Patch7: k9copy-3.5.13-fix_format_string_error.patch BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils -BuildRequires: ffmpeg-devel +# Warning: the target distribution must have ffmpeg ! +BuildRequires: ffmpeg-devel Requires: ffmpeg %description @@ -50,13 +74,20 @@ This is the Trinity version %prep %setup -q -n applications/%{kdecomp} -%patch0 -p1 +%patch0 -p1 -b .ldflags +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -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|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/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/ltmain.sh" "admin/ltmain.sh" @@ -65,19 +96,24 @@ This is the Trinity version %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt \ - --enable-closure + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -88,26 +124,38 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} &> /dev/null %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} &> /dev/null %files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING -%{_bindir}/k9copy -%{_datadir}/applications/kde/k9copy.desktop -%{_datadir}/apps/k9copy -%{_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop -%{tde_docdir}/HTML/en/k9copy -%{_datadir}/icons/hicolor/*/apps/k9copy.png +%{tde_bindir}/k9copy +%{tde_tdeappdir}/k9copy.desktop +%{tde_datadir}/apps/k9copy/ +%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop +%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/ +%{tde_datadir}/icons/hicolor/*/apps/k9copy.png %Changelog +* Sat Aug 04 2012 Francois Andriot - 1.2.3-2 +- Add support for MGA2 and MDV2011 +- Fix 'format not a string literal' error. Clean up warning. [Commit #3bfc84b0] +- Fix FTBFS [Commit #62acebb7] +- Fix 'format not a string literal' error [Commit #d9ed8b32] +- Fix remaining string format errors [Commit #a8e98ad9] +- Fix another string format error [Commit #b3bb8a8f] +- Fix FTBFS [Commit #ca864ede] +- Fix format string error [Commit #a016df82] + * Fri Nov 25 2011 Francois Andriot - 1.2.3-2 - Fix HTML directory location diff --git a/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec b/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec index 8a037a459..efad8aef6 100644 --- a/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec +++ b/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec @@ -1,27 +1,32 @@ # Default version for this component %define kdecomp kaffeine-mozilla -%define version 0.4.3.1 -%define release 2 - -%define _prefix /usr # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 0.4.3.1 +Release: 2%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Multimedia @@ -30,7 +35,7 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz @@ -39,12 +44,17 @@ Source0: %{kdecomp}-3.5.13.tar.gz Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils +BuildRequires: nspr-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}xaw-devel +%else BuildRequires: libXaw-devel -BuildRequires: nspr-devel +%endif + Requires: trinity-kaffeine %description @@ -63,42 +73,40 @@ autoreconf -fiv %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt \ + --with-extra-includes=%{tde_includedir}/tqt \ --enable-closure \ - --prefix=%{_prefix}/%{_lib}/mozilla + --prefix=%{_libdir}/mozilla %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# Remove useless filess +%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a %clean %__rm -rf %{buildroot} %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : /sbin/ldconfig || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : /sbin/ldconfig || : %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README -%exclude %{_libdir}/mozilla/plugins/kaffeineplugin.a +# These files are installed outside TDE prefix %{_libdir}/mozilla/plugins/kaffeineplugin.la %{_libdir}/mozilla/plugins/kaffeineplugin.so diff --git a/redhat/applications/katapult/trinity-katapult-3.5.13.spec b/redhat/applications/katapult/trinity-katapult-3.5.13.spec index 9f745b2f2..28cc907bd 100644 --- a/redhat/applications/katapult/trinity-katapult-3.5.13.spec +++ b/redhat/applications/katapult/trinity-katapult-3.5.13.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp katapult -%define version 0.3.2.1 -%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: Faster access to applications, bookmarks, and other items. -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 0.3.2.1 +Release: 4%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -28,19 +35,19 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils %description -Katapult is an application for KDE, designed to allow faster access to +Katapult is an application for TDE, designed to allow faster access to applications, bookmarks, and other items. It is plugin-based, so it can launch anything that is has a plugin for. Its display is driven by plugins as well, so its appearance is completely customizable. It was @@ -52,9 +59,9 @@ inspired by Quicksilver for OS X. # 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" +%__sed -i "admin/acinclude.m4.in" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -62,22 +69,33 @@ inspired by Quicksilver for OS X. %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt \ - --enable-closure + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +%find_lang %{kdecomp} + +# Removes useless files (-devel ?) +%__rm -f %{?buildroot}%{tde_libdir}/*.so +%__rm -f %{?buildroot}%{tde_libdir}/*.la %clean %__rm -rf %{buildroot} @@ -85,37 +103,75 @@ export PATH="%{_bindir}:${PATH}" %post for f in crystalsvg hicolor ; do - touch --no-create %{_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : done -/sbin/ldconfig +/sbin/ldconfig || : +update-desktop-database %{tde_appdir} &> /dev/null %postun for f in crystalsvg hicolor ; do - touch --no-create %{_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : done -/sbin/ldconfig +/sbin/ldconfig || : +update-desktop-database %{tde_appdir} &> /dev/null -%files +%files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING -%{_bindir}/* -%{_datadir}/applications/*/*.desktop -%{_datadir}/icons/crystalsvg/*/*/* -%{_datadir}/icons/hicolor/*/*/* -%{_datadir}/locale/*/*/*.mo -%{_datadir}/services/*.desktop -%{_datadir}/servicetypes/*.desktop -%{tde_libdir}/*.so -%{tde_libdir}/*.la -%{_libdir}/*.so.* -%{tde_docdir}/HTML/en/katapult - - -%exclude %{_libdir}/*.so -%exclude %{_libdir}/*.la +%{tde_bindir}/katapult +%{tde_libdir}/libkatapult.so.2 +%{tde_libdir}/libkatapult.so.2.0.0 +%{tde_tdelibdir}/katapult_amarokcatalog.la +%{tde_tdelibdir}/katapult_amarokcatalog.so +%{tde_tdelibdir}/katapult_bookmarkcatalog.la +%{tde_tdelibdir}/katapult_bookmarkcatalog.so +%{tde_tdelibdir}/katapult_calculatorcatalog.la +%{tde_tdelibdir}/katapult_calculatorcatalog.so +%{tde_tdelibdir}/katapult_documentcatalog.la +%{tde_tdelibdir}/katapult_documentcatalog.so +%{tde_tdelibdir}/katapult_execcatalog.la +%{tde_tdelibdir}/katapult_execcatalog.so +%{tde_tdelibdir}/katapult_glassdisplay.la +%{tde_tdelibdir}/katapult_glassdisplay.so +%{tde_tdelibdir}/katapult_googlecatalog.la +%{tde_tdelibdir}/katapult_googlecatalog.so +%{tde_tdelibdir}/katapult_o2display.la +%{tde_tdelibdir}/katapult_o2display.so +%{tde_tdelibdir}/katapult_programcatalog.la +%{tde_tdelibdir}/katapult_programcatalog.so +%{tde_tdelibdir}/katapult_puredisplay.la +%{tde_tdelibdir}/katapult_puredisplay.so +%{tde_tdelibdir}/katapult_spellcatalog.la +%{tde_tdelibdir}/katapult_spellcatalog.so +%{tde_tdeappdir}/katapult.desktop +%{tde_datadir}/icons/crystalsvg/128x128/actions/katapultspellcheck.png +%{tde_datadir}/icons/crystalsvg/scalable/actions/katapultspellcheck.svgz +%{tde_datadir}/icons/hicolor/128x128/actions/checkmark.png +%{tde_datadir}/icons/hicolor/128x128/actions/no.png +%{tde_datadir}/icons/hicolor/128x128/apps/katapult.png +%{tde_datadir}/icons/hicolor/128x128/apps/xcalc.png +%{tde_datadir}/icons/hicolor/*/apps/katapult.png +%{tde_datadir}/icons/hicolor/scalable/apps/katapult.svgz +%{tde_datadir}/services/katapult_amarokcatalog.desktop +%{tde_datadir}/services/katapult_bookmarkcatalog.desktop +%{tde_datadir}/services/katapult_calculatorcatalog.desktop +%{tde_datadir}/services/katapult_documentcatalog.desktop +%{tde_datadir}/services/katapult_execcatalog.desktop +%{tde_datadir}/services/katapult_glassdisplay.desktop +%{tde_datadir}/services/katapult_googlecatalog.desktop +%{tde_datadir}/services/katapult_o2display.desktop +%{tde_datadir}/services/katapult_programcatalog.desktop +%{tde_datadir}/services/katapult_puredisplay.desktop +%{tde_datadir}/services/katapult_spellcatalog.desktop +%{tde_datadir}/servicetypes/katapultcatalog.desktop +%{tde_datadir}/servicetypes/katapultdisplay.desktop +%{tde_tdedocdir}/HTML/en/katapult/ + + + %Changelog * Tue May 01 2012 Francois Andriot - 0.3.2.1-4 diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_format_not_a_string_literal.patch b/redhat/applications/kbarcode/kbarcode-3.5.13-fix_format_not_a_string_literal.patch new file mode 100644 index 000000000..e779aa994 --- /dev/null +++ b/redhat/applications/kbarcode/kbarcode-3.5.13-fix_format_not_a_string_literal.patch @@ -0,0 +1,27 @@ +commit 14ba7d8af6ef7248dcd3eb85ae977950d1758600 +Author: Timothy Pearson +Date: 1336066403 -0500 + + Fix 'format not a string literal' error + +diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp +index 26e59da..6b07a7b 100644 +--- a/kbarcode/csvimportdlg.cpp ++++ b/kbarcode/csvimportdlg.cpp +@@ -334,7 +334,6 @@ void CSVImportDlg::accept() + TQValueList headers; + TQStringList list; + TQString name = getDatabaseName(); +- int i = 0; + + TQString q = "INSERT INTO " + name + " ("; + for( int c = 0; c < table->horizontalHeader()->count(); c++ ) { +@@ -375,7 +374,7 @@ void CSVImportDlg::accept() + + TQSqlQuery query; + if( !query.exec( line ) ) +- qDebug( i18n("Could not import the following line:") + line ); ++ qDebug( "%s", i18n("Could not import the following line:") + line ); + //KMessageBox::error( this, i18n("Could not import the following line:") + line ); + } + diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_ftbfs.patch b/redhat/applications/kbarcode/kbarcode-3.5.13-fix_ftbfs.patch new file mode 100644 index 000000000..87328eb06 --- /dev/null +++ b/redhat/applications/kbarcode/kbarcode-3.5.13-fix_ftbfs.patch @@ -0,0 +1,19 @@ +commit 62777d2782c7fa738eb047eff175785fc2cd24ff +Author: Timothy Pearson +Date: 1336091409 -0500 + + Fix FTBFS + +diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp +index 6b07a7b..b5c6efa 100644 +--- a/kbarcode/csvimportdlg.cpp ++++ b/kbarcode/csvimportdlg.cpp +@@ -374,7 +374,7 @@ void CSVImportDlg::accept() + + TQSqlQuery query; + if( !query.exec( line ) ) +- qDebug( "%s", i18n("Could not import the following line:") + line ); ++ qDebug( "%s", (i18n("Could not import the following line:") + line).ascii() ); + //KMessageBox::error( this, i18n("Could not import the following line:") + line ); + } + diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_remaining_string_literal.patch b/redhat/applications/kbarcode/kbarcode-3.5.13-fix_remaining_string_literal.patch new file mode 100644 index 000000000..de445db7f --- /dev/null +++ b/redhat/applications/kbarcode/kbarcode-3.5.13-fix_remaining_string_literal.patch @@ -0,0 +1,32 @@ +commit b8dc3f5795c618c3617302973fff7d7bbf0ead2d +Author: Timothy Pearson +Date: 1336099921 -0500 + + Fix remaining string format errors + +diff --git a/kbarcode/pixmapbarcode.cpp b/kbarcode/pixmapbarcode.cpp +index 02cb19b..4768b3e 100644 +--- a/kbarcode/pixmapbarcode.cpp ++++ b/kbarcode/pixmapbarcode.cpp +@@ -178,7 +178,7 @@ bool PixmapBarcode::createPixmap( TQPixmap* target, int resx, int resy ) + cmd += input->name(); + cmd += " -sNOPAUSE -q - -c showpage quit"; + +- qDebug("cmd: " + cmd ); ++ qDebug("cmd: %s", cmd.ascii() ); + gs_pipe = popen( cmd.latin1(), "w" ); + if( !gs_pipe ) + { +diff --git a/kbarcode/tbarcode2.cpp b/kbarcode/tbarcode2.cpp +index 8490f7c..95cc64f 100644 +--- a/kbarcode/tbarcode2.cpp ++++ b/kbarcode/tbarcode2.cpp +@@ -122,7 +122,7 @@ bool TBarcode2::createPostscript( char** postscript, long* postscript_size ) + tbarcode->height(), + tbarcode->checksum() ); + +- qDebug( "Cmd = " + cmd ); ++ qDebug( "Cmd = %s", cmd.ascii() ); + if( !readFromPipe( cmd.latin1(), postscript, postscript_size ) ) + return false; + diff --git a/redhat/applications/kbarcode/trinity-kbarcode.spec b/redhat/applications/kbarcode/trinity-kbarcode.spec index 507e0b1a5..83e71e5a2 100644 --- a/redhat/applications/kbarcode/trinity-kbarcode.spec +++ b/redhat/applications/kbarcode/trinity-kbarcode.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp kbarcode -%define version 2.0.6 -%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: barcode and label printing application for Trinity -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 2.0.6 +Release: 1%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -28,14 +35,22 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.kbarcode.net -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [kbarcode] Fix 'format not a string literal' error [Commit #14ba7d8a] +Patch1: kbarcode-3.5.13-fix_format_not_a_string_literal.patch +# [kbarcode] Fix FTBFS [Commit #62777d27] +Patch2: kbarcode-3.5.13-fix_ftbfs.patch +# [kbarcode] Fix remaining string format errors [Commit #b8dc3f57] +Patch3: kbarcode-3.5.13-fix_remaining_string_literal.patch + + BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils BuildRequires: gettext @@ -62,32 +77,41 @@ to use them in another application. %prep %setup -q -n applications/%{kdecomp} +%patch1 -p1 +%patch2 -p1 +%patch3 -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" +%__sed -i "admin/acinclude.m4.in" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common +%__make -f "admin/Makefile.common" %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt:%{tde_includedir} + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt # SMP safe ! %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -101,30 +125,35 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} &> /dev/null %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} &> /dev/null %files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO -%{_bindir}/kbarcode -%{tde_libdir}/kfile_kbarcode.la -%{tde_libdir}/kfile_kbarcode.so -%{_datadir}/applications/kde/kbarcode-batch.desktop -%{_datadir}/applications/kde/kbarcode-editor.desktop -%{_datadir}/applications/kde/kbarcode-label.desktop -%{_datadir}/applications/kde/kbarcode-single.desktop -%{_datadir}/applications/kde/kbarcode.desktop -%{_datadir}/apps/kbarcode -%{_datadir}/icons/hicolor/*/*/*.png -%{_datadir}/services/kfile_kbarcode.desktop +%{tde_bindir}/kbarcode +%{tde_tdelibdir}/kfile_kbarcode.la +%{tde_tdelibdir}/kfile_kbarcode.so +%{tde_tdeappdir}/kbarcode-batch.desktop +%{tde_tdeappdir}/kbarcode-editor.desktop +%{tde_tdeappdir}/kbarcode-label.desktop +%{tde_tdeappdir}/kbarcode-single.desktop +%{tde_tdeappdir}/kbarcode.desktop +%{tde_datadir}/apps/kbarcode/ +%{tde_datadir}/icons/hicolor/*/actions/barcode.png +%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png +%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png +%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png +%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png +%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png +%{tde_datadir}/services/kfile_kbarcode.desktop %Changelog diff --git a/redhat/applications/kbfx/kbfx-3.5.13-fix_install_directories.patch b/redhat/applications/kbfx/kbfx-3.5.13-fix_install_directories.patch new file mode 100644 index 000000000..43ec3a0ed --- /dev/null +++ b/redhat/applications/kbfx/kbfx-3.5.13-fix_install_directories.patch @@ -0,0 +1,8 @@ +--- kbfx/doc/CMakeLists.txt.ORI 2012-08-04 18:33:25.916251160 +0200 ++++ kbfx/doc/CMakeLists.txt 2012-08-04 18:33:49.658779402 +0200 +@@ -14,4 +14,4 @@ + ) + + INSTALL(FILES ${DOCFILES} +- DESTINATION ${SHARE_INSTALL_PREFIX}/doc/kbfx) ++ DESTINATION ${DOC_INSTALL_DIR}/kbfx) diff --git a/redhat/applications/kbfx/kbfx-3.5.13-missing_ldflags.patch b/redhat/applications/kbfx/kbfx-3.5.13-missing_ldflags.patch new file mode 100644 index 000000000..ac20238f7 --- /dev/null +++ b/redhat/applications/kbfx/kbfx-3.5.13-missing_ldflags.patch @@ -0,0 +1,20 @@ +--- kbfx/plugins/applications/CMakeLists.txt.ORI 2012-08-04 18:24:43.221636976 +0200 ++++ kbfx/plugins/applications/CMakeLists.txt 2012-08-04 18:26:32.602463608 +0200 +@@ -21,6 +21,7 @@ + ${KDE3_UI_LIBRARY} + ${KDE3_KHTML_LIBRARY} + ${M_LIBRARY} ++ ${KDE3_DCOP_LIBRARY} + ) + + KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmadatastub ${LIB_INSTALL_DIR}/kbfx/plugins) +--- kbfx/plugins/settings/CMakeLists.txt.ORI 2012-08-04 18:28:43.968853387 +0200 ++++ kbfx/plugins/settings/CMakeLists.txt 2012-08-04 18:29:10.408328041 +0200 +@@ -21,6 +21,7 @@ + ${KDE3_UI_LIBRARY} + ${KDE3_KHTML_LIBRARY} + ${M_LIBRARY} ++ ${KDE3_DCOP_LIBRARY} + ) + + KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmadatasettings ${LIB_INSTALL_DIR}/kbfx/plugins) diff --git a/redhat/applications/kbfx/trinity-kbfx.spec b/redhat/applications/kbfx/trinity-kbfx.spec index 55e16d6c7..7c8887c04 100644 --- a/redhat/applications/kbfx/trinity-kbfx.spec +++ b/redhat/applications/kbfx/trinity-kbfx.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp kbfx -%define version 0.4.9.3.1 -%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: an alternative to K-Menu for KDE [Trinity] -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 0.4.9.3.1 +Release: 1%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -28,14 +35,20 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [kbfx] Missing LDFLAGS cause FTBFS on Mageia 2 and Mandriva 2011 +Patch1: kbfx-3.5.13-missing_ldflags.patch +# [kbfx] Some files are installed in wrong directories ... +Patch2: kbfx-3.5.13-fix_install_directories.patch + + BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils %description @@ -51,21 +64,36 @@ Homepage: http://www.kbfx.org %prep %setup -q -n applications/%{kdecomp} +%patch1 -p1 -b .ldflags +%patch2 -p1 -b .dir -# Fix TDE executable path in CMakeLists.txt +# Fix TDE executable path in 'CMakeLists.txt' ... %__sed -i "CMakeLists.txt" \ - -e "s,/usr/bin/uic-tqt,%{_bindir}/uic-tqt," \ - -e "s,/usr/bin/tmoc,%{_bindir}/tmoc," \ - -e "s,/usr/include/tqt,%{_includedir}/tqt," - + -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|" \ + -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|" + +# Prevents hardcoded TDE directories ... +%__sed -i "cmakemodules/FindKdeLibs.cmake" \ + -e "s|^\(set(HTML_INSTALL_DIR.*\)|#\1|" \ + -e "s|^\(set(INCLUDE_INSTALL_DIR.*\)|#\1|" %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" - -%__mkdir build +export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}:%{tde_includedir}/tqt" + +%if 0%{?rhel} || 0%{?fedora} +%__mkdir_p build cd build +%endif + %cmake \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DDOC_INSTALL_DIR=%{tde_tdedocdir} \ + -DHTML_INSTALL_DIR=%{tde_tdedocdir}/HTML \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DUSE_STRIGI=OFF \ -DUSE_MENUDRAKE=OFF \ -DUSE_KDE4=OFF \ @@ -75,9 +103,9 @@ cd build %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build +%__make install DESTDIR=%{buildroot} -C build VERBOSE=1 %clean @@ -86,48 +114,51 @@ export PATH="%{_bindir}:${PATH}" %post /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} &> /dev/null %postun /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} &> /dev/null %files %defattr(-,root,root,-) -%{_bindir}/kbfxconfigapp -%{_includedir}/kbfx -%{_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la -%{_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so -%{_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la -%{_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so -%{_libdir}/kbfx/plugins/libkbfxplasmadatastub.la -%{_libdir}/kbfx/plugins/libkbfxplasmadatastub.so -%{_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la -%{_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so -%{_libdir}/libkbfxcommon.la -%{_libdir}/libkbfxcommon.so -%{_libdir}/libkbfxdata.la -%{_libdir}/libkbfxdata.so -%{tde_libdir}/libkbfxspinx.la -%{tde_libdir}/libkbfxspinx.so -%{_datadir}/applications/kde/kbfx_theme.desktop -%{_datadir}/applications/kde/kbfxconfigapp.desktop -%{_datadir}/apps/kbfx/skins/*/* -%{_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc -%{_datadir}/apps/kicker/applets/kbfxspinx.desktop -%{_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop -%{_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop -%{_docdir}/HTML/en/common/kbfx-*.jpg -%{_docdir}/HTML/en/kbfxconfigapp/index.cache.bz2 -%{_docdir}/HTML/en/kbfxconfigapp/index.docbook -%{_docdir}/kbfx -%{_datadir}/icons/hicolor/*/apps/kbfx.png -%{_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png -%{_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo -%{_datadir}/mimelnk/application/x-kbfxtheme.desktop +%{tde_bindir}/kbfxconfigapp +%{tde_tdeincludedir}/kbfx/ +%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la +%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so +%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la +%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so +%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.la +%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.so +%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la +%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so +%{tde_libdir}/libkbfxcommon.la +%{tde_libdir}/libkbfxcommon.so +%{tde_libdir}/libkbfxdata.la +%{tde_libdir}/libkbfxdata.so +%{tde_tdelibdir}/libkbfxspinx.la +%{tde_tdelibdir}/libkbfxspinx.so +%{tde_tdeappdir}/kbfx_theme.desktop +%{tde_tdeappdir}/kbfxconfigapp.desktop +%{tde_datadir}/apps/kbfx/skins/*/* +%{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc +%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop +%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop +%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop +%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg +%{tde_tdedocdir}/HTML/en/kbfxconfigapp/index.cache.bz2 +%{tde_tdedocdir}/HTML/en/kbfxconfigapp/index.docbook +%{tde_tdedocdir}/kbfx/ +%{tde_datadir}/icons/hicolor/*/apps/kbfx.png +%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png +%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo +%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop + %Changelog * Sun Nov 20 2011 Francois Andriot - 0.4.9.3.1-1 diff --git a/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec index 03b1a7779..5f4263f6f 100644 --- a/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec +++ b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp kbookreader -%define version 0.2.0 -%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" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: eBook reader for Trinity. -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 0.2.0 +Release: 2%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -36,8 +43,8 @@ Source0: %{kdecomp}-3.5.13.tar.gz BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils @@ -52,8 +59,8 @@ within the Trinity Desktop Environment. # 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|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -61,19 +68,25 @@ within the Trinity Desktop Environment. %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt \ - --enable-closure + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -103,24 +116,24 @@ fi %post -/sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %postun -/sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) %doc AUTHORS COPYING -%{_bindir}/* -%{_datadir}/applnk/*/*.desktop -%{_datadir}/apps/*/ -%{_datadir}/config.kcfg/* -%{tde_docdir}/HTML/en/*/ -%{_datadir}/icons/hicolor/*/*/* +%{tde_bindir}/bookreader +%{tde_bindir}/bookreader_client +%{tde_datadir}/applnk/Utilities/bookreader.desktop +%{tde_datadir}/apps/bookreader/ +%{tde_datadir}/config.kcfg/bookreader.kcfg +%{tde_tdedocdir}/HTML/en/bookreader/ +%{tde_datadir}/icons/hicolor/*/apps/bookreader.png + diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13-ftbfs.patch b/redhat/applications/kchmviewer/kchmviewer-3.5.13-missing_ldflags.patch similarity index 100% rename from redhat/applications/kchmviewer/kchmviewer-3.5.13-ftbfs.patch rename to redhat/applications/kchmviewer/kchmviewer-3.5.13-missing_ldflags.patch diff --git a/redhat/applications/kchmviewer/trinity-kchmviewer.spec b/redhat/applications/kchmviewer/trinity-kchmviewer.spec index 5b1c28d58..c3fb589ab 100644 --- a/redhat/applications/kchmviewer/trinity-kchmviewer.spec +++ b/redhat/applications/kchmviewer/trinity-kchmviewer.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp kchmviewer -%define version 3.1.2 -%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" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif -# TDE 3.5.12 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: CHM viewer for Trinity -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 3.1.2 +Release: 2%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -32,7 +39,9 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz -Patch0: kchmviewer-3.5.13-ftbfs.patch + +# [kchmviewer] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011 +Patch0: kchmviewer-3.5.13-missing_ldflags.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -67,8 +76,8 @@ support. Correctly detects and shows encoding of any valid chm file. # 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|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -77,10 +86,15 @@ support. Correctly detects and shows encoding of any valid chm file. %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{_includedir}" %configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ --disable-rpath \ --with-x \ --with-kde \ @@ -92,36 +106,37 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} %find_lang %{kdecomp} +# Removes useless files +%__rm -f %{?buildroot}%{tde_libdir}/*.a + %clean %__rm -rf %{buildroot} %post -touch --no-create %{_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %postun -touch --no-create %{_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING FAQ README -%{_bindir}/kchmviewer -%exclude %{_libdir}/libchmfile.a -%exclude %{_libdir}/libkdeextra.a -%{tde_libdir}/kio_msits.la -%{tde_libdir}/kio_msits.so -%{_datadir}/applnk/kchmviewer.desktop -%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png -%{_datadir}/services/msits.protocol +%{tde_bindir}/kchmviewer +%{tde_tdelibdir}/kio_msits.la +%{tde_tdelibdir}/kio_msits.so +%{tde_datadir}/applnk/kchmviewer.desktop +%{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png +%{tde_datadir}/services/msits.protocol %Changelog diff --git a/redhat/applications/kcmautostart/trinity-kcmautostart-3.5.13.spec b/redhat/applications/kcmautostart/trinity-kcmautostart-3.5.13.spec index bc1f49efb..70db276de 100644 --- a/redhat/applications/kcmautostart/trinity-kcmautostart-3.5.13.spec +++ b/redhat/applications/kcmautostart/trinity-kcmautostart-3.5.13.spec @@ -1,14 +1,26 @@ +# Default version for this component +%define kdecomp kchmviewer + # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-kcmautostart @@ -53,8 +65,8 @@ Requires: trinity-kdebase # 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|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/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/ltmain.sh" "admin/ltmain.sh" @@ -62,41 +74,41 @@ Requires: trinity-kdebase %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt \ - --disable-static + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --disable-static %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +%find_lang autostart %clean %__rm -rf %{buildroot} -%files +%files -f autostart.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO -%{tde_libdir}/kcm_autostart.la -%{tde_libdir}/kcm_autostart.so -%{_datadir}/applications/kde/autostart.desktop -%{tde_docdir}/HTML/en/autostart/common -%{tde_docdir}/HTML/en/autostart/index.cache.bz2 -%{tde_docdir}/HTML/en/autostart/index.docbook -%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/autostart.mo -%lang(es) %{_datadir}/locale/es/LC_MESSAGES/autostart.mo -%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/autostart.mo -%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/autostart.mo -%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/autostart.mo +%{tde_tdelibdir}/kcm_autostart.la +%{tde_tdelibdir}/kcm_autostart.so +%{tde_tdeappdir}/autostart.desktop +%{tde_tdedocdir}/HTML/en/autostart/ %Changelog diff --git a/redhat/applications/kcpuload/trinity-kcpuload.spec b/redhat/applications/kcpuload/trinity-kcpuload.spec index 345381e31..e1fde24ab 100644 --- a/redhat/applications/kcpuload/trinity-kcpuload.spec +++ b/redhat/applications/kcpuload/trinity-kcpuload.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp kcpuload -%define version 2.00 -%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" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: a CPU meter for Kicker [Trinity] -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 2.00 +Release: 2%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -55,8 +62,8 @@ KCPULoad has support for SMP and separate user/system loads. # 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|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -64,18 +71,24 @@ KCPULoad has support for SMP and separate user/system loads. %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -86,27 +99,25 @@ export PATH="%{_bindir}:${PATH}" %post for f in crystalsvg locolor ; do - touch --no-create %{_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : done %postun for f in crystalsvg locolor ; do - touch --no-create %{_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : done %files %defattr(-,root,root,-) -%{_bindir}/kcpuload -%{_datadir}/applnk/System/kcpuload.desktop -%{_datadir}/apps/kcpuload/icons/*/*/*/*.png -%{_datadir}/icons/crystalsvg/*/apps/kcpuload.png -%{_datadir}/icons/locolor/*/apps/kcpuload.png -%{tde_docdir}/HTML/en/kcpuload/common -%{tde_docdir}/HTML/en/kcpuload/index.cache.bz2 -%{tde_docdir}/HTML/en/kcpuload/index.docbook +%{tde_bindir}/kcpuload +%{tde_datadir}/applnk/System/kcpuload.desktop +%{tde_datadir}/apps/kcpuload/icons/*/*/*/*.png +%{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png +%{tde_datadir}/icons/locolor/*/apps/kcpuload.png +%{tde_tdedocdir}/HTML/en/kcpuload/ %Changelog diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index 04b21d382..8aeee8f7b 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -73,6 +73,7 @@ if [ -z "${VERSION}" ]; then fi VERSION="${VERSION##${COMP##*/}-}" VERSION="${VERSION%%.tar.gz}" + VERSION="${VERSION%%.tar.bz2}" # If version is defined in spec file: appends the date else VERSION="${VERSION}.$(date +%Y%m%d)"