summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-09-02 23:21:56 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-09-02 23:21:56 +0200
commitd7491fce7864ba058980188493d312c572864712 (patch)
tree889ad36b27465014e04c5825db4aa1facbf43343
parent4e66b3b83a173ca5ac7c2e1f9b7ce1bef816a53a (diff)
downloadtde-packaging-d7491fce7864ba058980188493d312c572864712.tar.gz
tde-packaging-d7491fce7864ba058980188493d312c572864712.zip
RPM Packaging: update R14 applications
-rw-r--r--redhat/applications/abakus/abakus-14.0.0.spec11
-rw-r--r--redhat/applications/adept/adept-14.0.0.spec3
-rw-r--r--redhat/applications/amarok/amarok-14.0.0.spec15
-rw-r--r--redhat/applications/basket/basket-14.0.0.spec14
-rw-r--r--redhat/applications/bibletime/bibletime-14.0.0.spec18
-rw-r--r--redhat/applications/digikam/digikam-14.0.0.spec40
-rw-r--r--redhat/applications/dolphin/dolphin-14.0.0.spec32
-rw-r--r--redhat/applications/filelight/filelight-14.0.0.spec32
-rw-r--r--redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec21
-rw-r--r--redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec11
-rw-r--r--redhat/applications/gwenview/gwenview-14.0.0.spec41
-rw-r--r--redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec14
-rw-r--r--redhat/applications/k3b/k3b-14.0.0.spec38
-rw-r--r--redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch4
-rw-r--r--redhat/applications/k9copy/k9copy-14.0.0.spec41
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec19
-rw-r--r--redhat/applications/kaffeine/kaffeine-14.0.0.spec34
-rw-r--r--redhat/applications/katapult/katapult-14.0.0.spec26
-rw-r--r--redhat/applications/kbarcode/kbarcode-14.0.0.spec15
-rw-r--r--redhat/applications/kbfx/kbfx-14.0.0.spec14
-rw-r--r--redhat/applications/kbookreader/kbookreader-14.0.0.spec19
-rw-r--r--redhat/applications/kchmviewer/kchmviewer-14.0.0.spec17
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-14.0.0.spec14
-rw-r--r--redhat/applications/kcpuload/kcpuload-14.0.0.spec19
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec22
-rw-r--r--redhat/applications/kdiff3/kdiff3-14.0.0.spec41
-rw-r--r--redhat/applications/kdirstat/kdirstat-14.0.0.spec20
-rw-r--r--redhat/applications/keep/keep-14.0.0.spec16
-rw-r--r--redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec23
-rw-r--r--redhat/applications/kile/kile-14.0.0.spec24
-rw-r--r--redhat/applications/kima/kima-14.0.0.spec18
-rw-r--r--redhat/applications/kiosktool/kiosktool-14.0.0.spec22
-rw-r--r--redhat/applications/kmplayer/kmplayer-14.0.0.spec27
-rw-r--r--redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec18
-rw-r--r--redhat/applications/kmymoney/kmymoney-14.0.0.spec28
-rw-r--r--redhat/applications/knemo/knemo-14.0.0.spec16
-rw-r--r--redhat/applications/knetload/knetload-14.0.0.spec17
-rw-r--r--redhat/applications/knetstats/knetstats-14.0.0.spec14
-rw-r--r--redhat/applications/knights/knights-14.0.0.spec21
-rw-r--r--redhat/applications/knowit/knowit-14.0.0.spec13
-rw-r--r--redhat/applications/knutclient/knutclient-14.0.0.spec18
-rw-r--r--redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec21
-rw-r--r--redhat/applications/koffice/koffice-14.0.0.spec54
-rw-r--r--redhat/applications/konversation/konversation-14.0.0.spec24
-rw-r--r--redhat/applications/kopete-otr/kopete-otr-14.0.0.spec18
-rw-r--r--redhat/applications/kpicosim/kpicosim-14.0.0.spec18
-rw-r--r--redhat/applications/kpilot/kpilot-14.0.0.spec20
-rw-r--r--redhat/applications/kpowersave/kpowersave-14.0.0.spec26
-rw-r--r--redhat/applications/krename/krename-14.0.0.spec28
-rw-r--r--redhat/applications/krusader/krusader-14.0.0.spec20
-rw-r--r--redhat/applications/kshutdown/kshutdown-14.0.0.spec1
-rw-r--r--redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec18
-rw-r--r--redhat/applications/ksquirrel/ksquirrel-14.0.0.spec18
-rw-r--r--redhat/applications/kstreamripper/kstreamripper-14.0.0.spec14
-rw-r--r--redhat/applications/ksystemlog/ksystemlog-14.0.0.spec25
-rw-r--r--redhat/applications/ktechlab/ktechlab-14.0.0.spec18
-rw-r--r--redhat/applications/ktorrent/ktorrent-14.0.0.spec48
-rw-r--r--redhat/applications/kuickshow/kuickshow-14.0.0.spec33
-rw-r--r--redhat/applications/kvirc/kvirc-14.0.0.spec43
-rw-r--r--redhat/applications/kvkbd/kvkbd-14.0.0.spec14
-rw-r--r--redhat/applications/piklab/piklab-14.0.0.spec21
-rw-r--r--redhat/applications/potracegui/potracegui-14.0.0.spec15
-rw-r--r--redhat/applications/rosegarden/rosegarden-14.0.0.spec22
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-14.0.0.spec16
-rw-r--r--redhat/applications/smb4k/smb4k-14.0.0.spec20
-rw-r--r--redhat/applications/soundkonverter/soundkonverter-14.0.0.spec15
-rw-r--r--redhat/applications/tde-guidance/tde-guidance-14.0.0.spec292
-rw-r--r--redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec25
-rw-r--r--redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec28
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec35
-rw-r--r--redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec12
-rw-r--r--redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec30
-rw-r--r--redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec23
-rw-r--r--redhat/applications/tdepowersave/tdepowersave-14.0.0.spec42
-rw-r--r--redhat/applications/tderadio/tderadio-14.0.0.spec25
-rw-r--r--redhat/applications/tdesudo/tdesudo-14.0.0.spec19
-rw-r--r--redhat/applications/tdesvn/tdesvn-14.0.0.spec26
-rw-r--r--redhat/applications/tdmtheme/tdmtheme-14.0.0.spec22
-rw-r--r--redhat/applications/tellico/tellico-14.0.0.spec22
-rw-r--r--redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec14
-rw-r--r--redhat/applications/wlassistant/wlassistant-14.0.0.spec14
-rw-r--r--redhat/applications/yakuake/yakuake-14.0.0.spec24
82 files changed, 408 insertions, 1685 deletions
diff --git a/redhat/applications/abakus/abakus-14.0.0.spec b/redhat/applications/abakus/abakus-14.0.0.spec
index e47d81719..0afd7a1ea 100644
--- a/redhat/applications/abakus/abakus-14.0.0.spec
+++ b/redhat/applications/abakus/abakus-14.0.0.spec
@@ -25,7 +25,7 @@
Name: trinity-%{tde_pkg}
Summary: Calculator for TDE
Version: 0.91
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -69,7 +69,6 @@ has the user-friendly menu options of a normal TDE application.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}"
# Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then
@@ -127,11 +126,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/applnk/Utilities/abakus.desktop
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.91-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.91-7
- Initial release for TDE 14.0.0
-
-* 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
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept-14.0.0.spec
index 0e97b9760..ebd0ef00b 100644
--- a/redhat/applications/adept/adept-14.0.0.spec
+++ b/redhat/applications/adept/adept-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: Package management suite for Trinity
Version: 2.1.3
-Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -156,7 +156,6 @@ by external applications.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index 08137e7f2..478e7f58e 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -26,7 +26,7 @@
Name: trinity-%{tde_pkg}
Summary: Media player
Version: 1.4.10
-Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}%{?_variant}
Group: Applications/Multimedia
License: GPLv2+
@@ -358,8 +358,6 @@ use any of xmms' visualisation plugins with Amarok.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}::%{tde_tdeincludedir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
@@ -434,14 +432,5 @@ done
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-11
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-12
- 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
-
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-8
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec
index f02f543d0..4a3b7a545 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:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -44,6 +44,7 @@ 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
@@ -160,14 +161,5 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-6
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-7
- 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
-
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-3
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec
index b2db589bb..655cdefea 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -26,7 +26,7 @@
Name: trinity-%{tde_pkg}
Summary: A bible study tool for Trinity
Version: 1.6.6.0
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -84,7 +84,6 @@ texts, write own notes, save, print etc.).
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -145,18 +144,5 @@ update-desktop-database %{tde_datadir}/applications -q &> /dev/null
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-2
-- Fix compilation on RHEL 5
-- Fix compilation with GCC 4.7
-
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec
index 8cb319922..c2f7d28ef 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:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -134,7 +134,6 @@ Requires: %{name} = %{version}-%{release}
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_tdeincludedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -315,40 +314,5 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-7
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-8
- 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
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-4
-- Initial release for TDE 3.5.13.1
-
-* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
-- Add support for Mageia 2 and Mandriva 2011
-- Removes old patches, adds GIT patches.
-- Fix digikam FTBFS due to jpeg code [Commit #b9419cd5]
-- Fix FTBFS due to png code [Bug #595] [Commit #3e27b07f]
-- Remove version.h. Cruft from an older version prior to 0.9.6.
-- Fix usage of obsolete libpng jmpbuf member [Commit #7d0d82b7]
-- GCC 4.7 fix. [Bug #958] [Commit #a9489034]
-- GCC 4.7 fix. [Bug #958] [Commit #a209c81b]
-- Fix 'format not a string literal' error [Commit #029218cd]
-- Update patch in GIT hash a9489034 to use reinterpret_cast. [Commit #5a043853]
-- Fix FTBFS on png >= 0.15 [Commit #18ecd512]
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
-- Fix man directory location
-- Fix postinstall
-- Fix description
-- Add "BuildRequires: exiv2-devel"
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-2
-- gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958]
-
-* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.6-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
diff --git a/redhat/applications/dolphin/dolphin-14.0.0.spec b/redhat/applications/dolphin/dolphin-14.0.0.spec
index d151fb8b2..f7b25e799 100644
--- a/redhat/applications/dolphin/dolphin-14.0.0.spec
+++ b/redhat/applications/dolphin/dolphin-14.0.0.spec
@@ -26,7 +26,7 @@
Name: trinity-%{tde_pkg}
Summary: File manager for TDE focusing on usability
Version: 0.9.2
-Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -71,7 +71,6 @@ interface for the task of file management.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -147,32 +146,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.2-8
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.2-9
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.2-7
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-6
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-5
-- Add alternatives with 'kio-umountwrapper'
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-4
-- Rebuild for Fedora 17
-- Fix HTML installation directory
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Wed Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-1
-- Correct macro to install under "/opt", if desired
-
-* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-0
-- Initial release for RHEL 6.0
-- Based on FC7 'Dolphin 0.8.2-2" SPEC file.
-
diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight-14.0.0.spec
index 555e31848..73fe0a01e 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:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -46,7 +46,6 @@ 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}
@@ -139,32 +138,5 @@ done
%lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-8
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-9
- 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
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-5
-- Initial release for TDE 3.5.13.1
-- Obsoletes package 'filelight-l10n'
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-4
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-0
-- Initial release for RHEL 6.0
-
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 2aa301eba..d51ec3f2e 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
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: theme engine using Qt for GTK+ 2.x and Trinity
Version: 0.8
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -137,22 +137,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-7
- Initial release for TDE 14.0.0
-
-* 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> - 0.8-4
-- Initial release for TDE 3.5.13.1
-
-* Mon Aug 27 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3
-- Add missing gtkrc files
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-2
-- Rebuilt for Fedora 17
-- Fix FTBFS with newer glib
-- Removes useless post and postun
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
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 1dd046131..753cee219 100644
--- a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec
+++ b/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: Gwenview is an image viewer for TDE.
Version: 1.4.2
-Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -170,12 +170,5 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-4
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
-- Initial release for TDE 3.5.13.1
-
diff --git a/redhat/applications/gwenview/gwenview-14.0.0.spec b/redhat/applications/gwenview/gwenview-14.0.0.spec
index a7d5e2658..e3ece2def 100644
--- a/redhat/applications/gwenview/gwenview-14.0.0.spec
+++ b/redhat/applications/gwenview/gwenview-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: Gwenview is an image viewer for TDE.
Version: 1.4.2
-Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -191,42 +191,5 @@ done
%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-11
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-12
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-10
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-9
-- Initial release for TDE 3.5.13.1
-
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-8
-- Add support for Mageia 2 and Mandriva 2011
-- Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f]
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-7
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Adds patches from GIT
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-6
-- Fix HTML directory location
-
-* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-5
-- Adds missing files
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-4
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2
-- Add fix for Fedora 15
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
-- Initial release for RHEL 6.0
-
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 fb9c7804f..800c3be9c 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
+++ b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
@@ -1,5 +1,5 @@
# Default version for this component
-%define tde_pkg abakus
+%define tde_pkg k3n-i18n
%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".
@@ -27,7 +27,7 @@
Name: trinity-k3b-i18n
Summary: Locale files for K3B
Version: 1.0.5
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
@@ -336,7 +336,6 @@ This package contains the Ukrainian translations for K3B.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
./configure \
--prefix=%{tde_prefix} \
@@ -412,12 +411,3 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-4
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Initial release for TDE 3.5.13.1
-
-* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial release for TDE 3.5.13
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index 022ea0b15..04070a8cc 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -28,7 +28,7 @@ Name: trinity-%{tde_pkg}
Summary: CD/DVD burning application
Epoch: 1
Version: 1.0.5
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
@@ -390,7 +390,6 @@ and a generic audio and video file converter.
%build
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}"
# FFMPEG trick ...
@@ -458,38 +457,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.0.5-2
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
-
-* Sun Jan 06 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-2
-- Enables FFMPEG support
-- Enables LAME support
-- Enables MAD support
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
-- Remove requirement for resmgr
-
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Add support for Mageia 2 and Mandriva 2011
-- Fix DBUS-TQT detection that prevented HAL support
-- Adds requirement for resmgr
-
-* Wed May 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Removes i18 files (built separately)
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Rebuilt for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Sat Nov 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Updates BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
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
index 1ea7705ea..c21df175c 100644
--- a/redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch
+++ b/redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch
@@ -4,8 +4,8 @@
$(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
+- $(LIB_TDEUI) -ltdemdi $(LIBDL) -ldvdread
++ $(LIB_TDEUI) -ltdemdi $(LIBDL) -ldvdread -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 44bbb284e..db7c1ddca 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:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -43,8 +43,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
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
+Patch3: k9copy-14.0.0-fix_author.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
@@ -58,10 +57,11 @@ BuildRequires: trinity-k3b-devel
BuildRequires: ffmpeg-devel
Requires: ffmpeg
+
%description
k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
-This is the Trinity version
+This is the Trinity version.
%if 0%{?suse_version} || 0%{?pclinuxos}
@@ -73,8 +73,7 @@ This is the Trinity version
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .ftbfs
%patch2 -p1 -b .ftbfs
-%patch3 -p1 -b .dvdread
-%patch4 -p1 -b .k9author
+%patch3 -p1 -b .k9author
# Removes internal dvdread headers
%__rm -rf dvdread
@@ -87,11 +86,10 @@ This is the Trinity version
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# FFMPEG ...
if [ -d /usr/include/ffmpeg ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
+ export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
fi
# NOTICE: --enable-final causes FTBFS !
@@ -150,30 +148,5 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-6
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-7
- 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
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-3
-- Initial release for TDE 3.5.13.1
-
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2
-- Add support for MGA2 and MDV2011
-- Fix 'format not a string literal' error. Clean up warning. [Commit #3bfc84b0]
-- Fix FTBFS [Commit #62acebb7]
-- Fix 'format not a string literal' error [Commit #d9ed8b32]
-- Fix remaining string format errors [Commit #a8e98ad9]
-- Fix another string format error [Commit #b3bb8a8f]
-- Fix FTBFS [Commit #ca864ede]
-- Fix format string error [Commit #a016df82]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
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 738e85889..0325c2adb 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity]
Version: 0.4.3.1
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
@@ -50,7 +50,6 @@ 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
@@ -88,7 +87,6 @@ when a page containing a supported media format is loaded.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{_libdir}/mozilla \
@@ -133,18 +131,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-3
-- Initial release for TDE 3.5.13.1
-
-* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-2
-- Rebuild with nicer patch.
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1.dfsg-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index 813e15203..d8ea7107a 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -26,7 +26,7 @@ Name: trinity-%{tde_pkg}
Summary: Xine-based media player
Version: 0.8.8
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
@@ -224,7 +224,6 @@ Requires: %{name} = %{version}-%{release}
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -272,34 +271,5 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-7
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-4
-- Initial release for TDE 3.5.13.1
-
-* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-3
-- Add support for Mageia 2 and Mandriva 2011
-- Added automake initialization with proper program name and version [Bug #858] [Commit #4e982fa3]
-- Fixed online hyperlink to win32 codecs download location. [Commit #5086f358]
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-2
-- Rebuilt for Fedora 17
-- Adds more patches from GIT.
-
-* Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-1
-- Updates version to 0.8.8
-- Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899]
-- Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $TDEHOME/tmp-$HOSTNAME.
-- Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
-- Add man page
-
-* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-2
-- Disable 'libxcb-devel' for RHEL 5 compilation
-- Fix HTML directory location
-
-* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-1
-- Spec file based on Fedora 8 'kaffeine-0.8.6-3'
diff --git a/redhat/applications/katapult/katapult-14.0.0.spec b/redhat/applications/katapult/katapult-14.0.0.spec
index 14d966e55..f7f079136 100644
--- a/redhat/applications/katapult/katapult-14.0.0.spec
+++ b/redhat/applications/katapult/katapult-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: Faster access to applications, bookmarks, and other items.
Version: 0.3.2.1
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -72,7 +72,6 @@ inspired by Quicksilver for OS X.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -178,26 +177,5 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-7
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-8
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-6
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-5
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-4
-- Rebuilt for Fedora 17
-- Fix post and postun
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-3
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-2
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1
-- Initial release for RHEL 6.0
-- Import to GIT
-
diff --git a/redhat/applications/kbarcode/kbarcode-14.0.0.spec b/redhat/applications/kbarcode/kbarcode-14.0.0.spec
index df1d46ae7..0eba22150 100644
--- a/redhat/applications/kbarcode/kbarcode-14.0.0.spec
+++ b/redhat/applications/kbarcode/kbarcode-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: barcode and label printing application for Trinity
Version: 2.0.6
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -117,7 +117,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__make install DESTDIR=%{buildroot}
-%find_lang %{tde_pkg} || touch %{tde_pkg}.lang
+%find_lang %{tde_pkg}
@@ -158,14 +158,5 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.6-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbfx/kbfx-14.0.0.spec b/redhat/applications/kbfx/kbfx-14.0.0.spec
index c0a68598e..b8be0817c 100644
--- a/redhat/applications/kbfx/kbfx-14.0.0.spec
+++ b/redhat/applications/kbfx/kbfx-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: an alternative to K-Menu for TDE [Trinity]
Version: 0.4.9.3.1
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -78,7 +78,6 @@ Homepage: http://www.kbfx.org
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}"
# Shitty hack for RHEL4 ...
if [ -d "/usr/X11R6" ]; then
@@ -177,14 +176,5 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-2
-- Initial release for TDE 3.5.13.1
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbookreader/kbookreader-14.0.0.spec b/redhat/applications/kbookreader/kbookreader-14.0.0.spec
index 4bf3a7adc..f028a2c01 100644
--- a/redhat/applications/kbookreader/kbookreader-14.0.0.spec
+++ b/redhat/applications/kbookreader/kbookreader-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: eBook reader for Trinity.
Version: 0.2.0
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -70,7 +70,6 @@ within the Trinity Desktop Environment.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -123,19 +122,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.0-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.0-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.0-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.0-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.0-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.0-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
index db1c5cb93..7436ffa4b 100644
--- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
+++ b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
@@ -85,7 +85,6 @@ support. Correctly detects and shows encoding of any valid chm file.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{_includedir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
@@ -150,19 +149,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.1.2-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.1.2-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.1.2-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.1.2-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.1.2-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.1.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec
index 38fe4a4b9..3ce2c1b11 100644
--- a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec
+++ b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-kcmautostart
Summary: Manage applications automatic startup.
Version: 1.0
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -70,7 +70,6 @@ Requires: trinity-tdebase >= %{tde_version}
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -113,14 +112,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-5
- Initial release for TDE 14.0.0
-
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial release for TDE 3.5.13.1
-
-* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for TDE 3.5.13
diff --git a/redhat/applications/kcpuload/kcpuload-14.0.0.spec b/redhat/applications/kcpuload/kcpuload-14.0.0.spec
index 0b4c6fc56..73396a40b 100644
--- a/redhat/applications/kcpuload/kcpuload-14.0.0.spec
+++ b/redhat/applications/kcpuload/kcpuload-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: a CPU meter for Kicker [Trinity]
Version: 2.00
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -75,7 +75,6 @@ KCPULoad has support for SMP and separate user/system loads.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -130,19 +129,5 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.00-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.00-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.00-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.00-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
index 1adcecee7..40b9dad96 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
@@ -28,7 +28,7 @@ Name: trinity-%{tde_pkg}
Summary: a DBUS notification service [Trinity]
Version: 0.1
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -48,7 +48,6 @@ 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}
@@ -119,22 +118,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-6
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-7
- Initial release for TDE 14.0.0
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-5
-- Fix UTF8 messages
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.1-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.1-2
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Removes post and postun
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.1-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kdiff3/kdiff3-14.0.0.spec b/redhat/applications/kdiff3/kdiff3-14.0.0.spec
index 2b16f5a83..acc367114 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:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -52,7 +52,7 @@ BuildRequires: desktop-file-utils
Shows the differences line by line and character by character (!).
Provides an automatic merge-facility and
an integrated editor for comfortable solving of merge-conflicts.
-Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.).
+Supports TDEIO on TDE (allows accessing ftp, sftp, fish, smb etc.).
Unicode & UTF-8 support
@@ -72,7 +72,6 @@ Unicode & UTF-8 support
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -89,7 +88,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--enable-final \
--enable-closure \
--enable-rpath \
- --enable-gcc-hidden-visibility
+ --disable-gcc-hidden-visibility
%__make %{?_smp_mflags}
@@ -100,10 +99,12 @@ export PATH="%{tde_bindir}:${PATH}"
%__make install DESTDIR=%{buildroot}
# Unwanted files
+# These are not HTML files but weird files in wrong place ??
%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/
%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
@@ -141,35 +142,5 @@ done
%{tde_tdelibdir}/libkdiff3plugin.so
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-8
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-9
- 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
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-5
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-4
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Fix post and postun
-- Rename old tq methods that no longer need a unique name [Commit #c7e29c46]
-- Remove additional unneeded tq method conversions [Commit #9b57232f]
-- Rename obsolete tq methods to standard names [Commit #d654b107]
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/kdirstat/kdirstat-14.0.0.spec b/redhat/applications/kdirstat/kdirstat-14.0.0.spec
index 73f3fd138..57b0d0ff6 100644
--- a/redhat/applications/kdirstat/kdirstat-14.0.0.spec
+++ b/redhat/applications/kdirstat/kdirstat-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: graphical disk usage display with cleanup facilities [Trinity]
Version: 2.4.4
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -77,7 +77,6 @@ own cleanup actions.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -105,11 +104,9 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-
%find_lang %{tde_pkg}
-
%clean
%__rm -rf %{buildroot}
@@ -140,18 +137,5 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.4.4-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.4.4-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.4.4-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.4.4-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/keep/keep-14.0.0.spec b/redhat/applications/keep/keep-14.0.0.spec
index 6f566a651..5c41623e0 100644
--- a/redhat/applications/keep/keep-14.0.0.spec
+++ b/redhat/applications/keep/keep-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: backup system for TDE [Trinity]
Version: 0.4.0
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -132,17 +132,5 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-2
-- Rebuilt for Fedora 17
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
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 dde115235..93805017e 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: Use TDE dialogs in Gtk apps
Version: 0.10.2
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -71,11 +71,8 @@ This package includes the kqt3-wrapper
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -L${QTLIB} -lX11"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
cd build
@@ -134,21 +131,5 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
%{tde_datadir}/kgtk/preload
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.2-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.2-7
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.2-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Aug 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-3
-- Add 'preload' file for startkde script
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kile/kile-14.0.0.spec b/redhat/applications/kile/kile-14.0.0.spec
index 9ec02dc13..eaac1e766 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:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Publishing
@@ -126,7 +126,6 @@ Kile can support large projects consisting of several smaller files.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -199,24 +198,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-7
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-8
- 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
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-4
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
-- Rebuilt for Fedora 17
-- Removes the XPM icon
-
-* Fri Apr 20 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-2
-- Fix file conflict with trinity-kdelibs
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kima/kima-14.0.0.spec b/redhat/applications/kima/kima-14.0.0.spec
index f0d466011..9b3ff411a 100644
--- a/redhat/applications/kima/kima-14.0.0.spec
+++ b/redhat/applications/kima/kima-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: kicker monitoring applet [Trinity]
Version: 0.7.3.2
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -72,7 +72,6 @@ panel.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -119,18 +118,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kiosktool/kiosktool-14.0.0.spec b/redhat/applications/kiosktool/kiosktool-14.0.0.spec
index 082bac20f..343263501 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:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
Summary: tool to configure the TDE kiosk framework
License: GPLv2+
@@ -71,8 +71,6 @@ groups of users.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
%configure \
--prefix=%{tde_prefix} \
@@ -131,21 +129,5 @@ update-desktop-database >& /dev/null ||:
%{tde_datadir}/apps/kiosktool/kiosktoolui.rc
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-6
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-7
- 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
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
index f4b1c533b..e56a2595a 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec
+++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: media player for Trinity
Version: 0.10.0c
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
@@ -47,6 +47,10 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+# DBUS support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
+%endif
# GSTREAMER support
%if 0%{?mgaversion} || 0%{?mdkversion}
@@ -61,7 +65,7 @@ BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-devel
%endif
-%if 0%{?rhel} >= 5|| 0%{?fedora}
+%if 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-base-devel
%endif
@@ -149,7 +153,6 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
%build
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}"
%configure \
@@ -248,21 +251,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-7
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-5
-- Initial release for TDE 3.5.13.2
-
-* Sat Nov 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-4
-- Fix xine 1.2 support (openSUSE 12.2 only)
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2
-- Fix compilation with GCC 4.7 [Commit #5106117b]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
index 00e428623..2b74b4528 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: iptables based firewall configuration tool for TDE [Trinity]
Version: 1.1.1
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -85,7 +85,6 @@ Requires: %{name} = %{version}-%{release}
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -198,18 +197,5 @@ done
%{tde_libdir}/libkmfwidgets.so
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2
-- GCC 4.7 fixes. [Commit #88d2d2a7]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index 04d8b93a9..ae3161d3c 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:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -107,10 +107,6 @@ This package contains development files needed for KMyMoney plugins.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013
-%__cp /usr/share/automake-1.13/test-driver admin/
-%endif
-
%__install -m644 %{SOURCE1} kmymoney2/widgets/
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
@@ -121,7 +117,6 @@ This package contains development files needed for KMyMoney plugins.
%build
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}"
# Fix strange FTBFS on RHEL4
@@ -231,24 +226,5 @@ done
%{_libdir}/tqt3/plugins/designer/libkmymoney.so
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-6
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-7
- 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
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Rebuild for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Sun Jan 15 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Updates to upstream 1.0.5
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo-14.0.0.spec
index b706ec858..790289a78 100644
--- a/redhat/applications/knemo/knemo-14.0.0.spec
+++ b/redhat/applications/knemo/knemo-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: network interfaces monitor for the Trinity systray
Version: 0.4.8
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -140,17 +140,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2
-- Rebuild for Fedora 17
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetload/knetload-14.0.0.spec b/redhat/applications/knetload/knetload-14.0.0.spec
index cb95c71e4..a28673fcb 100644
--- a/redhat/applications/knetload/knetload-14.0.0.spec
+++ b/redhat/applications/knetload/knetload-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: a network meter for Kicker [Trinity]
Version: 2.3
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -76,7 +76,6 @@ KNetLoad can monitor just about any network device.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -137,17 +136,5 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.3-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.3-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.3-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-2
-- Rebuild for Fedora 17
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetstats/knetstats-14.0.0.spec b/redhat/applications/knetstats/knetstats-14.0.0.spec
index 221a8120f..d0a96a729 100644
--- a/redhat/applications/knetstats/knetstats-14.0.0.spec
+++ b/redhat/applications/knetstats/knetstats-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: network interfaces monitor for the Trinity systray
Version: 1.6.1
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -71,7 +71,6 @@ network interface on a system tray icon
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -128,14 +127,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.1-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.1-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.1-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.1-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knights/knights-14.0.0.spec b/redhat/applications/knights/knights-14.0.0.spec
index 2987e70f9..d990d0a3b 100644
--- a/redhat/applications/knights/knights-14.0.0.spec
+++ b/redhat/applications/knights/knights-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: A chess interface for the K Desktop Environment [Trinity]
Version: 0.6
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Amusements/Games
@@ -82,7 +82,6 @@ Here's a quick list of Knights' key features:
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Warning: --enable-final causes FTBFS
%configure \
@@ -112,6 +111,7 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
@@ -136,20 +136,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6-7
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.6-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-4
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-3
-- Rebuild for Fedora 17
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-2
-- Fix HTML directory location
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knowit/knowit-14.0.0.spec b/redhat/applications/knowit/knowit-14.0.0.spec
index c80b8399c..22a0b0c17 100644
--- a/redhat/applications/knowit/knowit-14.0.0.spec
+++ b/redhat/applications/knowit/knowit-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: Tool for managing notes [Trinity]
Version: 0.10
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -139,14 +139,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.10-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.10-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knutclient/knutclient-14.0.0.spec b/redhat/applications/knutclient/knutclient-14.0.0.spec
index 7361bdc87..9f975f029 100644
--- a/redhat/applications/knutclient/knutclient-14.0.0.spec
+++ b/redhat/applications/knutclient/knutclient-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity]
Version: 0.9.5
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -72,7 +72,6 @@ stations using an UPS.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -131,18 +130,5 @@ done
%{tde_datadir}/icons/locolor/*/apps/*.png
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.5-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.5-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.5-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2
-- Rebuild for Fedora 17
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
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 12327fbac..ca908abf0 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
+++ b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
@@ -1,5 +1,5 @@
# Default version for this component
-%define tde_pkg abakus
+%define tde_pkg koffice-i18n
%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".
@@ -29,10 +29,10 @@
%endif
-Name: trinity-koffice-i18n
+Name: trinity-%{tde_pkg}
Summary: Internationalization support for Trinity
Version: 1.6.3
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
@@ -44,7 +44,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
License: GFDL
Group: User Interface/Desktops
-BuildArch: noarch
+BuildArch: noarch
# Speed build options
%define debug_package %{nil}
@@ -63,7 +63,6 @@ BuildRequires: findutils
BuildRequires: gettext
BuildRequires: autoconf automake libtool m4
-
%description
%{summary}.
@@ -1081,15 +1080,5 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
%endif
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial release for TDE 3.5.13
-
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 25d371e3a..1ce075d4e 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -27,7 +27,7 @@
%define _docdir %{tde_docdir}
# Disable Kross support for RHEL <= 5 (python is too old)
-%if 0%{?fedora} > 0 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_kross 1
%endif
@@ -41,7 +41,7 @@
Name: trinity-%{tde_pkg}
Summary: An integrated office suite
Version: 1.6.3
-Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:10}%{?preversion:9_%{preversion}}%{?dist}%{?_variant}
Group: Applications/Productivity
License: GPLv2+
@@ -55,7 +55,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
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
@@ -1063,16 +1062,6 @@ This package is part of the TDE Office Suite.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013
-%__cp /usr/share/automake-1.13/test-driver admin/
-%endif
-
-# use LGC variant instead
-%__sed -i.dejavu-lgc \
- -e 's|DejaVu Sans|DejaVu LGC Sans|' \
- -e 's|dejavu sans|dejavu lgc sans|' \
- lib/kformula/{contextstyle,fontstyle,symboltable}.cc
-
%__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"
@@ -1081,7 +1070,6 @@ This package is part of the TDE Office Suite.
%build
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}"
%if 0%{?suse_version} == 1220
@@ -1113,14 +1101,13 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
%{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
%{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-
# Replace absolute symlinks with relative ones
pushd %{buildroot}%{tde_tdedocdir}/HTML
for lang in *; do
@@ -1163,38 +1150,5 @@ rm -f %{buildroot}%{tde_libdir}/libkugar*.so
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-8
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-10
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-7
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-6
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-5
-- Fix kformula dependancies (for RHEL6)
-- Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3]
- Clean up lib paths in LDFLAGS - moved to LIBADD
- For KWord and and KPresenter added linking kspell2
- For KSpread added linking kutils
-- Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307]
-
-* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-4
-- Updates BuildRequires
-- Build for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-- Fix compilation with Ruby 1.9 [Bug #735]
-- Fix compilation with libpng [Bug #603]
-
-* Sat Jan 07 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-3
-- Fix GraphicksMagick 1.3 support [Bug #353]
-- Various patches for kexi [Bug #777]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2
-- Fix HTML directory location
-
-* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn'
-- Removed 'krita', added 'chalk'
diff --git a/redhat/applications/konversation/konversation-14.0.0.spec b/redhat/applications/konversation/konversation-14.0.0.spec
index 1281b59a1..6e2cc2865 100644
--- a/redhat/applications/konversation/konversation-14.0.0.spec
+++ b/redhat/applications/konversation/konversation-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: user friendly Internet Relay Chat (IRC) client for TDE [Trinity]
Version: 1.1
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -102,7 +102,6 @@ and experienced users alike will appreciate its many features:
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -179,24 +178,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.1-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.1-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.1-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-3
-- Initial release for TDE 3.5.13.1
-
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-2
-- Rebuild for Fedora 17
-- Fix HTML directory location
-- Rename old tq methods that no longer need a unique name [Commit #01f5ea83]
-- Remove additional unneeded tq method conversions [Commit #efdae4e7]
-- Rename obsolete tq methods to standard names [Commit #c64099e5]
-- Fix linear alphabet string errors [Commit #440010aa]
-- Fix inadvertent "TQ" changes. [Commit #ca3d6cef]
-
-* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 1.1-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
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 e2f290bf1..907bf5029 100644
--- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
+++ b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
@@ -32,7 +32,7 @@
Name: trinity-%{tde_pkg}
Summary: Off-The-Record encryption for Kopete [Trinity]
Version: 0.7
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -84,7 +84,6 @@ users with IM-Cients supporting the OTR encryption method.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -151,18 +150,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
-- Rebuild for Fedora 17
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kpicosim/kpicosim-14.0.0.spec b/redhat/applications/kpicosim/kpicosim-14.0.0.spec
index 4e3b0f149..dd7b074ab 100644
--- a/redhat/applications/kpicosim/kpicosim-14.0.0.spec
+++ b/redhat/applications/kpicosim/kpicosim-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
Version: 0.6a
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -103,9 +103,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__make install DESTDIR=%{buildroot}
-%find_lang %{tde_pkg}
-
-
%clean
%__rm -rf %{buildroot}
@@ -119,7 +116,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-%files -f %{tde_pkg}.lang
+%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{tde_bindir}/kpicosim
@@ -131,14 +128,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6a-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6a-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.6a-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.6a-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6a-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index 5a1277743..807c4c5a7 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:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -75,7 +75,6 @@ and synchronize the built-in applications with their TDE counterparts.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -176,20 +175,5 @@ done
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-6
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-7
- 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
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
-- Rebuild for Fedora 17
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpowersave/kpowersave-14.0.0.spec b/redhat/applications/kpowersave/kpowersave-14.0.0.spec
index 5cc274820..e3a7459e4 100644
--- a/redhat/applications/kpowersave/kpowersave-14.0.0.spec
+++ b/redhat/applications/kpowersave/kpowersave-14.0.0.spec
@@ -26,7 +26,7 @@
Name: trinity-%{tde_pkg}
Version: 0.7.3
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
Summary: HAL based power management applet for Trinityfiles or directories.
License: GPLv2+
@@ -94,7 +94,6 @@ settings for:
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
@@ -103,6 +102,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_tdeincludedir} \
@@ -153,18 +160,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/config/kpowersaverc
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-3
-- Initial release for TDE 3.5.13.1
-
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2
-- Add missing /sbin/ldconfig
-- Add missing doc file
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/krename/krename-14.0.0.spec b/redhat/applications/krename/krename-14.0.0.spec
index 90b0d8e92..accd9113b 100644
--- a/redhat/applications/krename/krename-14.0.0.spec
+++ b/redhat/applications/krename/krename-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: A TDE batch file renaming utility.
Version: 3.0.14
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -70,7 +70,6 @@ or Exif informations of an image.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -132,28 +131,5 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.0.14-7
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.0.14-8
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.0.14-6
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-5
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-4
-- Rebuild for Fedora 17
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/krusader/krusader-14.0.0.spec b/redhat/applications/krusader/krusader-14.0.0.spec
index 711b92385..b27bf9060 100644
--- a/redhat/applications/krusader/krusader-14.0.0.spec
+++ b/redhat/applications/krusader/krusader-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: twin-panel (commander-style) file manager for TDE (and other desktops)
Version: 1.90.0
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -86,7 +86,6 @@ great on your desktop.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Warning: --enable-final causes FTBFS
%configure \
@@ -116,6 +115,7 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
@@ -156,19 +156,5 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.90.0-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.90.0-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.90.0-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2
-- Rebuild for Fedora 17
-- GCC 4.7 fixes. [Commit #fdf6d340]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kshutdown/kshutdown-14.0.0.spec b/redhat/applications/kshutdown/kshutdown-14.0.0.spec
index fbef4a43d..0ee4ac9af 100644
--- a/redhat/applications/kshutdown/kshutdown-14.0.0.spec
+++ b/redhat/applications/kshutdown/kshutdown-14.0.0.spec
@@ -69,7 +69,6 @@ and sounds.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec
index 51a50a3c2..539f30120 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
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: fading splash screen engine for Trinity
Version: 0.4.2
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -84,7 +84,6 @@ Homepage: http://moodwrod.com
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -126,18 +125,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.2-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.2-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.2-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-2
-- Rebuild for Fedora 17
-- Removes post and postun
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
index 0599bcff8..340f77a56 100644
--- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
+++ b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: Powerful Trinity image viewer
Version: 0.8.0
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Amusements/Games
@@ -77,7 +77,6 @@ OpenGL and dynamic format support.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
@@ -151,18 +150,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_mandir}/man1/ksquirrel.1
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1-2
-- Rebuild for Fedora 17
-- Fix HTML directory location
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index f8113f280..c32baae1b 100644
--- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
@@ -28,7 +28,7 @@ Name: trinity-%{tde_pkg}
Summary: TDE frontend for streamripper
Version: 0.3.4
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -70,7 +70,6 @@ you with managing/ripping your preferred streams.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export QTDIR=/usr
scons -Q -j4
@@ -96,14 +95,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.4-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.4-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.4-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.4-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.4-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec
index fcd4c1d09..88f7e4f46 100644
--- a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec
+++ b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: system log viewer tool for Trinity
Version: 0.3.2
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/System
@@ -74,7 +74,6 @@ quickly see problems occuring on their server.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -84,8 +83,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}
@@ -121,15 +126,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/ktechlab/ktechlab-14.0.0.spec b/redhat/applications/ktechlab/ktechlab-14.0.0.spec
index 2ed7c5c2f..2417c0fe8 100644
--- a/redhat/applications/ktechlab/ktechlab-14.0.0.spec
+++ b/redhat/applications/ktechlab/ktechlab-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: circuit simulator for microcontrollers and electronics [Trinity]
Version: 0.3
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -74,7 +74,6 @@ Homepage: http://ktechlab.org/
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Warning: --enable-final causes FTBFS
%configure \
@@ -134,18 +133,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3-3
-- Initial release for TDE 3.5.13.1
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Fix list of icons to install [Bug #990]
diff --git a/redhat/applications/ktorrent/ktorrent-14.0.0.spec b/redhat/applications/ktorrent/ktorrent-14.0.0.spec
index ba5a8c631..e6ee9b499 100644
--- a/redhat/applications/ktorrent/ktorrent-14.0.0.spec
+++ b/redhat/applications/ktorrent/ktorrent-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: BitTorrent client for Trinity
Version: 2.2.8
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -50,6 +50,21 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
+# AVAHI support
+# Disabled on RHEL4 and RHEL5
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%define with_avahi 1
+BuildRequires: trinity-avahi-tqt-devel
+Requires: trinity-avahi-tqt
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}avahi-client-devel
+Requires: %{_lib}avahi-client3
+%else
+BuildRequires: avahi-devel
+Requires: avahi
+%endif
+%endif
+
%description
KTorrent is a BitTorrent program for Trinity. Its features include speed capping
@@ -74,7 +89,6 @@ enabling background downloading.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix="%{tde_prefix}" \
@@ -91,7 +105,9 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--enable-new-ldflags \
--enable-closure \
--enable-rpath \
- --disable-gcc-hidden-visibility
+ --disable-gcc-hidden-visibility \
+ \
+ %{?!with_avahi:--without-avahi}
# Not SMP safe !
@@ -165,26 +181,12 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/services/*.desktop
%{tde_datadir}/servicetypes/ktorrentplugin.desktop
+%if 0%{?with_avahi}
+%{tde_tdelibdir}/ktzeroconfplugin.la
+%{tde_tdelibdir}/ktzeroconfplugin.so
+%endif
+
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.8-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.8-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.8-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.8-2
-- Initial release for TDE 3.5.13.1
-
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.8-1
-- Rename old tq methods that no longer need a unique name [Commit #a90eb215]
-- Remove additional unneeded tq method conversions [Commit #bb37c405]
-- Rename obsolete tq methods to standard names [Commit #0d48fca8]
-- Rename a few stragglers [Commit #c3480dfe]
-- Fix inadvertent "TQ" changes. [Commit #445a5152]
-- Fix configure output message to clarify that missing avahi support is caused by missing avahi-tqt package as well as avahi-client. [Commit #03d0c794]
-- Update ktorrent package to 2.2.8 and fix internal geoip database. [Bug #363] [Commit #5af9907f]
-- Change default configuration to use external geoip database when found and use internal database only when external database is not found. [Bug #443] [Commit #355c6b69]
-
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kuickshow/kuickshow-14.0.0.spec b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
index 6a5d7ac82..2affe08e7 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:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -75,7 +75,6 @@ Clicking on an image shows the image in its normal size.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -132,33 +131,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-8
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-9
- 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
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-5
-- Initial release for TDE 3.5.13.1
-
-* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
-- Removes conflict with 'kdegraphics'
-
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
-- Rename old tq methods that no longer need a unique name [Commit #8712ab46]
-- Remove additional unneeded tq method conversions [Commit #28d9c774]
-- Rename obsolete tq methods to standard names [Commit #bdeb8b3a]
-- Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec
index 25a80b1c0..7b5242932 100644
--- a/redhat/applications/kvirc/kvirc-14.0.0.spec
+++ b/redhat/applications/kvirc/kvirc-14.0.0.spec
@@ -1,4 +1,4 @@
-# REMOVE TDELIBS4-DEVEL before building !!!!
+# REMOVE KDELIBS4-DEVEL before building !!!!
# Default version for this component
%define tde_pkg kvirc
@@ -29,7 +29,7 @@
Name: trinity-%{tde_pkg}
Summary: Trinity based next generation IRC client with module support
Version: 3.4.0
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -43,8 +43,6 @@ 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}
@@ -101,9 +99,7 @@ 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 !
%__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"
@@ -113,7 +109,6 @@ with the K Desktop Environment version 3.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -145,8 +140,7 @@ 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
@@ -156,8 +150,8 @@ export PATH="%{tde_bindir}:${PATH}"
# Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ...
%__mv \
- %{?buildroot}%{tde_libdir}/kvirc/3.4/license/COPYING \
- %{?buildroot}%{tde_libdir}/kvirc/3.4/license/EULA
+ %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \
+ %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA
%clean
@@ -191,7 +185,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{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
@@ -202,30 +196,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_includedir}/kvirc/
%{tde_libdir}/*.la
%{tde_libdir}/*.so
-#%{tde_libdir}/kvirc/*/modules/*.la
+%{tde_libdir}/kvirc/*/modules/*.la
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.4.0-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.4.0-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.4.0-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-3
-- Initial release for TDE 3.5.13.1
-
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-2
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Rename old tq methods that no longer need a unique name [Commit #32a249ba]
-- Remove additional unneeded tq method conversions [Commit #f9114981]
-- Rename obsolete tq methods to standard names [Commit #2dd6d32b]
-- Rename a few stragglers [Commit #1c00d6ff]
-- Fix FTBFS [Commits #ff96f491, #2285efe5]
-- Fix linear alphabet string errors [Commit #51bbe9e5]
-- Fix inadvertent "TQ" changes. [Commit #a24a8595]
-- Fix "acinclude.m4" file [Bug #980]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.4.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kvkbd/kvkbd-14.0.0.spec b/redhat/applications/kvkbd/kvkbd-14.0.0.spec
index d220cd3f2..dcd7d98c9 100644
--- a/redhat/applications/kvkbd/kvkbd-14.0.0.spec
+++ b/redhat/applications/kvkbd/kvkbd-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: Virtual keyboard for TDE [Trinity]
Version: 0.4.8
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/System
@@ -121,15 +121,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab-14.0.0.spec
index 89a610f00..c71adc799 100644
--- a/redhat/applications/piklab/piklab-14.0.0.spec
+++ b/redhat/applications/piklab/piklab-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: IDE for PIC-microcontroller development [Trinity]
Version: 0.15.2
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -76,7 +76,6 @@ are supported. A command-line programmer and debugger are also available.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Warning: --enable-final causes FTBFS
%configure \
@@ -146,21 +145,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.15.2-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.15.2-7
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.15.2-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3
-- Fix MAN directory location
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/potracegui/potracegui-14.0.0.spec b/redhat/applications/potracegui/potracegui-14.0.0.spec
index 377bfb89b..e896595f4 100644
--- a/redhat/applications/potracegui/potracegui-14.0.0.spec
+++ b/redhat/applications/potracegui/potracegui-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: TDE frontend for potrace [Trinity]
Version: 1.3
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
@@ -71,7 +71,6 @@ remote files (web, ftp, ...) is also supported.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -127,15 +126,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.3-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.3-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.3-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.3-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
index 5101d626e..563afa384 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:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
@@ -126,8 +126,6 @@ This package provides the data files necessary for running Rosegarden
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}::%{tde_tdeincludedir}"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
@@ -219,21 +217,5 @@ done
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-6
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-7
- 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
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-3
-- Initial release for TDE 3.5.13.1
-
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2
-- Updated to build with gcc 4.7. [Commit #15276f36]
-- Enables JACK support
-
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
index 132e2a87c..aefc18948 100644
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: SmartCard Login and LUKS Decrypt, Setup Utility
Version: 1.0
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/System
@@ -79,7 +79,6 @@ in addition to the PKCS certificate functionality
%prep
-unset QTDIR QTINC QTLIB
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__sed -i "Makefile" \
@@ -88,7 +87,6 @@ unset QTDIR QTINC QTLIB
%build
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
./build_ckpasswd
@@ -143,15 +141,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/smb4k/smb4k-14.0.0.spec b/redhat/applications/smb4k/smb4k-14.0.0.spec
index c020d0a54..fb499cc17 100644
--- a/redhat/applications/smb4k/smb4k-14.0.0.spec
+++ b/redhat/applications/smb4k/smb4k-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: A Samba (SMB) share advanced browser for Trinity
Version: 0.9.4
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -141,9 +141,6 @@ Requires: %{name} = %{version}-%{release}
%build
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} \
@@ -179,18 +176,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.4-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.4-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.4-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.4-3
-- Initial release for TDE 3.5.13.1
-
-* Sun Apr 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.4-2
-- Rebuild for Fedora 17
-- Fix compilation with GCC 4.7 |Commit #b4c7fd48]
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.4-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
index a87b2e237..971e26a8c 100644
--- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
+++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: audio converter frontend for Trinity
Version: 0.3.8
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Application/Multimedia
@@ -95,7 +95,6 @@ See the 'soundkonverter-trinity' package for more information.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -176,15 +175,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.8-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.8-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.8-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.8-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
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 cb52e1835..1cd956ab3 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -1,8 +1,8 @@
# Default version for this component
-%define tde_pkg abakus
+%define tde_pkg tde-guidance
%define tde_version 14.0.0
-# REMOVE TDELIBS4-DEVEL before building !!!!
+# REMOVE KDELIBS4-DEVEL before building !!!!
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -29,10 +29,10 @@
%define __arch_install_post %{nil}
-Name: trinity-tde-guidance
+Name: trinity-%{tde_pkg}
Summary: A collection of system administration tools for Trinity
Version: 0.8.0svn20080103
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -46,6 +46,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch1: tde-guidance-14.0.0-tqt3.patch
+
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -78,20 +80,17 @@ BuildRequires: trinity-python-trinity-devel
BuildRequires: trinity-pytqt-tools
Requires: trinity-python-tqt
-
Requires: trinity-python-trinity
Requires: trinity-pytdeextensions
-Requires: %{name}-backends = %{version}-%{release}
Requires: python
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
Requires: hwdata
%endif
+Requires: %{name}-backends = %{version}-%{release}
-%if "%{tde_prefix}" == "/usr"
-Conflicts: guidance-power-manager
-Conflicts: kde-guidance-powermanager
-%endif
+# POWERMANAGER support (requires HAL)
+#define with_powermanager 1
Obsoletes: trinity-guidance < %{version}-%{release}
Provides: trinity-guidance = %{version}-%{release}
@@ -107,7 +106,62 @@ look after your system:
These tools are available in Trinity Control Center, System Settings
or can be run as standalone applications.
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING README TODO
+#%{tde_bindir}/displayconfig
+#%{tde_bindir}/displayconfig-restore
+%{tde_bindir}/grubconfig
+%{tde_bindir}/mountconfig
+%{tde_bindir}/serviceconfig
+%{tde_bindir}/userconfig
+%{tde_bindir}/wineconfig
+%attr(0644,root,root) %{tde_tdelibdir}/*.so
+%attr(0644,root,root) %{tde_tdelibdir}/*.la
+%{tde_datadir}/apps/guidance/
+%{tde_tdeappdir}/*.desktop
+%{tde_datadir}/icons/crystalsvg/*/*/*.png
+%{tde_datadir}/icons/crystalsvg/*/*/*.svg
+%{python_sitearch}/%{name}/SMBShareSelectDialog.py*
+%{python_sitearch}/%{name}/SimpleCommandRunner.py*
+%{python_sitearch}/%{name}/fuser.py*
+%{python_sitearch}/%{name}/fuser_ui.py*
+%{python_sitearch}/%{name}/grubconfig.py*
+%{python_sitearch}/%{name}/ktimerdialog.py*
+%{python_sitearch}/%{name}/mountconfig.py*
+%{python_sitearch}/%{name}/servertestdialog.py*
+%{python_sitearch}/%{name}/serviceconfig.py*
+%{python_sitearch}/%{name}/sizeview.py*
+%{python_sitearch}/%{name}/unixauthdb.py*
+%{python_sitearch}/%{name}/userconfig.py*
+%{python_sitearch}/%{name}/wineconfig.py*
+%{tde_tdedocdir}/HTML/en/guidance/
+
+# Files from backends
+%exclude %{tde_datadir}/apps/guidance/vesamodes
+%exclude %{tde_datadir}/apps/guidance/extramodes
+%exclude %{tde_datadir}/apps/guidance/widescreenmodes
+%exclude %{tde_datadir}/apps/guidance/Cards+
+%exclude %{tde_datadir}/apps/guidance/pcitable
+%exclude %{tde_datadir}/apps/guidance/MonitorsDB
+
+# Files from powermanager
+%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
+%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
+%exclude %{tde_datadir}/apps/guidance/pics/processor.png
+
+%post
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+/sbin/ldconfig || :
+
+%postun
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+/sbin/ldconfig || :
+##########
%package backends
Group: Applications/Utilities
@@ -124,34 +178,100 @@ Provides: trinity-guidance-backends = %{version}-%{release}
This package contains the platform neutral backends used in the
Guidance configuration tools.
+%files backends
+%defattr(-,root,root,-)
+%{python_sitearch}/%{name}/MicroHAL.py*
+%{python_sitearch}/%{name}/ScanPCI.py*
+%{python_sitearch}/%{name}/infimport.py*
+%{python_sitearch}/%{name}/displayconfigabstraction.py*
+%{python_sitearch}/%{name}/displayconfig-hwprobe.py*
+%{python_sitearch}/%{name}/displayconfig-restore.py*
+%{python_sitearch}/%{name}/drivedetect.py*
+%{python_sitearch}/%{name}/execwithcapture.py*
+%{python_sitearch}/%{name}/wineread.py*
+%{python_sitearch}/%{name}/winewrite.py*
+%{python_sitearch}/%{name}/xf86misc.py*
+%{python_sitearch}/%{name}/xorgconfig.py*
+%{python_sitearch}/ixf86misc.so
+%{tde_datadir}/apps/guidance/vesamodes
+%{tde_datadir}/apps/guidance/extramodes
+%{tde_datadir}/apps/guidance/widescreenmodes
+%{tde_datadir}/apps/guidance/Cards+
+%{tde_datadir}/apps/guidance/pcitable
+%{tde_datadir}/apps/guidance/MonitorsDB
+
+##########
+
+%if 0%{?with_powermanager}
%package powermanager
Group: Applications/Utilities
Summary: HAL based power manager applet [Trinity]
Requires: %{name} = %{version}-%{release}
+Requires: hal
Obsoletes: trinity-guidance-powermanager < %{version}-%{release}
Provides: trinity-guidance-powermanager = %{version}-%{release}
+%if "%{tde_prefix}" == "/usr"
+Conflicts: guidance-power-manager
+Conflicts: kde-guidance-powermanager
+%endif
+
%description powermanager
A power management applet to indicate battery levels and perform hibernate or
suspend using HAL.
+%files powermanager
+%defattr(-,root,root,-)
+%{tde_bindir}/guidance-power-manager
+%{python_sitearch}/%{name}/MicroHAL.py*
+%{python_sitearch}/%{name}/guidance-power-manager.py*
+%{python_sitearch}/%{name}/powermanage.py*
+%{python_sitearch}/%{name}/gpmhelper.py*
+%{python_sitearch}/%{name}/powermanager_ui.py*
+%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
+%{python_sitearch}/%{name}/notify.py*
+%{python_sitearch}/%{name}/tooltip.py*
+%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%{tde_datadir}/apps/guidance/pics/ac-adapter.png
+%{tde_datadir}/apps/guidance/pics/battery*.png
+%{tde_datadir}/apps/guidance/pics/processor.png
+%{tde_datadir}/autostart/guidance-power-manager.desktop
+
+%post powermanager
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+%postun powermanager
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+%endif
+
+##########
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
+##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .tqt3
+
+%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
+%__sed -i "userconfig/unixauthdb.py" \
+ -e "s|self.first_uid = .*|self.first_uid = 500|" \
+ -e "s|self.first_gid = .*|self.first_gid = 500|"
+%endif
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export TDEDIR=%{tde_prefix}
+
# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
export PYTHONDONTWRITEBYTECODE=
@@ -171,12 +291,8 @@ fi
%install
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-# For RHEL4 only
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-
# For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled.
export PYTHONDONTWRITEBYTECODE=
@@ -207,7 +323,7 @@ done
%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
# fix binary-or-shlib-defines-rpath
-chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so
+chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so
# fix executable-not-elf-or-script
%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png
@@ -232,7 +348,7 @@ chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so
%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
-%__mv -f %{buildroot}%{tde_datadir}/applications/tde/displayconfig.desktop %{buildroot}%{tde_datadir}/applications/tde/guidance-displayconfig.desktop
+%__mv -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop %{buildroot}%{tde_tdeappdir}/guidance-displayconfig.desktop
##### BACKENDS INSTALLATION
# install displayconfig-hwprobe.py script
@@ -248,7 +364,7 @@ chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so
%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
%endif
-
+%if 0%{?with_powermanager}
##### POWERMANAGER INSTALLATION
# install icon to right place
%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
@@ -277,6 +393,15 @@ chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
+%else
+
+%__rm -f %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py*
+%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance-power-manager.py*
+%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
+%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py*
+%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py*
+
+%endif
# Replace all '#!' calls to python with /usr/bin/python
# and make them executable
@@ -307,133 +432,6 @@ find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
%__rm -rf %{buildroot}
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%post powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-#%{tde_bindir}/displayconfig
-#%{tde_bindir}/displayconfig-restore
-%{tde_bindir}/grubconfig
-%{tde_bindir}/mountconfig
-%{tde_bindir}/serviceconfig
-%{tde_bindir}/userconfig
-%{tde_bindir}/wineconfig
-%attr(0644,root,root) %{tde_tdelibdir}/*.so
-%attr(0644,root,root) %{tde_tdelibdir}/*.la
-%{tde_datadir}/apps/guidance/
-%{tde_datadir}/applications/tde/*.desktop
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/*/*.svg
-%{python_sitearch}/%{name}/SMBShareSelectDialog.py*
-%{python_sitearch}/%{name}/SimpleCommandRunner.py*
-%{python_sitearch}/%{name}/fuser.py*
-%{python_sitearch}/%{name}/fuser_ui.py*
-%{python_sitearch}/%{name}/grubconfig.py*
-%{python_sitearch}/%{name}/ktimerdialog.py*
-%{python_sitearch}/%{name}/mountconfig.py*
-%{python_sitearch}/%{name}/servertestdialog.py*
-%{python_sitearch}/%{name}/serviceconfig.py*
-%{python_sitearch}/%{name}/sizeview.py*
-%{python_sitearch}/%{name}/unixauthdb.py*
-%{python_sitearch}/%{name}/userconfig.py*
-%{python_sitearch}/%{name}/wineconfig.py*
-%{tde_tdedocdir}/HTML/en/guidance/
-
-# Files from backends
-%exclude %{tde_datadir}/apps/guidance/vesamodes
-%exclude %{tde_datadir}/apps/guidance/extramodes
-%exclude %{tde_datadir}/apps/guidance/widescreenmodes
-%exclude %{tde_datadir}/apps/guidance/Cards+
-%exclude %{tde_datadir}/apps/guidance/pcitable
-%exclude %{tde_datadir}/apps/guidance/MonitorsDB
-
-# Files from powermanager
-%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
-%exclude %{tde_datadir}/apps/guidance/pics/processor.png
-
-%files backends
-%defattr(-,root,root,-)
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/ScanPCI.py*
-%{python_sitearch}/%{name}/infimport.py*
-%{python_sitearch}/%{name}/displayconfigabstraction.py*
-%{python_sitearch}/%{name}/displayconfig-hwprobe.py*
-%{python_sitearch}/%{name}/displayconfig-restore.py*
-%{python_sitearch}/%{name}/drivedetect.py*
-%{python_sitearch}/%{name}/execwithcapture.py*
-%{python_sitearch}/%{name}/wineread.py*
-%{python_sitearch}/%{name}/winewrite.py*
-%{python_sitearch}/%{name}/xf86misc.py*
-%{python_sitearch}/%{name}/xorgconfig.py*
-%{python_sitearch}/ixf86misc.so
-%{tde_datadir}/apps/guidance/vesamodes
-%{tde_datadir}/apps/guidance/extramodes
-%{tde_datadir}/apps/guidance/widescreenmodes
-%{tde_datadir}/apps/guidance/Cards+
-%{tde_datadir}/apps/guidance/pcitable
-%{tde_datadir}/apps/guidance/MonitorsDB
-
-
-
-%files powermanager
-%defattr(-,root,root,-)
-%{tde_bindir}/guidance-power-manager
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/guidance-power-manager.py*
-%{python_sitearch}/%{name}/powermanage.py*
-%{python_sitearch}/%{name}/gpmhelper.py*
-%{python_sitearch}/%{name}/powermanager_ui.py*
-%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
-%{python_sitearch}/%{name}/notify.py*
-%{python_sitearch}/%{name}/tooltip.py*
-%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%{tde_datadir}/apps/guidance/pics/battery*.png
-%{tde_datadir}/apps/guidance/pics/processor.png
-%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-
-
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-7
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-8
- Initial release for TDE 14.0.0
-
-* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-6
-- Work around mountconfig incorrectly handling LABEL tag
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-4
-- Initial release for TDE 3.5.13.1
-
-* Fri May 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-3
-- Fix Python search dir
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix library locations
-
-* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
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 8302603d4..ac489f23a 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
@@ -27,7 +27,7 @@
Name: trinity-tde-style-lipstik
Summary: Lipstik style for TDE
Version: 2.2.3
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -76,7 +76,6 @@ Lipstik also provides Lipstik-color-schemes
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -110,30 +109,16 @@ export PATH="%{tde_bindir}:${PATH}"
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
-%{tde_tdelibdir}/kstyle_lipstik_config.la
-%{tde_tdelibdir}/kstyle_lipstik_config.so
+%{tde_tdelibdir}/tdestyle_lipstik_config.la
+%{tde_tdelibdir}/tdestyle_lipstik_config.so
%{tde_tdelibdir}/plugins/styles/lipstik.la
%{tde_tdelibdir}/plugins/styles/lipstik.so
%{tde_datadir}/apps/tdedisplay/color-schemes/lipstiknoble.kcsrc
%{tde_datadir}/apps/tdedisplay/color-schemes/lipstikstandard.kcsrc
%{tde_datadir}/apps/tdedisplay/color-schemes/lipstikwhite.kcsrc
-%{tde_datadir}/apps/kstyle/themes/lipstik.themerc
+%{tde_datadir}/apps/tdestyle/themes/lipstik.themerc
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.3-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.3-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.3-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-2
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Removes post and postun
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
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 d36df4c88..51d3d6923 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
@@ -27,7 +27,7 @@
Name: trinity-tde-style-qtcurve
Summary: This is a set of widget styles for Trinity based apps
Version: 0.55.2
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -75,8 +75,6 @@ gtk2-engines-qtcurve.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export TDEDIR="%{tde_prefix}"
export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}"
@@ -136,31 +134,15 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f qtcurve.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
-%{tde_tdelibdir}/kstyle_qtcurve_config.la
-%{tde_tdelibdir}/kstyle_qtcurve_config.so
+%{tde_tdelibdir}/tdestyle_qtcurve_config.la
+%{tde_tdelibdir}/tdestyle_qtcurve_config.so
%{tde_tdelibdir}/plugins/styles/qtcurve.so
%{tde_tdelibdir}/plugins/styles/qtcurve.la
%{tde_datadir}/apps/tdedisplay/color-schemes/QtCurve.kcsrc
-%{tde_datadir}/apps/kstyle/themes/qtcurve.themerc
+%{tde_datadir}/apps/tdestyle/themes/qtcurve.themerc
%{tde_datadir}/apps/QtCurve/*.qtcurve
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.55.2-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.55.2-7
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.55.2-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Sep 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-3
-- Switch to v3.5.13-sru branch
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.55.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
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 44a365b05..3bd3a64b3 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
@@ -5,7 +5,7 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
-# Currently, menu files under /etc/xdg conflict with TDE4
+# Currently, menu files under /etc/xdg conflict with KDE4
%define tde_sysconfdir %{tde_prefix}/etc
%endif
@@ -29,7 +29,7 @@
Name: trinity-tde-systemsettings
Summary: easy to use control centre for TDE
Version: 0.0svn20070312
-Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -78,8 +78,7 @@ Control Centre with an improved user interface.
%build
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} \
@@ -119,12 +118,12 @@ export PATH="%{tde_bindir}:${PATH}"
%post
touch --no-create %{tde_datadir}/icons/crystalsvg || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-xdg-user-dirs-update
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%postun
touch --no-create %{tde_datadir}/icons/crystalsvg || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-xdg-user-dirs-update
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%files
%defattr(-,root,root,-)
@@ -146,27 +145,5 @@ xdg-user-dirs-update
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-8
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-9
- Initial release for TDE 14.0.0
-
-* Sat Jun 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-7
-- Rebuild
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-6
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-5
-- Initial release for TDE 3.5.13.1
-
-* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-4
-- Fix XDG menu directory location (again)
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-3
-- Updates 'Requires: trinity-guidance' to reflect package renaming
-
-* Wed Dec 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-2
-- Fix XDG menu directory location
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
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 56520be7b..8bcdd6a10 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
+++ b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: An apt-cache ioslave for Trinity
Version: 0.13.2
-Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -41,8 +41,6 @@ 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}
@@ -67,7 +65,6 @@ 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"
@@ -77,7 +74,6 @@ browsing the packages easier. It provides:
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -126,9 +122,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.13.2-2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.13.2-3
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.13.2-1
-- Initial release for TDE 3.5.13.2
-
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 dd090d32b..3c16ff3d1 100644
--- a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
+++ b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: kio-slave for the locate command [Trinity]
Version: 0.4.5
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -73,24 +73,13 @@ as a directory.
%build
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 CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
- export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
- export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
cd build
%endif
-
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
@@ -137,20 +126,5 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/services/searchproviders/locate.desktop
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.5-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.5-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.5-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-- Fix compilation with GCC 4.7
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
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 00d6f5279..7d39a0368 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
+++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: progress dialog for safely removing devices in Trinity.
Version: 0.2
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -74,7 +74,6 @@ Provides a progress dialog for Safely Removing of devices in Trinity.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -117,7 +116,6 @@ for f in konqueror d3lphin; do
20
done
-
%postun
if [ $1 -eq 0 ]; then
for f in konqueror d3lphin; do
@@ -136,22 +134,5 @@ fi
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-7
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-3
-- Add 'desktop' file, to make this program useful :-)
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index 30bfe0567..2dd719162 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -41,6 +41,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch1: trinity-cmake-translations.patch
+Patch2: tdepowersave-cmake-add-translation-and-documentation.patch
+Patch3: tdepowersave-14.0.0-test.patch
+
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -87,6 +91,9 @@ settings for:
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .lang
+%patch2 -p1 -b .lang
+#patch3 -p1 -b .test
%build
@@ -113,6 +120,8 @@ cd build
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ \
+ -DBUILD_ALL=ON \
..
%__make %{?_smp_mflags}
@@ -123,6 +132,8 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
+%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
@@ -134,6 +145,11 @@ update-desktop-database %{tde_appdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+# Disables automatic poweroff, make sure we match both "kpowersave" and "tdepowersave"
+if [ $1 = 1 ] && [ -r /etc/acpi/actions/power.sh ]; then
+ %__cp -f "/etc/acpi/actions/power.sh" "/etc/acpi/actions/power.sh.tdepowersavebackup"
+ %__sed -i "/etc/acpi/actions/power.sh" -e "s|kpowersave|powersave|"
+fi
%postun
update-desktop-database %{tde_appdir} > /dev/null
@@ -141,8 +157,12 @@ update-desktop-database %{tde_appdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+if [ $1 = 0 ] && [ -r "/etc/acpi/actions/power.sh.tdepowersavebackup" ]; then
+ %__mv -f "/etc/acpi/actions/power.sh.tdepowersavebackup" "/etc/acpi/actions/power.sh"
+fi
-%files
+
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{tde_bindir}/tdepowersave
@@ -157,20 +177,14 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/autostart/tdepowersave-autostart.desktop
%{tde_datadir}/config/tdepowersaverc
+%lang(cs) %{tde_tdedocdir}/HTML/cs/tdepowersave/
+%lang(de) %{tde_tdedocdir}/HTML/de/tdepowersave/
+%lang(en) %{tde_tdedocdir}/HTML/en/tdepowersave/
+%lang(fi) %{tde_tdedocdir}/HTML/fi/tdepowersave/
+%lang(hu) %{tde_tdedocdir}/HTML/hu/tdepowersave/
+%lang(nb) %{tde_tdedocdir}/HTML/nb/tdepowersave/
+
%changelog
* Thu Jul 04 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-3
-- Initial release for TDE 3.5.13.1
-
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2
-- Add missing /sbin/ldconfig
-- Add missing doc file
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio-14.0.0.spec
index 9b07482a3..8c7d8fff0 100644
--- a/redhat/applications/tderadio/tderadio-14.0.0.spec
+++ b/redhat/applications/tderadio/tderadio-14.0.0.spec
@@ -30,7 +30,7 @@
Name: trinity-%{tde_pkg}
Summary: Comfortable Radio Application for TDE [Trinity]
Version: 0.1.1.1
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -107,7 +107,6 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -176,25 +175,5 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||:
%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-7
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-8
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-6
-- Initial release for TDE 3.5.13.2
-
-* Sat Dec 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-5
-- Updates presets
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-3
-- Rebuild for RHEL 5
-- Fix postinstall
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-2
-- Rebuild for Fedora 17
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdesudo/tdesudo-14.0.0.spec b/redhat/applications/tdesudo/tdesudo-14.0.0.spec
index 256219beb..66942b871 100644
--- a/redhat/applications/tdesudo/tdesudo-14.0.0.spec
+++ b/redhat/applications/tdesudo/tdesudo-14.0.0.spec
@@ -28,7 +28,7 @@ Name: trinity-%{tde_pkg}
Summary: sudo frontend for Trinity
Version: 2.5.1
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -74,7 +74,6 @@ It allows you to run programs as another user by entering your password.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -114,19 +113,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.5.1-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.5.1-6
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.5.1-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-2
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Removes post and postun
-
-* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 2.5.1-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
index efeef1a88..1404218fb 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:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -120,8 +120,6 @@ find . -name "*.cmake" -exec %__sed -i {} \
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
@@ -283,25 +281,5 @@ fi
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-7
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-8
- 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
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-4
-- Initial release for TDE 3.5.13.1
-
-* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-3
-- Installs SVN protocols as alternative, avoids conlict with TDESDK
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix compilation with GCC 4.7
-
-* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
index bc80a4118..cb62df262 100644
--- a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
+++ b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: theme manager for TDM [Trinity]
Version: 1.2.2
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -75,7 +75,6 @@ that allows you to easily install, remove and change your KDM themes.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -124,22 +123,5 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-7
- Initial release for TDE 14.0.0
-
-* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-5
-- Fix tdmtheme crash. This resolves Bug 1544
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-- Removes the 'lintian' stuff from Debian
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 5647c863b..ac84db4a3 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:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -233,23 +233,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-7
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-8
- 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
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-4
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-3
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
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 efa2232b3..67a4e4b7a 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
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: Semi transparant window decoration for Trinity.
Version: 1.0.5
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -78,7 +78,6 @@ And it is of course nice to look at. Upstream says:
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -122,14 +121,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant-14.0.0.spec
index 342c30c62..ce65923e3 100644
--- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec
+++ b/redhat/applications/wlassistant/wlassistant-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: User friendly TDE frontend for wireless network connection [Trinity]
Version: 0.5.7
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -73,7 +73,6 @@ remembered so next time the user won't have to enter them again.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Shitty hack for RHEL4 ...
if [ -d "/usr/X11R6" ]; then
@@ -145,14 +144,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.5.7-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.5.7-5
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.5.7-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.5.7-2
-- Initial release for TDE 3.5.13.1
-
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 0.5.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/yakuake/yakuake-14.0.0.spec b/redhat/applications/yakuake/yakuake-14.0.0.spec
index 3ea6aff26..2185d687f 100644
--- a/redhat/applications/yakuake/yakuake-14.0.0.spec
+++ b/redhat/applications/yakuake/yakuake-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: Yakuake is a Quake-style terminal emulator based on TDE Konsole technology.
Version: 2.8.1
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -67,7 +67,6 @@ Yakuake is a Quake-style terminal emulator based on TDE Konsole technology.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -119,24 +118,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/config.kcfg/*.kcfg
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.8.1-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.8.1-7
- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.8.1-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.8.1-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
-- Initial release for RHEL 6.0
-