From aa051be452bad87dc5bf8ac7ee26a7bafb555f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 16 Nov 2013 12:51:52 +0100 Subject: [PATCH] RPM Packaging: update R14 applications --- .../gtk-qt-engine/gtk-qt-engine-14.0.0.spec | 3 --- redhat/applications/kbiff/kbiff-14.0.0.spec | 3 +-- .../kchmviewer/kchmviewer-14.0.0.spec | 2 +- redhat/applications/kpilot/kpilot-14.0.0.spec | 2 +- .../tdeio-ftps/tdeio-ftps-14.0.0.spec | 2 +- .../tdeio-umountwrapper-14.0.0.spec | 5 ++--- .../tdeio-umountwrapper-3.5.13.2.spec | 16 ++++++++++------ .../applications/tderadio/tderadio-14.0.0.spec | 4 +++- redhat/applications/tellico/tellico-14.0.0.spec | 3 +-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec index 79c275e09..a4dc45479 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec @@ -44,8 +44,6 @@ Source1: gtk-qt-engine.rc.sh Source2: gtkrc-2.0-kde4 Source3: gtkrc-2.0-kde-kde4 -Patch0: gtk-qt-engine-14.0.0-debug.patch - BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -72,7 +70,6 @@ a way to configure it from within KControl. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .debug %build diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec index d5d4a59ea..742a0a5aa 100644 --- a/redhat/applications/kbiff/kbiff-14.0.0.spec +++ b/redhat/applications/kbiff/kbiff-14.0.0.spec @@ -30,7 +30,7 @@ Summary: TDE mail notification utility Group: Applications/Internet License: GPLv2+ -URL: http://sourceforge.net/projects/knmap/ +URL: http://www.trinitydesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz @@ -65,7 +65,6 @@ NNTP mailboxes. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec index 7436ffa4b..4ad605065 100644 --- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec +++ b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: CHM viewer for Trinity Version: 3.1.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec index 807c4c5a7..435434a7a 100644 --- a/redhat/applications/kpilot/kpilot-14.0.0.spec +++ b/redhat/applications/kpilot/kpilot-14.0.0.spec @@ -49,7 +49,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: pilot-link-devel +BuildRequires: pilot-link-devel >= 0.12 BuildRequires: trinity-tdepim-devel >= %{tde_version} %description diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec index b72ffee4e..00baa6312 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec +++ b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec @@ -29,7 +29,7 @@ Summary: An ftps TDEIO slave for Trinity Group: Productivity/Networking/Ftp/Clients License: GPLv2+ -URL: http://kasablanca.berlios.de/kio-ftps/ +URL: http://www.trinitydesktop.org/ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec index 7d39a0368..33cc0f193 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: progress dialog for safely removing devices in Trinity. Version: 0.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -57,7 +57,6 @@ Wrapper around tdeio_media_mountwrapper. Provides a progress dialog for Safely Removing of devices in Trinity. - %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif @@ -134,5 +133,5 @@ fi %changelog -* Fri Jul 05 2013 Francois Andriot - 0.2-7 +* Fri Jul 05 2013 Francois Andriot - 0.2-8 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec index 8697ce046..f83a7fffa 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: progress dialog for safely removing devices in Trinity. Version: 0.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -40,7 +40,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: media_safelyremove.desktop_tdeio +Source1: media_safelyremove.desktop BuildRequires: trinity-tqtinterface-devel >= %{tde_version} @@ -53,11 +53,10 @@ Obsoletes: trinity-kio-umountwrapper < %{version}-%{release} Provides: trinity-kio-umountwrapper = %{version}-%{release} %description -Wrapper around tdeio_media_mountwrapper. +Wrapper around kio_media_mountwrapper. Provides a progress dialog for Safely Removing of devices in Trinity. - %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif @@ -72,7 +71,8 @@ Provides a progress dialog for Safely Removing of devices in Trinity. %build -unset QTDIR; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" %configure \ @@ -131,8 +131,12 @@ fi %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper + %changelog -* Fri Aug 16 2013 Francois Andriot - 0.2.5-6 +* Sat Sep 28 2013 Francois Andriot - 0.2-7 +- Fix inadvertent 'kio' renaming + +* Fri Aug 16 2013 Francois Andriot - 0.2-6 - Build for Fedora 19 * Mon Jun 03 2013 Francois Andriot - 0.2-5 diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio-14.0.0.spec index 8c7d8fff0..6265f14d6 100644 --- a/redhat/applications/tderadio/tderadio-14.0.0.spec +++ b/redhat/applications/tderadio/tderadio-14.0.0.spec @@ -108,6 +108,7 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +# Warning: --enable-visibility causes applications fails to start ! %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -123,7 +124,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-new-ldflags \ --enable-closure \ --enable-rpath \ - --enable-gcc-hidden-visibility \ + --disable-gcc-hidden-visibility \ \ %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \ --enable-v4l2 \ @@ -142,6 +143,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec index ac84db4a3..2161deede 100644 --- a/redhat/applications/tellico/tellico-14.0.0.spec +++ b/redhat/applications/tellico/tellico-14.0.0.spec @@ -146,9 +146,8 @@ fi %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -# Warning, --enable-final causes FTBFS ยง +# Warning, --enable-final causes FTBFS ! %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \