summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redhat/applications/abakus/abakus-14.0.0.spec14
-rw-r--r--redhat/applications/amarok/amarok-14.0.0.spec75
-rw-r--r--redhat/applications/basket/basket-14.0.0.spec34
-rw-r--r--redhat/applications/bibletime/bibletime-14.0.0.spec29
-rw-r--r--redhat/applications/digikam/digikam-14.0.0.spec45
-rw-r--r--redhat/applications/dolphin/dolphin-14.0.0.spec13
-rw-r--r--redhat/applications/filelight/filelight-14.0.0.spec21
-rw-r--r--redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec23
-rw-r--r--redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec14
-rw-r--r--redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec14
-rw-r--r--redhat/applications/gwenview/gwenview-14.0.0.spec14
-rw-r--r--redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec14
-rw-r--r--redhat/applications/k3b/k3b-14.0.0.spec54
-rw-r--r--redhat/applications/k9copy/k9copy-14.0.0-fix_author.patch25
-rw-r--r--redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch11
-rw-r--r--redhat/applications/k9copy/k9copy-14.0.0-use_external_dvdread.patch102
-rw-r--r--redhat/applications/k9copy/k9copy-14.0.0.spec38
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec20
-rw-r--r--redhat/applications/kaffeine/kaffeine-14.0.0.spec82
-rw-r--r--redhat/applications/kasablanca/kasablanca-14.0.0.spec19
-rw-r--r--redhat/applications/katapult/katapult-14.0.0.spec13
-rw-r--r--redhat/applications/kbarcode/kbarcode-14.0.0.spec14
-rw-r--r--redhat/applications/kbfx/kbfx-14.0.0.spec11
-rw-r--r--redhat/applications/kbibtex/kbibtex-14.0.0.spec27
-rw-r--r--redhat/applications/kbiff/kbiff-14.0.0.spec27
-rw-r--r--redhat/applications/kbookreader/kbookreader-14.0.0.spec15
-rw-r--r--redhat/applications/kchmviewer/kchmviewer-14.0.0.spec18
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-14.0.0.spec8
-rw-r--r--redhat/applications/kcmldap/kcmldap-14.0.0.spec14
-rw-r--r--redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec14
-rw-r--r--redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec14
-rw-r--r--redhat/applications/kcpuload/kcpuload-14.0.0.spec12
-rw-r--r--redhat/applications/kdbg/kdbg-14.0.0.spec12
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec9
-rw-r--r--redhat/applications/kdiff3/kdiff3-14.0.0.spec20
-rw-r--r--redhat/applications/kdirstat/kdirstat-14.0.0.spec12
-rw-r--r--redhat/applications/keep/keep-14.0.0.spec12
-rw-r--r--redhat/applications/kerberostray/kerberostray-14.0.0.spec14
-rw-r--r--redhat/applications/kerry/kerry-14.0.0.spec15
-rw-r--r--redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec55
-rw-r--r--redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec12
-rw-r--r--redhat/applications/kile/kile-14.0.0.spec19
-rw-r--r--redhat/applications/kima/kima-14.0.0.spec12
-rw-r--r--redhat/applications/kiosktool/kiosktool-14.0.0.spec25
-rw-r--r--redhat/applications/kmplayer/kmplayer-14.0.0.spec41
-rw-r--r--redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec11
-rw-r--r--redhat/applications/kmymoney/kmymoney-14.0.0.spec28
-rw-r--r--redhat/applications/knemo/knemo-14.0.0.spec12
-rw-r--r--redhat/applications/knetload/knetload-14.0.0.spec12
-rw-r--r--redhat/applications/knetstats/knetstats-14.0.0.spec12
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec10
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec53
-rw-r--r--redhat/applications/knights/knights-14.0.0.spec13
-rw-r--r--redhat/applications/knmap/knmap-14.0.0.spec9
-rw-r--r--redhat/applications/knowit/knowit-14.0.0.spec13
-rw-r--r--redhat/applications/knutclient/knutclient-14.0.0.spec11
-rw-r--r--redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec9
-rw-r--r--redhat/applications/koffice/koffice-14.0.0.spec25
-rw-r--r--redhat/applications/konversation/konversation-14.0.0.spec14
-rw-r--r--redhat/applications/kopete-otr/kopete-otr-14.0.0.spec16
-rw-r--r--redhat/applications/kpicosim/kpicosim-14.0.0.spec16
-rw-r--r--redhat/applications/kpilot/kpilot-14.0.0.spec22
-rw-r--r--redhat/applications/kpowersave/kpowersave-14.0.0.spec4
-rw-r--r--redhat/applications/krecipes/krecipes-14.0.0.spec5
-rw-r--r--redhat/applications/krename/krename-14.0.0.spec12
-rw-r--r--redhat/applications/krusader/krusader-14.0.0.spec15
-rw-r--r--redhat/applications/ksensors/ksensors-14.0.0.spec9
-rw-r--r--redhat/applications/kshowmail/kshowmail-14.0.0.spec30
-rw-r--r--redhat/applications/kshutdown/kshutdown-14.0.0.spec10
-rw-r--r--redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec12
-rw-r--r--redhat/applications/ksquirrel/ksquirrel-14.0.0.spec14
-rw-r--r--redhat/applications/kstreamripper/kstreamripper-14.0.0.spec3
-rw-r--r--redhat/applications/ksystemlog/ksystemlog-14.0.0.spec1
-rw-r--r--redhat/applications/ktechlab/ktechlab-14.0.0.spec13
-rw-r--r--redhat/applications/ktorrent/ktorrent-14.0.0.spec12
-rw-r--r--redhat/applications/kuickshow/kuickshow-14.0.0.spec26
-rw-r--r--redhat/applications/kvirc/kvirc-14.0.0-install_directory.patch11
-rw-r--r--redhat/applications/kvirc/kvirc-14.0.0.spec33
-rw-r--r--redhat/applications/kvkbd/kvkbd-14.0.0.spec11
-rw-r--r--redhat/applications/kvpnc/kvpnc-14.0.0.spec13
-rw-r--r--redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec34
-rw-r--r--redhat/applications/piklab/piklab-14.0.0.spec14
-rw-r--r--redhat/applications/potracegui/potracegui-14.0.0.spec11
-rw-r--r--redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec3
-rw-r--r--redhat/applications/rosegarden/rosegarden-14.0.0.spec31
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-14.0.0.spec4
-rw-r--r--redhat/applications/smb4k/smb4k-14.0.0.spec13
-rw-r--r--redhat/applications/soundkonverter/soundkonverter-14.0.0.spec14
-rw-r--r--redhat/applications/tde-guidance/tde-guidance-14.0.0.spec2
-rw-r--r--redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec12
-rw-r--r--redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec12
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec11
-rw-r--r--redhat/applications/tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch33
-rw-r--r--redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec14
-rw-r--r--redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec30
-rw-r--r--redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec11
-rw-r--r--redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec6
-rw-r--r--redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec15
-rw-r--r--redhat/applications/tdepowersave/tdepowersave-14.0.0.spec13
-rw-r--r--redhat/applications/tderadio/tderadio-14.0.0.spec14
-rw-r--r--redhat/applications/tdesudo/tdesudo-14.0.0.spec11
-rw-r--r--redhat/applications/tdesvn/tdesvn-14.0.0.spec36
-rw-r--r--redhat/applications/tdmtheme/tdmtheme-14.0.0.spec12
-rw-r--r--redhat/applications/tellico/tellico-14.0.0.spec40
-rw-r--r--redhat/applications/tork/tork-14.0.0.spec8
-rw-r--r--redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec12
-rw-r--r--redhat/applications/wlassistant/wlassistant-14.0.0.spec11
-rw-r--r--redhat/applications/yakuake/yakuake-14.0.0.spec12
108 files changed, 1535 insertions, 530 deletions
diff --git a/redhat/applications/abakus/abakus-14.0.0.spec b/redhat/applications/abakus/abakus-14.0.0.spec
index f68a0774d..e47d81719 100644
--- a/redhat/applications/abakus/abakus-14.0.0.spec
+++ b/redhat/applications/abakus/abakus-14.0.0.spec
@@ -40,9 +40,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: cmake >= 2.8
BuildRequires: bison
@@ -80,6 +82,14 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-DBUILD_ALL=ON \
@@ -120,7 +130,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.91-6
- Initial release for TDE 14.0.0
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
+* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.91-5
- Initial release for TDE 3.5.13.2
* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.91-4
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index d12f8bcef..08137e7f2 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -26,22 +26,25 @@
Name: trinity-%{tde_pkg}
Summary: Media player
Version: 1.4.10
-Release: %{?!preversion:10}%{?preversion:9_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist}%{?_variant}
Group: Applications/Multimedia
License: GPLv2+
-Url: http://amarok.kde.org
+Url: http://amarok.kde.org
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch3: amarok-3.5.13.1-fix_rhel4_libs.patch
+Patch3: amarok-3.5.13.1-fix_rhel4_libs.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
BuildRequires: trinity-konqueror-devel >= %{tde_version}
BuildRequires: alsa-lib-devel
@@ -51,10 +54,12 @@ BuildRequires: gettext
BuildRequires: pcre-devel
BuildRequires: taglib-devel
+# LIBTOOL
BuildRequires: libtool
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libtool-ltdl-devel
%endif
+
BuildRequires: libusb-devel
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
@@ -76,7 +81,7 @@ BuildRequires: dbus-devel
%if 0%{?rhel} == 4
BuildRequires: dbus-qt
%else
-BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
+BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
%endif
# IFP support
@@ -184,7 +189,7 @@ Amarok is a multimedia player with:
- compatible with the .m3u and .pls formats for playlists
- nice GUI, integrates into the TDE look, but with a unique touch
-%files -f amarok.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog README
%{tde_bindir}/amarok
@@ -193,7 +198,7 @@ Amarok is a multimedia player with:
%{tde_bindir}/amarok_proxy.rb
%{tde_datadir}/apps/amarok/
%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/applications/tde/*.desktop
+%{tde_tdeappdir}/*.desktop
%{tde_datadir}/servicetypes/*.desktop
%{tde_datadir}/apps/profiles/amarok.profile.xml
%{tde_datadir}/config/amarokrc
@@ -366,31 +371,40 @@ fi
cd build
%endif
+# Warning: GCC visibility causes FTBFS [Bug #1285]
%cmake \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
- -DQT_LIBRARY_DIRS="${QTLIB:-${QTDIR}/%{_lib}}" \
- %{?with_libvisual:-DWITH_LIBVISUAL=ON} \
- -DWITH_KONQSIDEBAR=ON \
- %{?with_xine:-DWITH_XINE=ON} \
- %{?with_yauap:-DWITH_YAUAP=ON} \
- %{?with_akode:-DWITH_AKODE=ON} \
- %{?with_gpod:-DWITH_IPOD=ON} \
- %{?with_ifp:-DWITH_IFP=ON} \
- %{?with_njb:-DWITH_NJB=ON} \
- %{?with_mtp:-DWITH_MTP=ON} \
- %{?with_karma:-DWITH_RIOKARMA=ON} \
- -DWITH_DAAP=ON \
- %{?with_mp4v2:-DWITH_MP4V2=ON} \
- %{?with_inotify:-DWITH_INOTIFY=ON} \
- -DBUILD_ALL=ON \
- ..
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ \
+ %{?with_libvisual:-DWITH_LIBVISUAL=ON} \
+ -DWITH_KONQSIDEBAR=ON \
+ %{?with_xine:-DWITH_XINE=ON} \
+ %{?with_yauap:-DWITH_YAUAP=ON} \
+ %{?with_akode:-DWITH_AKODE=ON} \
+ %{?with_gpod:-DWITH_IPOD=ON} \
+ %{?with_ifp:-DWITH_IFP=ON} \
+ %{?with_njb:-DWITH_NJB=ON} \
+ %{?with_mtp:-DWITH_MTP=ON} \
+ %{?with_karma:-DWITH_RIOKARMA=ON} \
+ -DWITH_DAAP=ON \
+ %{?with_mp4v2:-DWITH_MP4V2=ON} \
+ %{?with_inotify:-DWITH_INOTIFY=ON} \
+ -DBUILD_ALL=ON \
+ ..
%__make %{?_smp_mflags} || %__make
+
%install
%__rm -fr $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT -C build
@@ -402,7 +416,7 @@ cd build
%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so
# Locales
-%find_lang amarok
+%find_lang %{tde_pkg}
# HTML
for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
@@ -420,9 +434,12 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-10
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-11
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-10
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-9
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec
index 7cbf6d766..f02f543d0 100644
--- a/redhat/applications/basket/basket-14.0.0.spec
+++ b/redhat/applications/basket/basket-14.0.0.spec
@@ -26,7 +26,7 @@
Name: trinity-%{tde_pkg}
Summary: Taking care of your ideas.
Version: 1.0.3.1
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -41,9 +41,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-tdepim-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gpgme-devel
@@ -76,15 +76,22 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning: --enable-final causes FTBFS
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --disable-rpath \
- --disable-static
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --includedir=%{tde_tdeincludedir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility
%__make %{?_smp_mflags}
@@ -106,6 +113,7 @@ for f in crystalsvg ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
/sbin/ldconfig
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%postun
for f in crystalsvg ; do
@@ -113,6 +121,7 @@ for f in crystalsvg ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
/sbin/ldconfig
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%files -f %{tde_pkg}.lang
@@ -151,9 +160,12 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-5
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-6
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-5
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec
index a98671efc..b2db589bb 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -41,10 +41,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
# Requires: clucene
@@ -86,14 +87,20 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
# Not SMP safe !
%__make -C bibletime/frontend
@@ -119,12 +126,12 @@ export PATH="%{tde_bindir}:${PATH}"
%post
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications -q &> /dev/null
%postun
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
+update-desktop-database %{tde_datadir}/applications -q &> /dev/null
%files
diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec
index 64b6a91c1..8cb319922 100644
--- a/redhat/applications/digikam/digikam-14.0.0.spec
+++ b/redhat/applications/digikam/digikam-14.0.0.spec
@@ -26,7 +26,7 @@
Name: trinity-%{tde_pkg}
Summary: digital photo management application for TDE [Trinity]
Version: 0.9.6
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -44,20 +44,24 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: digikam-3.5.13.2-fix_png12_support.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-libkexiv2-devel >= %{tde_version}
-BuildRequires: trinity-libkdcraw-devel >= %{tde_version}
-BuildRequires: trinity-libkipi-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
+BuildRequires: trinity-libkexiv2-devel
+BuildRequires: trinity-libkdcraw-devel
+BuildRequires: trinity-libkipi-devel
+
+BuildRequires: libtiff-devel
+BuildRequires: gettext
+
+# GPHOTO2 support
%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: gphoto2-devel
%else
BuildRequires: libgphoto2-devel
%endif
-BuildRequires: libtiff-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
# JASPER support
%if 0%{?suse_version}
@@ -77,9 +81,9 @@ BuildRequires: libexiv2-devel
BuildRequires: exiv2-devel
%endif
-Requires: trinity-libkexiv2 >= 3.5.13.1
-Requires: trinity-libkdcraw >= 3.5.13.1
-Requires: trinity-libkipi >= 3.5.13.1
+Requires: trinity-libkexiv2
+Requires: trinity-libkdcraw
+Requires: trinity-libkipi
%description
An easy to use and powerful digital photo management
@@ -105,7 +109,7 @@ digiKam is based in part on the work of the Independent JPEG Group.
%package devel
Group: Development/Libraries
Summary: Development files for %{name}
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
%description devel
%{summary}
@@ -131,7 +135,6 @@ Requires: %{name} = %{version}
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_tdeincludedir}"
-export TDEDIR="%{tde_prefix}"
%configure \
--prefix=%{tde_prefix} \
@@ -141,9 +144,14 @@ export TDEDIR="%{tde_prefix}"
--datadir=%{tde_datadir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=%{tde_tdeincludedir}/tqt \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags} || %__make
@@ -307,9 +315,12 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-6
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-7
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-6
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-5
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/dolphin/dolphin-14.0.0.spec b/redhat/applications/dolphin/dolphin-14.0.0.spec
index 69f4c4f1b..d151fb8b2 100644
--- a/redhat/applications/dolphin/dolphin-14.0.0.spec
+++ b/redhat/applications/dolphin/dolphin-14.0.0.spec
@@ -41,9 +41,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -79,7 +81,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--docdir=%{tde_tdedocdir} \
--libdir=%{tde_libdir} \
- --disable-rpath
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
@@ -104,6 +113,7 @@ export PATH="%{tde_bindir}:${PATH}"
%post
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-alternatives --install \
@@ -120,6 +130,7 @@ if [ $1 -eq 0 ]; then
fi
%postun
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight-14.0.0.spec
index 93702f8c0..555e31848 100644
--- a/redhat/applications/filelight/filelight-14.0.0.spec
+++ b/redhat/applications/filelight/filelight-14.0.0.spec
@@ -26,7 +26,7 @@
Name: trinity-%{tde_pkg}
Summary: Graphical disk usage display
Version: 1.0
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -41,10 +41,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
Obsoletes: filelight-l10n < %{version}-%{release}
Provides: filelight-l10n = %{version}-%{release}
@@ -79,8 +81,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--docdir=%{tde_tdedocdir} \
--libdir=%{tde_libdir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
@@ -90,7 +98,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-%find_lang %{tde_pkg} --with-kde
+%find_lang %{tde_pkg}
%clean
%__rm -rf %{buildroot}
@@ -131,9 +139,12 @@ done
%lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-7
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-8
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-7
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-6
- Initial release for TDE 3.5.13.2
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 915b415a2..2aa301eba 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
@@ -47,9 +47,11 @@ Source3: gtkrc-2.0-kde-kde4
Patch1: gtk-qt-engine-14.0.0-fix_gtk3_segv.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -72,13 +74,6 @@ a way to configure it from within KControl.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .segv
-# Renames the '.po' files
-for f in po/*/*.po; do
- pushd ${f%/*}
- mv -f *.po gtk-qt-engine.po
- popd
-done
-
%build
unset QTDIR QTINC QTLIB
@@ -90,13 +85,15 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
cd build
%endif
+# Warning: GCC visibility causes the KCM not to work at all !
%cmake \
- -DCMAKE_BUILD_TYPE="" \
- -DCMAKE_C_FLAGS="-DNDEBUG" \
- -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
- -DWITH_GCC_VISIBILITY=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DDATA_INSTALL_DIR=%{tde_datadir} \
@@ -112,7 +109,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
-%find_lang %{tde_pkg}
+%find_lang gtkqtengine
# Adds TDE's specific GTKRC
%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
@@ -124,7 +121,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%files -f %{tde_pkg}.lang
+%files -f gtkqtengine.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{tde_tdelibdir}/kcm_kcmgtk.la
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
index 098178129..f4b2b8073 100644
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
+++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
@@ -40,15 +40,15 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: gtk3-tqt-engine-14.0.0-ftbfs.patch
Patch1: gtk3-tqt-engine-14.0.0-libsuffix.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
+BuildRequires: gettext
BuildRequires: gtk+3.0-devel
%description
@@ -62,7 +62,6 @@ GTK3 style engine which uses the active TDE style to draw its widgets
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
%if "%_lib" == "lib64"
%patch1 -p1 -b .libsuffix
%endif
@@ -85,7 +84,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--docdir=%{tde_tdedocdir} \
--libdir=%{tde_libdir} \
- --disable-rpath
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec
index 67ce0d3f5..1dd046131 100644
--- a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec
+++ b/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec
@@ -45,10 +45,11 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
# EXIV2 support
@@ -98,7 +99,6 @@ KIPI image framework.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export TDEDIR="%{tde_prefix}"
./configure \
--prefix=%{tde_prefix} \
@@ -109,8 +109,14 @@ export TDEDIR="%{tde_prefix}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/gwenview/gwenview-14.0.0.spec b/redhat/applications/gwenview/gwenview-14.0.0.spec
index 1038a3c65..a7d5e2658 100644
--- a/redhat/applications/gwenview/gwenview-14.0.0.spec
+++ b/redhat/applications/gwenview/gwenview-14.0.0.spec
@@ -41,12 +41,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
# EXIV2 support
@@ -106,8 +106,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
index 0cd051c82..fb9c7804f 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
+++ b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
@@ -48,8 +48,12 @@ License: GPLv2+
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
Requires(post): coreutils
@@ -343,8 +347,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index d9695f1e7..022ea0b15 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -1,5 +1,5 @@
# Default version for this component
-%define tde_pkg abakus
+%define tde_pkg k3b
%define tde_version 14.0.0
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -24,9 +24,10 @@
%define _docdir %{tde_docdir}
-Name: trinity-k3b
+Name: trinity-%{tde_pkg}
Summary: CD/DVD burning application
-Version: 14.0.0
+Epoch: 1
+Version: 1.0.5
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Vendor: Trinity Project
@@ -44,12 +45,14 @@ Source2: k3brc
# Legacy RedHat / Fedora patches
# manual bufsize (upstream?)
-Patch4: k3b-1.0.4-manualbufsize.patch
+Patch4: k3b-1.0.4-manualbufsize.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
BuildRequires: gettext
@@ -62,8 +65,8 @@ BuildRequires: zlib-devel
Requires(post): coreutils
Requires(postun): coreutils
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: cdrecord mkisofs
Requires: dvd+rw-tools
@@ -78,10 +81,10 @@ Requires: cdrdao
%if 0%{?rhel} == 4
# Dbus bindings were rebuilt with Qt support
BuildRequires: dbus-devel >= 0.22-12.EL.9p1
-Requires: dbus-qt
+Requires: dbus-qt >= 0.22-12.EL.9p1
%else
-BuildRequires: trinity-dbus-tqt-devel
-Requires: trinity-dbus-tqt >= %{version}
+BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
+Requires: trinity-dbus-tqt >= 1:0.63
%endif
# SNDFILE support
@@ -210,7 +213,7 @@ start.
%package common
Summary: Common files of %{name}
Group: Applications/Archiving
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
BuildArch: noarch
%endif
@@ -260,7 +263,7 @@ update-desktop-database %{tde_appdir} -q &> /dev/null
%package libs
Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description libs
%{summary}.
@@ -283,7 +286,7 @@ Requires: %{name} = %{version}-%{release}
%package devel
Summary: Files for the development of applications which will use %{name}
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel
%{summary}.
@@ -306,7 +309,7 @@ Requires: %{name}-libs = %{version}-%{release}
%package plugin-mad
Summary: The MAD plugin for K3B
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description plugin-mad
%{summary}.
@@ -328,7 +331,7 @@ and Layer III a.k.a. MP3) are fully implemented.
%package plugin-lame
Summary: The LAME plugin for K3B
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description plugin-lame
%{summary}.
@@ -350,7 +353,7 @@ This package is in tainted, as MP3 encoding is covered by software patents.
%package plugin-ffmpeg
Summary: The FFMPEG plugin for K3B
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description plugin-ffmpeg
%{summary}.
@@ -395,6 +398,7 @@ if [ -d /usr/include/ffmpeg ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
fi
+# Notice: extra-includes is required to find arts headers
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -403,10 +407,17 @@ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
--enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependency-tracking --enable-final \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility \
+ \
+ --with-extra-includes=%{tde_includedir} \
+ \
--with-k3bsetup=no \
--without-cdrecord-suid-root \
--with-oggvorbis \
@@ -420,8 +431,7 @@ fi
%{?with_libmad:--with-libmad} %{?!with_libmad:--without-libmad} \
--with-musepack \
--without-resmgr \
- --without-hal \
- --with-extra-includes=%{tde_includedir}
+ --without-hal
# Strange behaviour on RHEL4 ...
%if 0%{?rhel} == 4
@@ -448,7 +458,7 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
- Initial release for TDE 14.0.0
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
diff --git a/redhat/applications/k9copy/k9copy-14.0.0-fix_author.patch b/redhat/applications/k9copy/k9copy-14.0.0-fix_author.patch
new file mode 100644
index 000000000..057fad5b9
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-14.0.0-fix_author.patch
@@ -0,0 +1,25 @@
+--- trinity-k9copy/k9author/k9avidecode.cpp.k9author 2013-07-21 09:56:44.000000000 +0200
++++ trinity-k9copy/k9author/k9avidecode.cpp 2013-08-02 12:16:55.398266088 +0200
+@@ -119,6 +119,13 @@
+ m_opened=false;
+
+ glibref++;
++
++ m_FormatCtx = NULL;
++ m_CodecCtx = NULL;
++ m_Codec = NULL;
++ m_Frame = NULL;
++ m_FrameRGB = NULL;
++ m_buffer = NULL;
+ }
+
+
+@@ -148,7 +155,7 @@
+ // Open video file
+ if (
+ # if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
+- avformat_open_input(&m_FormatCtx, _fileName.utf8(), 0, 0)!=0
++ avformat_open_input(&m_FormatCtx, _fileName.utf8(), NULL, NULL)!=0
+ # else
+ av_open_input_file(&m_FormatCtx, _fileName.utf8(), NULL, 0, NULL)!=0
+ # endif
diff --git a/redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch b/redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch
new file mode 100644
index 000000000..1ea7705ea
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch
@@ -0,0 +1,11 @@
+--- trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am.ftbfs 2013-07-21 09:56:44.000000000 +0200
++++ trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am 2013-08-02 11:00:55.291717387 +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_TDEUI) -ltdemdi $(LIBDL)
++ $(top_builddir)/dvdread/libdvdread.la $(LIB_TDEUI) -ltdemdi $(LIBDL) -lk3b -lk3bdevice
+
+ # this is where the desktop file will go
+ shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/redhat/applications/k9copy/k9copy-14.0.0-use_external_dvdread.patch b/redhat/applications/k9copy/k9copy-14.0.0-use_external_dvdread.patch
new file mode 100644
index 000000000..ac0716353
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-14.0.0-use_external_dvdread.patch
@@ -0,0 +1,102 @@
+--- ./k9author/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./k9author/Makefile.am 2013-07-28 20:05:20.857621477 +0200
+@@ -14,5 +14,5 @@
+ k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \
+ k9menueditor.h k9newdvd.h k9newtitle.h k9title.h
+ libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_TDEUI)
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9devices \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9devices \
+ -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes)
+--- ./k9decmpeg/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./k9decmpeg/Makefile.am 2013-07-28 20:05:20.857621477 +0200
+@@ -12,7 +12,7 @@
+ motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \
+ mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \
+ uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
+ -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy
+
+ noinst_HEADERS = k9decodethread.h k9plaympeg2.h
+--- ./k9devices/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./k9devices/Makefile.am 2013-07-28 20:05:20.857621477 +0200
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
+ $(HAL_INCS) $(K3B_INCS) -I$(includedir) $(all_includes)
+ METASOURCES = AUTO
+ libk9devices_la_LDFLAGS = $(all_libraries)
+--- ./k9Mplayer/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./k9Mplayer/Makefile.am 2013-07-28 20:05:20.857621477 +0200
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
+ METASOURCES = AUTO
+
+ noinst_LTLIBRARIES = libk9mplayer.la
+--- ./k9vamps/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./k9vamps/Makefile.am 2013-07-28 20:05:20.858621351 +0200
+@@ -7,6 +7,6 @@
+ noinst_LTLIBRARIES = libk9vamps.la
+ libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \
+ k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
+ -I$(top_srcdir)/libk9copy
+ noinst_HEADERS = k9requant.h ac.h k9fifo.h
+--- ./libdvdnav/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./libdvdnav/Makefile.am 2013-07-28 20:05:20.858621351 +0200
+@@ -11,4 +11,4 @@
+
+
+
+-INCLUDES = -I$(top_srcdir)/dvdread
++INCLUDES = -I/usr/include/dvdread
+--- ./libk9copy/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./libk9copy/Makefile.am 2013-07-28 20:05:20.858621351 +0200
+@@ -24,6 +24,6 @@
+ k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h
+
+
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9decmpeg \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \
+ -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav
+ libk9copy_la_LDFLAGS = $(all_libraries)
+--- ./Makefile.am.ORI 2013-07-28 20:15:29.961786846 +0200
++++ ./Makefile.am 2013-07-28 20:15:43.375094511 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = doc dvdread libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \
++SUBDIRS = doc libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \
+ po src
+
+ $(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
+@@ -29,11 +29,3 @@
+
+ AM_CXXFLAGS = -O0 -g3
+
+-
+-
+-
+-
+-
+-
+-
+-INCLUDES = -I$(top_srcdir)/dvdread
+--- trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am.dvdread 2013-08-02 11:01:48.000000000 +0200
++++ trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am 2013-08-02 11:03:44.081175118 +0200
+@@ -1,5 +1,5 @@
+ # set the include path for X, qt and KDE
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9Mplayer \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9Mplayer \
+ -I$(top_srcdir)/k9author -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9devices \
+ -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy -I$(includedir) $(all_includes)
+
+@@ -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_TDEUI) -ltdemdi $(LIBDL) -lk3b -lk3bdevice
++ -ldvdread $(LIB_TDEUI) -ltdemdi $(LIBDL) -lk3b -lk3bdevice
+
+ # this is where the desktop file will go
+ shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec
index 073c43dc2..44bbb284e 100644
--- a/redhat/applications/k9copy/k9copy-14.0.0.spec
+++ b/redhat/applications/k9copy/k9copy-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: DVD backup tool for Trinity
Version: 1.2.3
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -41,14 +41,19 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch1: k9copy-3.5.13.2-fix_k3b_link.patch
+Patch1: k9copy-14.0.0-fix_k3b_link.patch
+Patch2: k9copy-3.5.13.2-ftbfs.patch
+Patch3: k9copy-14.0.0-use_external_dvdread.patch
+Patch4: k9copy-14.0.0-fix_author.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+BuildRequires: trinity-k3b-devel
+
# Warning: the target distribution must have ffmpeg !
BuildRequires: ffmpeg-devel
Requires: ffmpeg
@@ -66,7 +71,13 @@ This is the Trinity version
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-#patch1 -p1 -b .ftbfs
+%patch1 -p1 -b .ftbfs
+%patch2 -p1 -b .ftbfs
+%patch3 -p1 -b .dvdread
+%patch4 -p1 -b .k9author
+
+# Removes internal dvdread headers
+%__rm -rf dvdread
%__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"
@@ -82,16 +93,24 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
if [ -d /usr/include/ffmpeg ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
fi
-
+
+# NOTICE: --enable-final causes FTBFS !
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --disable-final \
+ --enable-new-ldflags \
--enable-closure \
- --disable-k3bdevices
+ --enable-rpath \
+ --enable-gcc-hidden-visibility \
+ \
+ --enable-k3bdevices
%__make %{?_smp_mflags} || %__make
@@ -131,9 +150,12 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-5
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-6
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-5
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
index 9569d7eb0..738e85889 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
@@ -45,10 +45,12 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
%if 0%{?suse_version}
BuildRequires: mozilla-nspr-devel
%else
@@ -58,7 +60,7 @@ BuildRequires: nspr-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xaw-devel
%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libXaw-devel
%endif
@@ -75,7 +77,6 @@ when a page containing a supported media format is loaded.
%prep
-unset QTDIR QTINC QTLIB
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .nspr
@@ -85,16 +86,24 @@ unset QTDIR QTINC QTLIB
%build
+unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --disable-rpath \
- --enable-closure \
- --prefix=%{_libdir}/mozilla
+ --prefix=%{_libdir}/mozilla \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
+
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
@@ -103,6 +112,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Remove useless filess
%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
+
%clean
%__rm -rf %{buildroot}
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index 37b4ce428..813e15203 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -36,75 +36,92 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
BuildRequires: gettext
+
+# VORBIS support
BuildRequires: libvorbis-devel
-BuildRequires: libcdio-devel
+# CDDA support
+BuildRequires: libcdio-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libcdda-devel
-BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
-BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
-BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel
-# dvb
-%if 0%{?pclinuxos} == 0
-BuildRequires: kernel-headers
%endif
-BuildRequires: libgstreamer-devel >= 0.10
-BuildRequires: libgstreamer-plugins-base-devel >= 0.10
-%else
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: cdparanoia
BuildRequires: cdparanoia-devel
+%endif
%if 0%{?suse_version} >= 1220
BuildRequires: libcdio-paranoia-devel
%endif
# X11 stuff
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
+BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
+BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel
+%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
-%else
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libXext-devel
BuildRequires: libXtst-devel
BuildRequires: libXinerama-devel
%endif
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+BuildRequires: libxcb-devel
%endif
-# dvb
-BuildRequires: gstreamer-devel
+# GSTREAMER support
+%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gstreamer 1
%if 0%{?suse_version}
+BuildRequires: gstreamer-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-devel
%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: gstreamer-plugins-base-devel >= 0.10
-BuildRequires: glibc-kernheaders
%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: libgstreamer-devel >= 0.10
+BuildRequires: libgstreamer-plugins-base-devel >= 0.10
%endif
-
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: libxcb-devel
%endif
-# xine-lib
+# XINE support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires: libxine-devel
+BuildRequires: libxine-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: xine-lib-devel
+BuildRequires: xine-lib-devel
%endif
-# LAME
+# LAME support
%if 0%{?suse_version}
BuildRequires: libmp3lame-devel
%else
BuildRequires: lame-devel
%endif
-Requires: %{name}-libs = %{version}-%{release}
+# WTF support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: kernel-headers
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires: glibc-kernheaders
+%endif
+
+Requires: %{name}-libs = %{version}-%{release}
%description
Kaffeine is a xine-based media player for TDE. It plays back CDs,
@@ -121,7 +138,9 @@ Konqueror plugin, OSD and much more.
%{tde_libdir}/libkaffeinepart.so
%{tde_tdelibdir}/lib*.*
%{tde_datadir}/appl*/*/*.desktop
+%if 0%{?with_gstreamer}
%{tde_datadir}/apps/gstreamerpart/
+%endif
%{tde_datadir}/apps/kaffeine/
%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
%{tde_datadir}/apps/profiles/
@@ -206,7 +225,6 @@ Requires: %{name} = %{version}-%{release}
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export TDEDIR=%{tde_prefix}
%configure \
--prefix=%{tde_prefix} \
@@ -216,15 +234,18 @@ export TDEDIR=%{tde_prefix}
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--mandir=%{tde_mandir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
--enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependency-tracking --enable-final \
- --disable-rpath \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility \
+ \
--with-xinerama \
--with-gstreamer \
--with-lame \
- --with-extra-libs=%{_prefix}/%{_lib} \
- --enable-closure \
%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
--without-dvb \
%endif
@@ -250,7 +271,6 @@ rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
rm -rf $RPM_BUILD_ROOT
-
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-6
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.spec b/redhat/applications/kasablanca/kasablanca-14.0.0.spec
index 3b1dbc138..8215fdfbe 100644
--- a/redhat/applications/kasablanca/kasablanca-14.0.0.spec
+++ b/redhat/applications/kasablanca/kasablanca-14.0.0.spec
@@ -35,11 +35,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: openssl-devel
@@ -94,11 +94,14 @@ fi
--libdir=%{tde_libdir} \
--includedir=%{tde_tdeincludedir} \
--datadir=%{tde_datadir} \
- --disable-static \
- --disable-rpath \
- --disable-debug --disable-warnings \
- --disable-dependency-tracking --enable-final \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/katapult/katapult-14.0.0.spec b/redhat/applications/katapult/katapult-14.0.0.spec
index 963391643..14d966e55 100644
--- a/redhat/applications/katapult/katapult-14.0.0.spec
+++ b/redhat/applications/katapult/katapult-14.0.0.spec
@@ -41,12 +41,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
%description
Katapult is an application for TDE, designed to allow faster access to
applications, bookmarks, and other items. It is plugin-based, so it can
@@ -80,8 +81,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kbarcode/kbarcode-14.0.0.spec b/redhat/applications/kbarcode/kbarcode-14.0.0.spec
index 6c53f5941..df1d46ae7 100644
--- a/redhat/applications/kbarcode/kbarcode-14.0.0.spec
+++ b/redhat/applications/kbarcode/kbarcode-14.0.0.spec
@@ -43,9 +43,11 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -94,8 +96,16 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=:%{_includedir}/pcre
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility \
+ \
+ --with-extra-includes=%{_includedir}/pcre
# SMP safe !
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kbfx/kbfx-14.0.0.spec b/redhat/applications/kbfx/kbfx-14.0.0.spec
index 0bb9b90e3..c0a68598e 100644
--- a/redhat/applications/kbfx/kbfx-14.0.0.spec
+++ b/redhat/applications/kbfx/kbfx-14.0.0.spec
@@ -43,10 +43,12 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
%description
KBFX is an alternative to the classical K-Menu button and its menu.
It improves the user experience by enabling him to set a bigger (and thus more
@@ -91,6 +93,14 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DDATA_INSTALL_DIR=%{tde_datadir}/apps \
@@ -98,6 +108,7 @@ cd build
-DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \
-DDOC_INSTALL_DIR=%{tde_tdedocdir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
+ \
-DUSE_STRIGI=OFF \
-DUSE_MENUDRAKE=OFF \
-DBUILD_DOC=ON \
diff --git a/redhat/applications/kbibtex/kbibtex-14.0.0.spec b/redhat/applications/kbibtex/kbibtex-14.0.0.spec
index 99f215249..22c0b0a98 100644
--- a/redhat/applications/kbibtex/kbibtex-14.0.0.spec
+++ b/redhat/applications/kbibtex/kbibtex-14.0.0.spec
@@ -35,9 +35,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
%description
@@ -61,16 +63,23 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning: --enable-final causes FTBFS
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --disable-dependency-tracking \
- --disable-rpath \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir}
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --mandir=%{tde_mandir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec
index ef6faf02c..d5d4a59ea 100644
--- a/redhat/applications/kbiff/kbiff-14.0.0.spec
+++ b/redhat/applications/kbiff/kbiff-14.0.0.spec
@@ -36,9 +36,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
%description
@@ -66,16 +68,21 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --disable-dependency-tracking \
- --disable-rpath \
- --disable-static \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir}
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --mandir=%{tde_mandir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kbookreader/kbookreader-14.0.0.spec b/redhat/applications/kbookreader/kbookreader-14.0.0.spec
index 8ae507282..4bf3a7adc 100644
--- a/redhat/applications/kbookreader/kbookreader-14.0.0.spec
+++ b/redhat/applications/kbookreader/kbookreader-14.0.0.spec
@@ -43,7 +43,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -79,8 +79,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
@@ -103,6 +109,7 @@ gtk-update-icon-cache --quiet %{tde_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
@@ -115,8 +122,6 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/icons/hicolor/*/apps/bookreader.png
-
-
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.0-5
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
index 8f1dc25ec..db1c5cb93 100644
--- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
+++ b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
@@ -42,10 +42,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
%description
KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
@@ -90,6 +92,7 @@ if [ -d /usr/X11R6 ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
+# Warning: --enable-final causes FTBFS !
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -97,12 +100,17 @@ fi
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility \
+ \
--with-x \
- --with-kde \
- --with-extra-includes=%{_includedir}/tqt \
- --enable-closure
-
+ --with-kde
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec
index 8ceeb8b59..38fe4a4b9 100644
--- a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec
+++ b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec
@@ -42,13 +42,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gcc-c++
-Requires: trinity-kdebase
+Requires: trinity-tdebase >= %{tde_version}
%description
%{summary}
@@ -84,7 +85,8 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--enable-new-ldflags \
--enable-final \
--enable-closure \
- --disable-rpath
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kcmldap/kcmldap-14.0.0.spec b/redhat/applications/kcmldap/kcmldap-14.0.0.spec
index 42184a43c..cf100e170 100644
--- a/redhat/applications/kcmldap/kcmldap-14.0.0.spec
+++ b/redhat/applications/kcmldap/kcmldap-14.0.0.spec
@@ -41,12 +41,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: trinity-libtdeldap-devel >= %{tde_version}
+BuildRequires: gettext
+BuildRequires: trinity-libtdeldap-devel >= 0.5
Requires: trinity-tde-ldap-cert-updater = %{version}-%{release}
Requires: trinity-kcontrol-ldap-bonding = %{version}-%{release}
@@ -131,7 +132,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--docdir=%{tde_tdedocdir} \
--libdir=%{tde_libdir} \
- --disable-rpath
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec
index 9aee80f36..784bc7716 100644
--- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec
+++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec
@@ -41,12 +41,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: trinity-libtdeldap-devel >= %{tde_version}
+BuildRequires: gettext
+BuildRequires: trinity-libtdeldap-devel >= 0.5
Requires: trinity-kcontrol-ldap-controller = %{version}-%{release}
@@ -111,7 +112,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--docdir=%{tde_tdedocdir} \
--libdir=%{tde_libdir} \
- --disable-rpath
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec
index dec203b63..1fa480514 100644
--- a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec
+++ b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec
@@ -41,12 +41,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: trinity-libtdeldap-devel >= %{tde_version}
+BuildRequires: gettext
+BuildRequires: trinity-libtdeldap-devel >= 0.5
Requires: trinity-kcontrol-ldap-manager = %{version}-%{release}
@@ -106,7 +107,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--docdir=%{tde_tdedocdir} \
--libdir=%{tde_libdir} \
- --disable-rpath
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kcpuload/kcpuload-14.0.0.spec b/redhat/applications/kcpuload/kcpuload-14.0.0.spec
index be456f2a9..0b4c6fc56 100644
--- a/redhat/applications/kcpuload/kcpuload-14.0.0.spec
+++ b/redhat/applications/kcpuload/kcpuload-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -82,8 +84,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kdbg/kdbg-14.0.0.spec b/redhat/applications/kdbg/kdbg-14.0.0.spec
index 2b0e91ab2..730447535 100644
--- a/redhat/applications/kdbg/kdbg-14.0.0.spec
+++ b/redhat/applications/kdbg/kdbg-14.0.0.spec
@@ -41,9 +41,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -90,6 +92,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -98,7 +101,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--docdir=%{tde_tdedocdir} \
--libdir=%{tde_libdir} \
- --disable-rpath
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
index 7836a2311..1adcecee7 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
@@ -43,10 +43,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
+BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
%if 0%{?suse_version}
@@ -91,9 +93,8 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--enable-new-ldflags \
--enable-final \
--enable-closure \
- --disable-rpath \
- \
- --with-extra-includes=%{tde_includedir}/tqt
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kdiff3/kdiff3-14.0.0.spec b/redhat/applications/kdiff3/kdiff3-14.0.0.spec
index 07b4b2e89..2b16f5a83 100644
--- a/redhat/applications/kdiff3/kdiff3-14.0.0.spec
+++ b/redhat/applications/kdiff3/kdiff3-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories.
Version: 0.9.91
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -42,11 +42,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
%description
Shows the differences line by line and character by character (!).
Provides an automatic merge-facility and
@@ -81,8 +82,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
@@ -134,9 +141,12 @@ done
%{tde_tdelibdir}/libkdiff3plugin.so
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-7
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-8
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-7
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-6
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kdirstat/kdirstat-14.0.0.spec b/redhat/applications/kdirstat/kdirstat-14.0.0.spec
index e8eb2b34f..73f3fd138 100644
--- a/redhat/applications/kdirstat/kdirstat-14.0.0.spec
+++ b/redhat/applications/kdirstat/kdirstat-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -85,8 +87,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
- --with-extra-includes=:%{tde_includedir}
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
# SMP safe !
%__make %{?_smp_mflags}
diff --git a/redhat/applications/keep/keep-14.0.0.spec b/redhat/applications/keep/keep-14.0.0.spec
index f4431ead5..6f566a651 100644
--- a/redhat/applications/keep/keep-14.0.0.spec
+++ b/redhat/applications/keep/keep-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
Requires: rdiff-backup
@@ -82,8 +84,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kerberostray/kerberostray-14.0.0.spec b/redhat/applications/kerberostray/kerberostray-14.0.0.spec
index eb772fad6..7b40180a2 100644
--- a/redhat/applications/kerberostray/kerberostray-14.0.0.spec
+++ b/redhat/applications/kerberostray/kerberostray-14.0.0.spec
@@ -41,12 +41,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: trinity-libtdeldap-devel >= %{tde_version}
+BuildRequires: gettext
+BuildRequires: trinity-libtdeldap-devel >= 0.5
%description
Kerberos ticket manager which sits in the system tray and allows viewing/control of Kerberos tickets
@@ -79,7 +80,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--docdir=%{tde_tdedocdir} \
--libdir=%{tde_libdir} \
- --disable-rpath
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kerry/kerry-14.0.0.spec b/redhat/applications/kerry/kerry-14.0.0.spec
index 0c03e6bcf..b2f6d2a8b 100644
--- a/redhat/applications/kerry/kerry-14.0.0.spec
+++ b/redhat/applications/kerry/kerry-14.0.0.spec
@@ -40,13 +40,15 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1: kerry.1.docbook
+Source1: kerry.1.docbook
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
BuildRequires: libbeagle-devel >= 0.3.0
@@ -64,7 +66,6 @@ A program for indexing and searching user's data. At the moment, it can index
filesystems, chat logs, mail and data, RSS and other.
-
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@@ -91,8 +92,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
- --with-extra-includes=:%{tde_includedir}
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
index 79f15bf05..08c013ef7 100644
--- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
+++ b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
@@ -36,13 +36,37 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
%description
+KFTPgrabber is a graphical FTP client for the Trinity Desktop Environment. It
+implements many features required for usable FTP interaction.
+
+Feature list:
+- Multiple simultaneous FTP sessions in separate tabs
+- A tree-oriented transfer queue
+- TLS/SSL support for the control connection and the data channel
+- X509 certificate support for authentication
+- FXP site-to-site transfer support
+- One-time password (OTP) support using S/KEY, MD5, RMD160 or SHA1
+- Site bookmarks with many options configurable per-site
+- Distributed FTP daemon support (implementing the PRET command)
+- Can use Zeroconf for local site discovery
+- Bookmark import plugins from other FTP clients
+- Support for the SFTP protocol
+- A nice traffic graph
+- Ability to limit upload and download speed
+- Priority and skip lists
+- Integrated SFV checksum verifier
+- Direct viewing/editing of remote files
+- Advanced default "on file exists" action configuration
+- Filter displayed files/directories as you type
+
%package devel
Summary: Development files for %{name}
@@ -70,17 +94,22 @@ unset QTDIR QTINC QTDIR
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning: --enable-final causes FTBFS
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --disable-dependency-tracking \
- --disable-rpath \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --disable-static \
- --enable-closure
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
index 7dcf0b19a..dde115235 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -81,12 +83,20 @@ cd build
%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
+ \
-DBUILD_ALL=ON \
..
diff --git a/redhat/applications/kile/kile-14.0.0.spec b/redhat/applications/kile/kile-14.0.0.spec
index 341ee1f39..9ec02dc13 100644
--- a/redhat/applications/kile/kile-14.0.0.spec
+++ b/redhat/applications/kile/kile-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: TDE Integrated LaTeX Environment [Trinity]
Version: 2.0.2
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Publishing
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
Obsoletes: %{name}-i18n-ar
@@ -134,8 +136,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
@@ -191,9 +199,12 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-6
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-7
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-6
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-5
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kima/kima-14.0.0.spec b/redhat/applications/kima/kima-14.0.0.spec
index 2d198a73f..f0d466011 100644
--- a/redhat/applications/kima/kima-14.0.0.spec
+++ b/redhat/applications/kima/kima-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -80,8 +82,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
- --with-extra-includes=:%{tde_tdeincludedir}
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
# SMP safe !
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kiosktool/kiosktool-14.0.0.spec b/redhat/applications/kiosktool/kiosktool-14.0.0.spec
index b61585fc0..082bac20f 100644
--- a/redhat/applications/kiosktool/kiosktool-14.0.0.spec
+++ b/redhat/applications/kiosktool/kiosktool-14.0.0.spec
@@ -26,7 +26,7 @@
Name: trinity-%{tde_pkg}
Version: 1.0
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
Summary: tool to configure the TDE kiosk framework
License: GPLv2+
@@ -40,8 +40,13 @@ URL: http://www.trinitydesktop.org/
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
+BuildRequires: gettext
%description
@@ -77,14 +82,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
--enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependency-tracking --enable-final \
+ --enable-final \
--enable-closure \
- --with-extra-includes=
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
-
%__make %{?_smp_mflags}
@@ -125,9 +131,12 @@ update-desktop-database >& /dev/null ||:
%{tde_datadir}/apps/kiosktool/kiosktoolui.rc
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-5
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-6
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-5
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
index 8214767ad..f4b1c533b 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec
+++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
@@ -42,12 +42,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+# GSTREAMER support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
BuildRequires: libgstreamer0.10-devel
@@ -55,24 +56,35 @@ BuildRequires: libgstreamer0.10-devel
BuildRequires: %{_lib}gstreamer0.10-devel
%endif
BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel
-BuildRequires: libxv-devel
%endif
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} == 4
+BuildRequires: gstreamer-devel
+BuildRequires: gstreamer-plugins-devel
+%endif
+%if 0%{?rhel} >= 5|| 0%{?fedora}
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-base-devel
-BuildRequires: libXv-devel
%endif
%if 0%{?suse_version}
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
-%if 0%{?suse_version} == 1140
-BuildRequires: xorg-x11-libXv-devel
-%else
+%endif
+
+# X11 stuff
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: libxv-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
BuildRequires: libXv-devel
%endif
+%if 0%{?rhel} == 4
+BuildRequires: xorg-x11-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires: xorg-x11-libXv-devel
%endif
-Requires: %{name}-base
+Requires: %{name}-base = %{version}-%{release}
%description
A basic audio/video viewer application for Trinity.
@@ -101,7 +113,8 @@ Core files needed for KMPlayer.
%package konq-plugins
Group: Applications/Multimedia
-Requires: trinity-kmplayer-base, trinity-kdebase
+Requires: %{name}-base = %{version}-%{release}
+Requires: trinity-tdebase >= %{tde_version}
Summary: KMPlayer plugin for KHTML/Konqueror [Trinity]
%description konq-plugins
@@ -147,8 +160,14 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
index 8c74ac4f9..00e428623 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
@@ -42,6 +42,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -94,8 +95,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index 6b85a3d02..04d8b93a9 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -31,7 +31,7 @@ Name: trinity-%{tde_pkg}
Summary: personal finance manager for TDE
Version: 1.0.5
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -47,7 +47,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: kmymoneytitlelabel.png
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -129,6 +129,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
%endif
+# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -137,15 +138,23 @@ grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
--enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility \
+ \
+ --with-qmake=%{_bindir}/tqmake \
+ --with-qt-dir=%{_libdir}/tqt3 \
+ \
--disable-pdf-docs \
--enable-ofxplugin \
--enable-ofxbanking \
--enable-qtdesigner \
- --disable-sqlite3 \
- --with-qmake=%{_bindir}/tqmake \
- --with-qt-dir=%{_libdir}/tqt3
+ --disable-sqlite3
%__make %{?_smp_mflags}
@@ -189,7 +198,6 @@ done
%{tde_libdir}/*.so.*
%{tde_tdelibdir}/kmm_ofximport.la
%{tde_tdelibdir}/kmm_ofximport.so
-%{_libdir}/tqt3/plugins/designer/libkmymoney.so
%files common -f kmymoney2.lang
%defattr(-,root,root,-)
@@ -220,11 +228,15 @@ done
%{tde_libdir}/libkmm_mymoney.la
%{tde_libdir}/libkmm_plugin.la
%{tde_libdir}/*.so
+%{_libdir}/tqt3/plugins/designer/libkmymoney.so
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-5
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-6
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-5
+- Initial release for TDE 3.5.13.2
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo-14.0.0.spec
index f78e137e3..b706ec858 100644
--- a/redhat/applications/knemo/knemo-14.0.0.spec
+++ b/redhat/applications/knemo/knemo-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
%if 0%{?fedora} >= 18
@@ -91,8 +93,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/knetload/knetload-14.0.0.spec b/redhat/applications/knetload/knetload-14.0.0.spec
index 0274d37a7..cb95c71e4 100644
--- a/redhat/applications/knetload/knetload-14.0.0.spec
+++ b/redhat/applications/knetload/knetload-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -84,8 +86,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
# SMP safe !
%__make %{?_smp_mflags}
diff --git a/redhat/applications/knetstats/knetstats-14.0.0.spec b/redhat/applications/knetstats/knetstats-14.0.0.spec
index 58531f78a..221a8120f 100644
--- a/redhat/applications/knetstats/knetstats-14.0.0.spec
+++ b/redhat/applications/knetstats/knetstats-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -79,8 +81,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
# SMP safe !
%__make %{?_smp_mflags}
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec
index ef8d9e323..aec76bc3f 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec
@@ -173,17 +173,17 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_tdelibdir}/*.so
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - %{?version}-5
+* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-5
- Initial release for TDE 3.5.13.2
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - %{?version}-4
+* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-4
- Initial release for TDE 3.5.13.1
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3
- Rebuild for Fedora 17
-* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
+* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2
- Remove faulty patch for WPA authentication
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
+* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
- Initial release
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
index 2d3a653b3..4c47066f7 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
@@ -49,8 +49,8 @@ Requires: NetworkManager-gnome
Requires: networkmanager
%endif
-BuildRequires: trinity-dbus-1-tqt-devel
-BuildRequires: trinity-dbus-tqt-devel
+BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9
+BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
BuildRequires: NetworkManager-glib-devel
Obsoletes: trinity-knetworkmanager < %{version}-%{release}
@@ -81,35 +81,38 @@ Development headers for knetworkmanager
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-cd knetworkmanager-0.*/src
-%patch0 -p3
+%__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"
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}"
-export LD_LIBRARY_PATH="%{tde_libdir}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+
+# Warning: --enable-final causes FTBFS
+%configure \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --datadir=%{tde_datadir} \
+ --libdir=%{tde_libdir} \
+ --mandir=%{tde_mandir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility \
+ \
+ --with-openvpn \
+ --with-vpnc \
+ --with-pptp
-# Missing TDE macros
-%__mkdir_p cmake
-%__ln_s %{tde_datadir}/cmake cmake/modules
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
- -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
- ..
-
%__make %{?_smp_mflags} || %__make
diff --git a/redhat/applications/knights/knights-14.0.0.spec b/redhat/applications/knights/knights-14.0.0.spec
index c76a25bb9..2987e70f9 100644
--- a/redhat/applications/knights/knights-14.0.0.spec
+++ b/redhat/applications/knights/knights-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
Requires: gnuchess
@@ -82,6 +84,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -90,8 +93,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=:%{tde_includedir}
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/knmap/knmap-14.0.0.spec b/redhat/applications/knmap/knmap-14.0.0.spec
index db1d89114..5004e4a02 100644
--- a/redhat/applications/knmap/knmap-14.0.0.spec
+++ b/redhat/applications/knmap/knmap-14.0.0.spec
@@ -35,11 +35,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
BuildRequires: gettext
Requires: nmap
@@ -90,7 +91,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--enable-new-ldflags \
--enable-final \
--enable-closure \
- --disable-rpath \
+ --enable-rpath \
--enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/knowit/knowit-14.0.0.spec b/redhat/applications/knowit/knowit-14.0.0.spec
index b06e098df..c80b8399c 100644
--- a/redhat/applications/knowit/knowit-14.0.0.spec
+++ b/redhat/applications/knowit/knowit-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -72,6 +74,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -80,8 +83,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
# SMP safe !
%__make %{?_smp_mflags}
diff --git a/redhat/applications/knutclient/knutclient-14.0.0.spec b/redhat/applications/knutclient/knutclient-14.0.0.spec
index 748f57ca5..7361bdc87 100644
--- a/redhat/applications/knutclient/knutclient-14.0.0.spec
+++ b/redhat/applications/knutclient/knutclient-14.0.0.spec
@@ -43,6 +43,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -81,8 +82,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
index bfb9af855..12327fbac 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
+++ b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
@@ -53,11 +53,16 @@ AutoReq: no
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
BuildRequires: findutils
BuildRequires: gettext
BuildRequires: autoconf automake libtool m4
-BuildRequires: trinity-arts-devel >= %{tde_version}
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+
%description
%{summary}.
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 892c935e4..25d371e3a 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -41,7 +41,7 @@
Name: trinity-%{tde_pkg}
Summary: An integrated office suite
Version: 1.6.3
-Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
Group: Applications/Productivity
License: GPLv2+
@@ -57,7 +57,12 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# BuildRequires: world-devel ;)
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
BuildRequires: trinity-tdegraphics-devel >= %{tde_version}
BuildRequires: trinity-tdegraphics-libpoppler-tqt-devel >= %{tde_version}
BuildRequires: automake libtool
@@ -72,7 +77,6 @@ BuildRequires: python-devel
BuildRequires: pcre-devel
BuildRequires: gettext-devel
BuildRequires: mysql-devel
-BuildRequires: desktop-file-utils
BuildRequires: perl
BuildRequires: doxygen
BuildRequires: aspell-devel
@@ -140,6 +144,7 @@ BuildRequires: libutempter-devel
# Requires 'libpqxx', for kexi-driver-pgqsl
%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
%define with_postgresql 1
+BuildRequires: postgresql-devel
BuildRequires: libpqxx-devel
%endif
Obsoletes: trinity-libpqxx
@@ -230,7 +235,6 @@ Summary: Core support files for %{name}
Group: Applications/Productivity
Requires: %{name}-libs = %{version}-%{release}
Requires: perl
-Conflicts: koffice-i18n < %{version}
%description core
%{summary}.
@@ -1079,7 +1083,6 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export TDEDIR="%{tde_prefix}"
%if 0%{?suse_version} == 1220
RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])')
@@ -1094,14 +1097,18 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath --disable-dependency-tracking \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
--enable-new-ldflags \
- --disable-debug --disable-warnings \
- --with-pic --enable-shared --disable-static \
- --with-extra-libs=%{tde_libdir} \
--enable-final \
- --with-extra-includes=:%{tde_includedir}/arts \
--enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility \
+ \
+ --with-extra-libs=%{tde_libdir} \
+ --with-extra-includes=%{tde_includedir}/arts \
+ \
--disable-kexi-macros \
%{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
%{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
diff --git a/redhat/applications/konversation/konversation-14.0.0.spec b/redhat/applications/konversation/konversation-14.0.0.spec
index ede50122a..1281b59a1 100644
--- a/redhat/applications/konversation/konversation-14.0.0.spec
+++ b/redhat/applications/konversation/konversation-14.0.0.spec
@@ -42,10 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
BuildRequires: libxslt-devel
@@ -111,8 +112,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
@@ -124,6 +131,7 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
diff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
index 9e589c4f6..e2f290bf1 100644
--- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
+++ b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
@@ -47,11 +47,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-tdenetwork-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+BuildRequires: trinity-tdenetwork-devel >= %{tde_version}
+
# Kopete is provided by kdenetwork
Requires: trinity-kopete >= %{tde_version}
%if 0%{?suse_version} >= 1230
@@ -92,11 +94,18 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{_smp_mflags}
+
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
@@ -107,6 +116,7 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang kopete_otr
+
%clean
%__rm -rf %{buildroot}
diff --git a/redhat/applications/kpicosim/kpicosim-14.0.0.spec b/redhat/applications/kpicosim/kpicosim-14.0.0.spec
index a2481cb16..4e3b0f149 100644
--- a/redhat/applications/kpicosim/kpicosim-14.0.0.spec
+++ b/redhat/applications/kpicosim/kpicosim-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -73,6 +75,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -81,8 +84,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=:%{tde_tdeincludedir}
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
# SMP safe !
%__make %{?_smp_mflags}
@@ -94,8 +103,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__make install DESTDIR=%{buildroot}
-%find_lang %{tde_pkg} || touch %{tde_pkg}.lang
-
+%find_lang %{tde_pkg}
%clean
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index 12916f676..5a1277743 100644
--- a/redhat/applications/kpilot/kpilot-14.0.0.spec
+++ b/redhat/applications/kpilot/kpilot-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: TDE Palm Pilot hot-sync tool
Version: 0.7
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -43,13 +43,14 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
+BuildRequires: gettext
BuildRequires: pilot-link-devel
-BuildRequires: trinity-kdepim-devel
+BuildRequires: trinity-tdepim-devel >= %{tde_version}
%description
KPilot is an application that synchronizes your Palm Pilot or similar device
@@ -84,8 +85,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=:%{tde_tdeincludedir}
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility
# SMP safe !
%__make %{?_smp_mflags}
@@ -169,9 +176,12 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-5
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-6
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-5
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kpowersave/kpowersave-14.0.0.spec b/redhat/applications/kpowersave/kpowersave-14.0.0.spec
index 71cba7b57..5cc274820 100644
--- a/redhat/applications/kpowersave/kpowersave-14.0.0.spec
+++ b/redhat/applications/kpowersave/kpowersave-14.0.0.spec
@@ -43,11 +43,13 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: hal-devel
-BuildRequires: trinity-dbus-tqt-devel
+BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
%description
diff --git a/redhat/applications/krecipes/krecipes-14.0.0.spec b/redhat/applications/krecipes/krecipes-14.0.0.spec
index e5cf627c9..722091d3d 100644
--- a/redhat/applications/krecipes/krecipes-14.0.0.spec
+++ b/redhat/applications/krecipes/krecipes-14.0.0.spec
@@ -41,9 +41,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
# MYSQL support
@@ -95,7 +97,8 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--enable-new-ldflags \
--enable-final \
--enable-closure \
- --disable-rpath \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility \
\
--with-sqlite \
--with-mysql \
diff --git a/redhat/applications/krename/krename-14.0.0.spec b/redhat/applications/krename/krename-14.0.0.spec
index 901335367..90b0d8e92 100644
--- a/redhat/applications/krename/krename-14.0.0.spec
+++ b/redhat/applications/krename/krename-14.0.0.spec
@@ -42,10 +42,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
%description
KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or
even more files in one go. The filenames can be created by parts of the original filename,
@@ -78,8 +80,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/krusader/krusader-14.0.0.spec b/redhat/applications/krusader/krusader-14.0.0.spec
index c0bf1c7ae..711b92385 100644
--- a/redhat/applications/krusader/krusader-14.0.0.spec
+++ b/redhat/applications/krusader/krusader-14.0.0.spec
@@ -42,11 +42,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-tdebindings-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+BuildRequires: trinity-tdebindings-devel >= %{tde_version}
+
%description
Krusader is a simple, easy, powerful, twin-panel (commander-style) file
@@ -86,6 +88,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -94,8 +97,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/ksensors/ksensors-14.0.0.spec b/redhat/applications/ksensors/ksensors-14.0.0.spec
index 3cdc9c4a7..caf1f3965 100644
--- a/redhat/applications/ksensors/ksensors-14.0.0.spec
+++ b/redhat/applications/ksensors/ksensors-14.0.0.spec
@@ -35,11 +35,12 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
BuildRequires: gettext
%if 0%{?suse_version}
@@ -89,7 +90,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--enable-new-ldflags \
--disable-final \
--enable-closure \
- --disable-rpath \
+ --enable-rpath \
--enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kshowmail/kshowmail-14.0.0.spec b/redhat/applications/kshowmail/kshowmail-14.0.0.spec
index 15b110a7e..2fb0a7ce9 100644
--- a/redhat/applications/kshowmail/kshowmail-14.0.0.spec
+++ b/redhat/applications/kshowmail/kshowmail-14.0.0.spec
@@ -34,11 +34,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
BuildRequires: trinity-tdepim-devel >= %{tde_version}
%description
@@ -64,15 +65,20 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --disable-dependency-tracking \
- --disable-rpath \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --disable-static
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kshutdown/kshutdown-14.0.0.spec b/redhat/applications/kshutdown/kshutdown-14.0.0.spec
index c5123b78d..fbef4a43d 100644
--- a/redhat/applications/kshutdown/kshutdown-14.0.0.spec
+++ b/redhat/applications/kshutdown/kshutdown-14.0.0.spec
@@ -34,11 +34,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
%description
It has 4 main commands:
@@ -84,7 +85,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--enable-final \
--enable-new-ldflags \
--enable-closure \
- --disable-rpath \
+ --enable-rpath \
--enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
@@ -134,4 +135,3 @@ done
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
- Initial release for TDE 14.0.0
-
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec
index 148ffa8d2..51a50a3c2 100644
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec
+++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -92,8 +94,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
index d58b9c0b6..0599bcff8 100644
--- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
+++ b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
@@ -42,11 +42,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
+BuildRequires: gettext
BuildRequires: trinity-libkipi-devel
BuildRequires: trinity-libksquirrel-devel
#BuildRequires: libkexif-devel
@@ -83,6 +84,7 @@ if [ -d /usr/X11R6 ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
+# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -91,8 +93,14 @@ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --disable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index ea9187eb2..f8113f280 100644
--- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
@@ -43,10 +43,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: scons
diff --git a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec
index 78e395f64..fcd4c1d09 100644
--- a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec
+++ b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec
@@ -43,6 +43,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
diff --git a/redhat/applications/ktechlab/ktechlab-14.0.0.spec b/redhat/applications/ktechlab/ktechlab-14.0.0.spec
index f3094e2c8..2ed7c5c2f 100644
--- a/redhat/applications/ktechlab/ktechlab-14.0.0.spec
+++ b/redhat/applications/ktechlab/ktechlab-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -74,6 +76,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -82,8 +85,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --disable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/ktorrent/ktorrent-14.0.0.spec b/redhat/applications/ktorrent/ktorrent-14.0.0.spec
index 585c32e76..ba5a8c631 100644
--- a/redhat/applications/ktorrent/ktorrent-14.0.0.spec
+++ b/redhat/applications/ktorrent/ktorrent-14.0.0.spec
@@ -43,9 +43,11 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -82,8 +84,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir="%{tde_libdir}" \
--mandir="%{tde_mandir}" \
--includedir="%{tde_tdeincludedir}" \
- --disable-rpath \
- --with-extra-includes=""
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility
# Not SMP safe !
diff --git a/redhat/applications/kuickshow/kuickshow-14.0.0.spec b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
index 64e9e40e6..6a5d7ac82 100644
--- a/redhat/applications/kuickshow/kuickshow-14.0.0.spec
+++ b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: Quick picture viewer for TDE
Version: 0.8.13
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -41,6 +41,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -84,8 +85,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
@@ -113,21 +120,24 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
-%{tde_bindir}/*
+%{tde_bindir}/kuickshow
%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
+%{tde_datadir}/apps/kuickshow/
%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/lib[kt]deinit_%{tde_pkg}.so
+%{tde_libdir}/libtdeinit_%{tde_pkg}.so
%{tde_libdir}/*.la
%{tde_tdelibdir}/*.so
%{tde_tdelibdir}/*.la
-%{tde_tdedocdir}/HTML/en/*/
+%{tde_tdedocdir}/HTML/en/kuickshow/
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-7
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-8
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-7
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-6
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kvirc/kvirc-14.0.0-install_directory.patch b/redhat/applications/kvirc/kvirc-14.0.0-install_directory.patch
new file mode 100644
index 000000000..33bdda5a7
--- /dev/null
+++ b/redhat/applications/kvirc/kvirc-14.0.0-install_directory.patch
@@ -0,0 +1,11 @@
+--- trinity-kvirc-14.0.0~pre102+3e8fea2e/admin/acinclude.m4.in.ROI 2013-08-04 20:37:52.076477391 +0200
++++ trinity-kvirc-14.0.0~pre102+3e8fea2e/admin/acinclude.m4.in 2013-08-04 20:37:57.402529614 +0200
+@@ -2633,7 +2633,7 @@
+ AC_DEFINE_UNQUOTED([VERSION_BRANCH], "$SS_DIRTAG", [MAJOR.MINOR part of version])
+ AC_DEFINE_UNQUOTED([BUILD_FLAGS],"$target_cpu-$build_flags", [these are the build flags])
+
+- globalkvircdir="\${datadir}/kvirc/$SS_DIRTAG"
++ globalkvircdir="\${libdir}/kvirc/$SS_DIRTAG"
+ AC_SUBST(globalkvircdir)
+
+ configdir="\${globalkvircdir}/config"
diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec
index 5eedd7db3..25a80b1c0 100644
--- a/redhat/applications/kvirc/kvirc-14.0.0.spec
+++ b/redhat/applications/kvirc/kvirc-14.0.0.spec
@@ -43,10 +43,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch1: kvirc-14.0.0-install_directory.patch
+
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
Requires: %{name}-data = %{version}-%{release}
@@ -75,7 +79,7 @@ as a very simple IRC client you are likely to want to write scripts to
tailor KVIrc to your needs.
KVIrc is a graphical IRC client based on the TDE widget set which integrates
-with the K Desktop Environment version 3.
+with the Trinity Desktop Environment version 3.
%package devel
Group: Development/Libraries
@@ -97,12 +101,9 @@ with the K Desktop Environment version 3.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .installdir
# Hardcoded absolute PATH to TDEDIR in source code ! That sucks !
-%__sed -i "src/kvirc/kernel/kvi_app_fs.cpp" \
- -e "s|/opt/kde3/lib|%{tde_libdir}|g"
-%__sed -i "src/kvirc/kernel/kvi_app_setup.cpp" \
- -e "s|/opt/kde3|%{tde_prefix}|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -122,8 +123,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-wall \
+ \
+ --with-pic \
+ \
--with-big-channels \
- --enable-perl --with-pic --enable-wall \
+ --enable-perl \
--with-ix86-asm \
--with-kde-services-dir=%{tde_datadir}/services \
--with-kde-library-dir=%{tde_libdir} \
@@ -137,7 +145,8 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%__make symlinks -C src/kvilib/build
%__make symlinks -C src/kvirc/build
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags
+}
%install
@@ -147,8 +156,8 @@ export PATH="%{tde_bindir}:${PATH}"
# Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ...
%__mv \
- %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \
- %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA
+ %{?buildroot}%{tde_libdir}/kvirc/3.4/license/COPYING \
+ %{?buildroot}%{tde_libdir}/kvirc/3.4/license/EULA
%clean
@@ -171,18 +180,18 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%doc ChangeLog FAQ README TODO
%{tde_bindir}/kvirc
%{tde_libdir}/*.so.*
-#%{tde_libdir}/kvirc/*/modules/*.so
+%{tde_libdir}/kvirc/*/modules/*.so
%files data
%defattr(-,root,root,-)
%{tde_bindir}/kvi_run_netscape
%{tde_bindir}/kvi_search_help
-#%{tde_libdir}/kvirc/*/modules/caps/
+%{tde_libdir}/kvirc/
%{tde_datadir}/applnk/Internet/kvirc.desktop
%{tde_datadir}/icons/hicolor/*/*/*.png
%{tde_datadir}/icons/hicolor/*/*/*.svgz
%{tde_datadir}/icons/hicolor/*/*/*.xpm
-%{tde_datadir}/kvirc
+#%{tde_datadir}/kvirc
%{tde_datadir}/mimelnk/text/*.desktop
%{tde_datadir}/services/*.protocol
%{tde_mandir}/man1/kvirc.1
diff --git a/redhat/applications/kvkbd/kvkbd-14.0.0.spec b/redhat/applications/kvkbd/kvkbd-14.0.0.spec
index 09058c528..d220cd3f2 100644
--- a/redhat/applications/kvkbd/kvkbd-14.0.0.spec
+++ b/redhat/applications/kvkbd/kvkbd-14.0.0.spec
@@ -42,6 +42,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -78,8 +79,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0.spec b/redhat/applications/kvpnc/kvpnc-14.0.0.spec
index 60a9f80c9..7c3e4888b 100644
--- a/redhat/applications/kvpnc/kvpnc-14.0.0.spec
+++ b/redhat/applications/kvpnc/kvpnc-14.0.0.spec
@@ -44,10 +44,11 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: kvpnc-14.0.0-fix_install.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
%description
@@ -87,8 +88,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec b/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec
index 8879ed4da..0e6aabfd6 100644
--- a/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec
+++ b/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec
@@ -34,11 +34,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
Requires: mplayer
@@ -72,18 +72,22 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --disable-dependency-tracking \
- --disable-static \
- --disable-rpath \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --htmldir=%{tde_tdedocdir}/HTML \
- --includedir=%{tde_tdeincludedir} \
- --enable-closure
-
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ --htmldir=%{tde_tdedocdir}/HTML \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
+
%__make %{?_smp_mflags}
diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab-14.0.0.spec
index b49864ab9..89a610f00 100644
--- a/redhat/applications/piklab/piklab-14.0.0.spec
+++ b/redhat/applications/piklab/piklab-14.0.0.spec
@@ -42,11 +42,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
+BuildRequires: gettext
BuildRequires: readline-devel
%description
@@ -77,6 +78,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -85,8 +87,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --disable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/potracegui/potracegui-14.0.0.spec b/redhat/applications/potracegui/potracegui-14.0.0.spec
index baf3dfe9a..377bfb89b 100644
--- a/redhat/applications/potracegui/potracegui-14.0.0.spec
+++ b/redhat/applications/potracegui/potracegui-14.0.0.spec
@@ -42,6 +42,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -80,8 +81,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec
index 53303d743..8eb2b24a0 100644
--- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec
+++ b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec
@@ -42,11 +42,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
+BuildRequires: gettext
BuildRequires: qt4-devel
%description
diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
index d2565fa5a..5101d626e 100644
--- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec
+++ b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
@@ -30,7 +30,7 @@
Name: trinity-%{tde_pkg}
Summary: music editor and MIDI/audio sequencer [Trinity]
Version: 1.7.0
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
@@ -45,16 +45,21 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
+BuildRequires: gettext
BuildRequires: fftw-devel
-BuildRequires: dssi-devel
BuildRequires: liblo-devel
BuildRequires: fontconfig-devel
+# DSSI support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: dssi-devel
+%endif
+
# LRDF support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: liblrdf-devel
@@ -130,20 +135,28 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
- -DWANT_DEBUG=OFF \
- -DWANT_FULLDBG=OFF \
+ \
-DWANT_SOUND=ON \
-DWANT_JACK=ON \
-DWANT_DSSI=ON \
%{?with_lirc:-DWANT_LIRC=ON} %{?!with_lirc:-DWANT_LIRC=OFF} \
-DWANT_PCH=OFF \
-DWANT_TEST=OFF \
+ -DWANT_DEBUG=OFF \
+ -DWANT_FULLDBG=OFF \
-DBUILD_ALL=ON \
..
@@ -160,6 +173,7 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
@@ -205,9 +219,12 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-5
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-6
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-5
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
index 6858ae71b..132e2a87c 100644
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
@@ -42,6 +42,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -82,7 +83,8 @@ unset QTDIR QTINC QTLIB
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__sed -i "Makefile" \
- -e "s|/usr/lib/perl5/Chipcard|/usr/lib64/perl5/vendor_perl/Chipcard|g"
+ -e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g"
+
%build
export PATH="%{tde_bindir}:${PATH}"
diff --git a/redhat/applications/smb4k/smb4k-14.0.0.spec b/redhat/applications/smb4k/smb4k-14.0.0.spec
index cb84a57cb..c020d0a54 100644
--- a/redhat/applications/smb4k/smb4k-14.0.0.spec
+++ b/redhat/applications/smb4k/smb4k-14.0.0.spec
@@ -42,10 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -152,8 +153,14 @@ export TDEDIR="%{tde_prefix}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility
# SMP safe !
%__make %{?_smp_mflags}
diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
index fabd6739c..a87b2e237 100644
--- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
+++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
@@ -42,6 +42,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -104,9 +105,16 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=/usr/include/cdda \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility \
+ \
+ --with-extra-includes=/usr/include/cdda
%__make %{?_smp_mflags}
diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
index 6f7942b42..cb52e1835 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -47,10 +47,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
BuildRequires: trinity-pytdeextensions
BuildRequires: trinity-libpythonize0-devel
diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec
index b98917138..8302603d4 100644
--- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec
+++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec
@@ -47,10 +47,10 @@ Obsoletes: trinity-style-lipstik < %{version}-%{release}
Provides: trinity-style-lipstik = %{version}-%{release}
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
%description
@@ -84,8 +84,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec
index bed15ee79..d36df4c88 100644
--- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec
+++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
Obsoletes: trinity-kde-style-qtcurve < %{version}-%{release}
@@ -96,11 +98,19 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
+ \
-DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \
-DQTC_QT_ONLY=false \
-DQTC_STYLE_SUPPORT=true \
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
index d2b45fa6e..44a365b05 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
@@ -50,6 +50,7 @@ Provides: trinity-systemsettings = %{version}-%{release}
Obsoletes: trinity-systemsettings < %{version}-%{release}
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -87,8 +88,14 @@ export TDEDIR="%{tde_prefix}"
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--sysconfdir=%{tde_sysconfdir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch
new file mode 100644
index 000000000..b83b3f3ad
--- /dev/null
+++ b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch
@@ -0,0 +1,33 @@
+--- trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp.ORI 2013-07-29 11:26:26.740982531 +0200
++++ trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp 2013-07-29 11:26:53.970250335 +0200
+@@ -143,10 +143,10 @@
+ */
+
+ static const TQString
+- html_form_begin("\n<form action=\"apt:/\" method=\"GET\">\n"
++ html_form_begin_apt("\n<form action=\"apt:/\" method=\"GET\">\n"
+ "<table class=\"query\">\n");
+ static const TQString
+- html_form_end("<tr>\n"
++ html_form_end_apt("<tr>\n"
+ "\t<td class=\"button\" colspan=\"2\"><input type=\"submit\" value=\"%1\"></td>\n"
+ "</tr>\n"
+ "</table>\n"
+@@ -197,7 +197,7 @@
+ if (online)
+ stream << "<table class=\"queryform\"><tr><td>\n";
+
+- stream << html_form_begin;
++ stream << html_form_begin_apt;
+ stream << "<tr><td colspan=\"2\" class=\"title\">" + i18n("Offline search") + "</td></tr>" << endl;
+ stream << make_html_form_line("search", i18n("Package search"));
+ if (ext_form)
+@@ -206,7 +206,7 @@
+ stream << make_html_form_line("fsearch", i18n("File search"));
+ stream << make_html_form_line("show", i18n("Package info"));
+ }
+- stream << html_form_end.arg( i18n("Search") );
++ stream << html_form_end_apt.arg( i18n("Search") );
+
+ if (online)
+ {
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
index 44a060fcb..56520be7b 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
+++ b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
@@ -41,7 +41,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch1: tdeio-apt-14.0.0-ftbfs.patch
+
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -64,6 +67,7 @@ browsing the packages easier. It provides:
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .ftbfs
%__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"
@@ -83,8 +87,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
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 02a9dbd92..b72ffee4e 100644
--- a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec
+++ b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec
@@ -35,11 +35,12 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
BuildRequires: gettext
Obsoletes: trinity-kio-ftps < %{version}-%{release}
@@ -69,16 +70,19 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --disable-dependency-tracking \
- --disable-rpath \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --disable-static \
- --includedir=%{tde_tdeincludedir} \
- --enable-closure
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
index bc7fd0e1f..dd090d32b 100644
--- a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
+++ b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
@@ -42,6 +42,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -91,12 +92,20 @@ cd build
%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
+ \
-DBUILD_ALL=ON \
..
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 a4d0f0d07..00d6f5279 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
+++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
@@ -44,6 +44,7 @@ Source1: media_safelyremove.desktop_tdeio
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -86,10 +87,11 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
\
--disable-dependency-tracking \
--disable-debug \
- --disable-final \
+ --enable-final \
--enable-new-ldflags \
--enable-closure \
- --disable-rpath
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
index ed472f8f4..46c09b1c2 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
@@ -40,9 +40,11 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -55,8 +57,8 @@ Requires: NetworkManager-gnome
Requires: networkmanager
%endif
-BuildRequires: trinity-dbus-1-tqt-devel
-BuildRequires: trinity-dbus-tqt-devel
+BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9
+BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
BuildRequires: NetworkManager-glib-devel
%description
@@ -95,12 +97,19 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
..
%__make %{?_smp_mflags}
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index 027da7e4d..30bfe0567 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -42,7 +42,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -71,7 +71,7 @@ Current feature list:
* online help
* localisations for many languages
-KPowersave supports schemes with following configurable specific
+TDEPowersave supports schemes with following configurable specific
settings for:
* screensaver
* DPMS
@@ -100,12 +100,19 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
..
%__make %{?_smp_mflags}
diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio-14.0.0.spec
index ed72b8c2f..9b07482a3 100644
--- a/redhat/applications/tderadio/tderadio-14.0.0.spec
+++ b/redhat/applications/tderadio/tderadio-14.0.0.spec
@@ -45,12 +45,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
+BuildRequires: gettext
BuildRequires: libsndfile-devel
%{?with_lirc:BuildRequires: lirc-devel}
@@ -117,7 +117,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility \
+ \
%{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \
--enable-v4l2 \
--enable-lame \
diff --git a/redhat/applications/tdesudo/tdesudo-14.0.0.spec b/redhat/applications/tdesudo/tdesudo-14.0.0.spec
index b46aaa9fc..256219beb 100644
--- a/redhat/applications/tdesudo/tdesudo-14.0.0.spec
+++ b/redhat/applications/tdesudo/tdesudo-14.0.0.spec
@@ -43,7 +43,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@@ -83,7 +83,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--datadir=%{tde_datadir} \
--docdir=%{tde_docdir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
index 2fbfd2f92..efeef1a88 100644
--- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec
+++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: subversion client with tight TDE integration [Trinity]
Version: 1.0.4
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -42,10 +42,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
BuildRequires: subversion-devel
Requires: %{name}-tdeio-plugins = %{version}-%{release}
@@ -111,10 +111,6 @@ This package is part of tdesvn-trinity.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-# More ugly hack to add TQT include directory in CMakeLists.txt
-%__sed -i CMakeLists.txt \
- -e "s,^\(INCLUDE_DIRECTORIES (\)$,\1\n,"
-
# Moves HTML files to the correect location
find . -name "*.cmake" -exec %__sed -i {} \
-e "s,/doc/HTML,/doc/tde/HTML,g" \
@@ -134,6 +130,14 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \
@@ -142,7 +146,9 @@ cd build
-DDATA_INSTALL_DIR=%{tde_datadir} \
-DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
+ \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
..
# SMP safe !
@@ -167,6 +173,8 @@ export PATH="%{_bindir}:${PATH}"
%__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
%__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
+%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
@@ -207,7 +215,7 @@ fi
/sbin/ldconfig || :
-%files
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{tde_bindir}/tdesvn
@@ -223,9 +231,10 @@ fi
%{tde_datadir}/config.kcfg/tdesvn_part.kcfg
%{tde_datadir}/icons/hicolor/*/*/*.png
%{tde_datadir}/icons/hicolor/*/*/*.svgz
-#%{tde_mandir}/man1/tdesvn.1
-#%{tde_mandir}/man1/tdesvnaskpass.1
-#%{tde_tdedocdir}/HTML/*/
+%{tde_mandir}/man1/tdesvn.1*
+%{tde_mandir}/man1/tdesvnaskpass.1*
+%lang(en) %{tde_tdedocdir}/HTML/en/tdesvn/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/tdesvn/
%{tde_libdir}/libksvnwidgets.la
%{tde_libdir}/libksvnwidgets.so
%{tde_libdir}/libsvnfrontend.la
@@ -274,9 +283,12 @@ fi
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-6
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-7
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-6
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-5
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
index 3c22709a4..bc80a4118 100644
--- a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
+++ b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
@@ -42,10 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
Obsoletes: trinity-kdmtheme < %{version}-%{release}
@@ -84,7 +85,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 8932f2fd0..5647c863b 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: Icollection manager for books, videos, music [Trinity]
Version: 1.3.2.1
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -41,10 +41,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch1: tellico-3.5.13.2-videodev.patch
+
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
%if 0%{?mgaversion} || 0%{?mdkversion}
@@ -52,6 +56,14 @@ BuildRequires: yaz
BuildRequires: %{_lib}yaz-devel
%endif
+# V4L support
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+BuildRequires: libv4l-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}v4l-devel
+%endif
+
Requires: %{name}-data = %{version}-%{release}
Requires: %{name}-scripts = %{version}-%{release}
@@ -122,6 +134,10 @@ as a separate package which can be updated through debian-volatile.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+if [ -r /usr/include/libv4l1-videodev.h ]; then
+%patch1 -p1 -b .videodev
+fi
+
%__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"
@@ -132,6 +148,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning, --enable-final causes FTBFS §
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -140,8 +157,16 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --disable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility \
+ \
+ --enable-webcam
%__make %{?_smp_mflags} || %__make
@@ -155,10 +180,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__install -D -c -p -m 644 icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg
%__install -D -c -p -m 644 icons/tellico_mime.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
-# Remove dead symlink from French translation
-%__rm %{?buildroot}%{tde_tdedocdir}/HTML/fr/tellico/common
-
-
%find_lang %{tde_pkg}
@@ -212,9 +233,12 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-6
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-7
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-6
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-5
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/tork/tork-14.0.0.spec b/redhat/applications/tork/tork-14.0.0.spec
index c313346bc..857ea2404 100644
--- a/redhat/applications/tork/tork-14.0.0.spec
+++ b/redhat/applications/tork/tork-14.0.0.spec
@@ -34,8 +34,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: desktop-file-utils
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
BuildRequires: trinity-tdepim-devel >= %{tde_version}
BuildRequires: torsocks
@@ -76,7 +80,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--disable-final \
--enable-new-ldflags \
--enable-closure \
- --disable-rpath \
+ --enable-rpath \
--enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec
index f6cd7f614..efa2232b3 100644
--- a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec
+++ b/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
Obsoletes: trinity-kwin-style-crystal < %{version}-%{release}
@@ -86,8 +88,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
- --with-extra-includes=
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant-14.0.0.spec
index ba217de8d..342c30c62 100644
--- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec
+++ b/redhat/applications/wlassistant/wlassistant-14.0.0.spec
@@ -42,9 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
BuildRequires: python
@@ -86,10 +88,19 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ \
-DBUILD_ALL=on \
..
diff --git a/redhat/applications/yakuake/yakuake-14.0.0.spec b/redhat/applications/yakuake/yakuake-14.0.0.spec
index 6d5bbc5dc..3ea6aff26 100644
--- a/redhat/applications/yakuake/yakuake-14.0.0.spec
+++ b/redhat/applications/yakuake/yakuake-14.0.0.spec
@@ -42,10 +42,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
%description
Yakuake is a Quake-style terminal emulator based on TDE Konsole technology.
@@ -75,8 +77,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --enable-closure
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}