summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
Diffstat (limited to 'redhat')
-rw-r--r--redhat/applications/amarok/amarok-14.0.0.spec4
-rw-r--r--redhat/applications/basket/basket-14.0.1.spec208
-rw-r--r--redhat/applications/filelight/filelight-14.0.0.spec4
-rw-r--r--redhat/applications/k3b/k3b-14.0.0.spec6
-rw-r--r--redhat/applications/kasablanca/kasablanca-14.0.0.spec6
-rw-r--r--redhat/applications/kdbg/kdbg-14.0.0.spec4
-rw-r--r--redhat/applications/kiosktool/kiosktool-14.0.0.spec8
-rw-r--r--redhat/applications/kmplayer/kmplayer-14.0.1.spec4
-rw-r--r--redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec4
-rw-r--r--redhat/applications/kmymoney/kmymoney-14.0.0.spec4
-rw-r--r--redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch11
-rw-r--r--redhat/applications/koffice/koffice-14.0.0.spec14
-rw-r--r--redhat/applications/kopete-otr/kopete-otr-14.0.0.spec3
-rw-r--r--redhat/applications/ksquirrel/ksquirrel-14.0.0.spec8
-rw-r--r--redhat/applications/rosegarden/rosegarden-14.0.0.spec3
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-14.0.0.spec2
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec4
-rw-r--r--redhat/applications/tdepowersave/tdepowersave-14.0.0.spec6
-rw-r--r--redhat/applications/tellico/tellico-14.0.0.spec4
-rwxr-xr-xredhat/build/get_rpm_package_name.sh2
-rw-r--r--redhat/dependencies/arts/arts-14.0.0.spec12
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec4
-rw-r--r--redhat/extras/knoda/trinity-knoda.spec4
-rw-r--r--redhat/extras/kpacman/kpacman-14.0.0.spec4
-rw-r--r--redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec9
-rw-r--r--redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec4
-rw-r--r--redhat/main/tdeadmin/tdeadmin-14.0.0.spec11
-rw-r--r--redhat/main/tdebase/tdebase-14.0.1.spec8
-rw-r--r--redhat/main/tdeedu/tdeedu-14.0.0.spec16
-rw-r--r--redhat/main/tdegames/tdegames-14.0.0.spec4
-rw-r--r--redhat/main/tdegraphics/tdegraphics-14.0.0.spec4
-rw-r--r--redhat/main/tdelibs/tdelibs-14.0.1.spec10
-rw-r--r--redhat/main/tdenetwork/tdenetwork-14.0.0.spec6
-rw-r--r--redhat/main/tdepim/tdepim-14.0.0.spec8
-rw-r--r--redhat/main/tdeutils/tdeutils-14.0.0.spec8
-rw-r--r--redhat/main/tdevelop/tdevelop-14.0.1.spec10
36 files changed, 345 insertions, 86 deletions
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index 3d88d4962..6b3aaed08 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -23,6 +23,7 @@
%define tde_pkg amarok
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -271,7 +272,7 @@ Amarok is a multimedia player with:
%{tde_tdeappdir}/*.desktop
%{tde_datadir}/servicetypes/*.desktop
%{tde_datadir}/apps/profiles/amarok.profile.xml
-%{tde_datadir}/config/amarokrc
+%{tde_confdir}/amarokrc
%{tde_datadir}/config.kcfg/*.kcfg
%{tde_datadir}/services/amarokitpc.protocol
%{tde_datadir}/services/amaroklastfm.protocol
@@ -456,6 +457,7 @@ fi
-DWITH_GCC_VISIBILITY=OFF \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
diff --git a/redhat/applications/basket/basket-14.0.1.spec b/redhat/applications/basket/basket-14.0.1.spec
new file mode 100644
index 000000000..68c2e481b
--- /dev/null
+++ b/redhat/applications/basket/basket-14.0.1.spec
@@ -0,0 +1,208 @@
+#
+# spec file for package basket (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.1
+%endif
+%define tde_pkg basket
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 1.0.3.1
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: Taking care of your ideas.
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+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
+
+BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+
+%description
+This application is mainly an all-purpose notes taker. It provide several baskets where
+to drop every sort of items: text, rich text, links, images, sounds, files, colors,
+application launcher... Objects can be edited, copied, dragged... So, you can arrange
+them as you want ! This application can be used to quickly drop web objects (link, text,
+images...) or notes, as well as to free your clutered desktop (if any). It is also useful
+to collect informations for a report. Those data can be shared with co-workers by exporting
+baskets to HTML.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
+
+# Warning: --enable-final causes FTBFS
+%configure \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --includedir=%{tde_tdeincludedir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Extended Clipboard" basket DesktopUtility
+%endif
+
+# Apps that should stay in TDE
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+for f in crystalsvg ; do
+ touch --no-create %{tde_datadir}/icons/${f} || :
+ gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
+
+%postun
+for f in crystalsvg ; do
+ touch --no-create %{tde_datadir}/icons/${f} || :
+ gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/basket
+%{tde_tdeappdir}/basket.desktop
+%{tde_datadir}/apps/basket/
+%dir %{tde_datadir}/apps/kontact/ksettingsdialog
+%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
+%{tde_libdir}/libbasketcommon.la
+%{tde_libdir}/libbasketcommon.so
+%{tde_tdelibdir}/basketthumbcreator.la
+%{tde_tdelibdir}/basketthumbcreator.so
+%{tde_tdelibdir}/kcm_basket.la
+%{tde_tdelibdir}/kcm_basket.so
+%{tde_tdelibdir}/libbasketpart.la
+%{tde_tdelibdir}/libbasketpart.so
+%{tde_tdelibdir}/libkontact_basket.la
+%{tde_tdelibdir}/libkontact_basket.so
+%{tde_confdir}/magic/basket.magic
+%{tde_datadir}/icons/crystalsvg/*/*/*
+%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
+%{tde_datadir}/mimelnk/application/x-basket-template.desktop
+%{tde_datadir}/services/basket_config_apps.desktop
+%{tde_datadir}/services/basket_config_baskets.desktop
+#%{tde_datadir}/services/basket_config_features.desktop
+%{tde_datadir}/services/basket_config_general.desktop
+%{tde_datadir}/services/basket_config_new_notes.desktop
+#%{tde_datadir}/services/basket_config_notes.desktop
+%{tde_datadir}/services/basket_config_notes_appearance.desktop
+%{tde_datadir}/services/basket_part.desktop
+%{tde_datadir}/services/basketthumbcreator.desktop
+%{tde_datadir}/services/kontact/basket.desktop
+%{tde_datadir}/services/kontact/basket_v4.desktop
+%{tde_tdedocdir}/HTML/en/basket/
+
+
+%changelog
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0.3.1-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight-14.0.0.spec
index 31c9b6a01..837729e47 100644
--- a/redhat/applications/filelight/filelight-14.0.0.spec
+++ b/redhat/applications/filelight/filelight-14.0.0.spec
@@ -23,6 +23,7 @@
%define tde_pkg filelight
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -100,6 +101,7 @@ directories on your computer.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
%configure \
--prefix=%{tde_prefix} \
@@ -159,7 +161,7 @@ done
%{tde_datadir}/apps/filelight/
%{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png
%{tde_datadir}/icons/hicolor/*/apps/filelight.png
-%{tde_datadir}/config/filelightrc
+%{tde_confdir}/filelightrc
%{tde_datadir}/services/*.desktop
%{tde_tdelibdir}/libfilelight.so
%{tde_tdelibdir}/libfilelight.la
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index bb38a178b..779501470 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -24,6 +24,7 @@
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -276,7 +277,7 @@ BuildArch: noarch
%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
-%{tde_datadir}/config/k3brc
+%{tde_confdir}/k3brc
%{tde_datadir}/mimelnk/application/x-k3b.desktop
%{tde_datadir}/icons/hicolor/*/apps/k3b.png
%{tde_datadir}/services/tdefile_k3b.desktop
@@ -433,6 +434,7 @@ and a generic audio and video file converter.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+export kde_confdir="%{tde_confdir}"
# FFMPEG trick ...
if [ -d /usr/include/ffmpeg ]; then
@@ -488,7 +490,7 @@ fi
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc
+%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_confdir}/k3brc
# remove the .la files
%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la
diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.spec b/redhat/applications/kasablanca/kasablanca-14.0.0.spec
index 9a16c058b..b5f2cc11a 100644
--- a/redhat/applications/kasablanca/kasablanca-14.0.0.spec
+++ b/redhat/applications/kasablanca/kasablanca-14.0.0.spec
@@ -84,7 +84,11 @@ BuildRequires: openssl-devel
# UTEMPTER support
%if 0%{?suse_version}
BuildRequires: utempter-devel
-%else
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}utempter-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora}
%if 0%{?rhel} == 4
%else
BuildRequires: libutempter-devel
diff --git a/redhat/applications/kdbg/kdbg-14.0.0.spec b/redhat/applications/kdbg/kdbg-14.0.0.spec
index a02e0e722..4eed8e069 100644
--- a/redhat/applications/kdbg/kdbg-14.0.0.spec
+++ b/redhat/applications/kdbg/kdbg-14.0.0.spec
@@ -23,6 +23,7 @@
%define tde_pkg kdbg
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -120,6 +121,7 @@ Features include the following:
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
# Warning: --enable-final causes FTBFS
%configure \
@@ -173,7 +175,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/locolor || :
%{tde_bindir}/kdbg
%{tde_tdeappdir}/kdbg.desktop
%{tde_datadir}/apps/kdbg/
-%{tde_datadir}/config/kdbgrc
+%{tde_confdir}/kdbgrc
%lang(de) %{tde_tdedocdir}/HTML/de/kdbg/
%lang(en) %{tde_tdedocdir}/HTML/en/kdbg/
%lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/
diff --git a/redhat/applications/kiosktool/kiosktool-14.0.0.spec b/redhat/applications/kiosktool/kiosktool-14.0.0.spec
index 585cfa0f8..0354c3f79 100644
--- a/redhat/applications/kiosktool/kiosktool-14.0.0.spec
+++ b/redhat/applications/kiosktool/kiosktool-14.0.0.spec
@@ -24,6 +24,7 @@
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -104,6 +105,7 @@ groups of users.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
%configure \
--prefix=%{tde_prefix} \
@@ -132,8 +134,8 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
-%__mkdir_p "%{?buildroot}%{tde_datadir}/config"
-cat <<EOF >"%{?buildroot}%{tde_datadir}/config/kiosktoolrc"
+%__mkdir_p "%{?buildroot}%{tde_confdir}"
+cat <<EOF >"%{?buildroot}%{tde_confdir}/kiosktoolrc"
[General]
GroupBlacklist=bin,daemon,sys,tty,disk,lp,www,kmem,wheel,mail,news,uucp,shadow,utmp,at,xok,named,ftp,postfix,maildrop,man,sshd,distcc,nobody,nogroup
EOF
@@ -170,7 +172,7 @@ update-desktop-database >& /dev/null ||:
%{tde_datadir}/apps/kiosktool/
%{tde_tdedocdir}/HTML/en/kiosktool/
%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
-%{tde_datadir}/config/kiosktoolrc
+%{tde_confdir}/kiosktoolrc
%changelog
* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0-1
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.1.spec b/redhat/applications/kmplayer/kmplayer-14.0.1.spec
index bbe8f3145..f19972c3b 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.1.spec
+++ b/redhat/applications/kmplayer/kmplayer-14.0.1.spec
@@ -23,6 +23,7 @@
%define tde_pkg kmplayer
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -213,7 +214,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_libdir}/libkmplayercommon.so
%{tde_bindir}/kgstplayer
%{tde_bindir}/kxineplayer
-%{tde_datadir}/config/kmplayerrc
+%{tde_confdir}/kmplayerrc
%{tde_datadir}/apps/kmplayer/bookmarks.xml
%{tde_datadir}/apps/kmplayer/noise.gif
%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
@@ -277,6 +278,7 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+export kde_confdir="%{tde_confdir}"
%configure \
--prefix=%{tde_prefix} \
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
index 1d9679ef3..90bdf9d0f 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
@@ -23,6 +23,7 @@
%define tde_pkg kmyfirewall
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -150,7 +151,7 @@ done
%{tde_datadir}/apps/kmfsystray/
%{tde_datadir}/apps/kmyfirewall/
%{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%{tde_datadir}/config/kmyfirewallrc
+%{tde_confdir}/kmyfirewallrc
%{tde_tdedocdir}/HTML/en/kmyfirewall/
%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
%{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png
@@ -198,6 +199,7 @@ Requires: %{name} = %{version}-%{release}
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
%configure \
--prefix=%{tde_prefix} \
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index c1b92a345..da75f202a 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -33,6 +33,8 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
+# Required for Mageia >= 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
@@ -56,7 +58,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: kmymoneytitlelabel.png
-Patch0: kmymoney-14.0.1-ftbfs.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -203,7 +204,6 @@ This package contains development files needed for KMyMoney plugins.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
%__install -m644 %{SOURCE1} kmymoney2/widgets/
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch b/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch
deleted file mode 100644
index e1a0bc572..000000000
--- a/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-kmymoney-14.0.1~pre4+bb123ba2/kmymoney2/mymoney/Makefile.am.orig 2015-06-28 12:58:53.565869007 +0200
-+++ trinity-kmymoney-14.0.1~pre4+bb123ba2/kmymoney2/mymoney/Makefile.am 2015-06-28 12:59:16.595869143 +0200
-@@ -33,7 +33,7 @@
- libkmm_mymoney_la_METASOURCES = AUTO
-
- libkmm_mymoney_la_SOURCES = mymoneymoney.cpp mymoneyfinancialcalculator.cpp mymoneytransactionfilter.cpp mymoneyobject.cpp mymoneykeyvaluecontainer.cpp mymoneyobserver.cpp mymoneysubject.cpp mymoneysplit.cpp mymoneyinstitution.cpp mymoneyexception.cpp mymoneyinvesttransaction.cpp mymoneyutils.cpp mymoneysecurity.cpp mymoneytransaction.cpp mymoneyscheduled.cpp mymoneypayee.cpp mymoneyfile.cpp mymoneycategory.cpp mymoneyaccount.cpp mymoneyreport.cpp mymoneystatement.cpp mymoneyprice.cpp mymoneybudget.cpp mymoneyobjectcontainer.cpp mymoneyforecast.cpp
--libkmm_mymoney_la_LDFLAGS = $(all_libraries) -version-info $(LIBVERSION)
-+libkmm_mymoney_la_LDFLAGS = $(all_libraries) -version-info $(LIBVERSION) $(LIB_QT) $(LIB_TDECORE)
-
- SUBDIRS = storage
-
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 8dcbe7f83..4183bf3eb 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -23,6 +23,7 @@
%define tde_pkg koffice
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -44,6 +45,9 @@
# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
+# Required for Mageia 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
@@ -163,7 +167,10 @@ BuildRequires: utempter-devel
%if 0%{?rhel} == 4
BuildRequires: utempter
%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}utempter-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 5
BuildRequires: libutempter-devel
%endif
@@ -662,8 +669,8 @@ update-desktop-database -q &> /dev/null ||:
%{tde_tdelibdir}/kexi.*
# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
%{tde_tdelibdir}/libkspreadkexiimport.*
-%{tde_datadir}/config/kexirc
-%{tde_datadir}/config/magic/kexi.magic
+%{tde_confdir}/kexirc
+%{tde_confdir}/magic/kexi.magic
%{tde_datadir}/mimelnk/application/*
%{tde_datadir}/servicetypes/kexi*.desktop
%{tde_datadir}/services/kexi/
@@ -1111,6 +1118,7 @@ This package is part of the TDE Office Suite.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+export kde_confdir="%{tde_confdir}"
%if 0%{?suse_version} == 1220
RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])')
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 d7bc13318..47d4c79cc 100644
--- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
+++ b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
@@ -33,6 +33,9 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
+# Required for Mageia 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
index 0570f8c2e..fc3a033be 100644
--- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
+++ b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
@@ -23,6 +23,7 @@
%define tde_pkg ksquirrel
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -124,6 +125,7 @@ OpenGL and dynamic format support.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
@@ -188,9 +190,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
%{tde_datadir}/apps/ksquirrel/
%{tde_datadir}/apps/ksquirrelpart/
-%{tde_datadir}/config/magic/x-ras.magic
-%{tde_datadir}/config/magic/x-sun.magic
-%{tde_datadir}/config/magic/x-utah.magic
+%{tde_confdir}/magic/x-ras.magic
+%{tde_confdir}/magic/x-sun.magic
+%{tde_confdir}/magic/x-utah.magic
%{tde_tdedocdir}/HTML/*/ksquirrel
%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png
%{tde_datadir}/mimelnk/image/*.desktop
diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
index 962454c8b..9140be79b 100644
--- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec
+++ b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
@@ -33,6 +33,9 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
+# Required for Mageia 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
index 5e5f95dfa..ec25aeec5 100644
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
@@ -140,7 +140,7 @@ in addition to the PKCS certificate functionality
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%if 0%{?rhel} != 6
-%patch0 -p1 -b .ftbfs
+#patch0 -p1 -b .ftbfs
%endif
%__sed -i "Makefile" \
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec
index f4094752e..11b860c1b 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec
@@ -23,6 +23,7 @@
%define tde_pkg tde-systemsettings
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -109,6 +110,7 @@ Control Centre with an improved user interface.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
%configure \
@@ -181,7 +183,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%{tde_datadir}/applications/tde/medianotifications.desktop
%{tde_datadir}/applications/tde/systemsettings.desktop
%{tde_datadir}/apps/systemsettings/
-%{tde_datadir}/config/systemsettingsrc
+%{tde_confdir}/systemsettingsrc
%{tde_datadir}/desktop-directories/*.directory
%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
%{tde_tdedocdir}/HTML/en/systemsettings/
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index 585a3253d..5488e31d1 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -23,6 +23,7 @@
%define tde_pkg tdepowersave
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -184,6 +185,7 @@ fi
\
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
@@ -224,7 +226,7 @@ update-desktop-database %{tde_tdeappdir} > /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
+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
@@ -241,7 +243,7 @@ fi
%{tde_datadir}/apps/tdepowersave/
%{tde_datadir}/icons/hicolor/*/*/*.png
%{tde_datadir}/autostart/tdepowersave-autostart.desktop
-%{tde_datadir}/config/tdepowersaverc
+%{tde_confdir}/tdepowersaverc
%lang(cs) %{tde_tdedocdir}/HTML/cs/tdepowersave/
%lang(de) %{tde_tdedocdir}/HTML/de/tdepowersave/
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 744397f36..809254bf8 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -23,6 +23,7 @@
%define tde_pkg tellico
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -131,7 +132,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_bindir}/tellico
#%{tde_datadir}/pixmaps
%{tde_datadir}/applications
-%{tde_datadir}/config/tellicorc
+%{tde_confdir}/tellicorc
##########
@@ -232,6 +233,7 @@ fi
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
# Warning, --enable-final causes FTBFS !
%configure \
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 2c891fdba..0d8693d2f 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -46,6 +46,7 @@ case "${PKGNAME}" in
"dbus-tqt") PKGRUNTIME="${lib}dbus-tqt-1-0";;
"dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";;
"esound") PKGRUNTIME="esound-libs";;
+ "imlib1") PKGRUNTIME="${lib}Imlib1";;
"koffice") PKGRUNTIME="koffice-suite";;
"libart-lgpl") PKGRUNTIME="${lib}art_lgpl_2-2";;
"libcaldav") PKGRUNTIME="${lib}caldav0";;
@@ -90,6 +91,7 @@ if [ -n "${DEVEL}" ]; then
"dbus-tqt") PKGDEVEL="libdbus-tqt-1-devel";;
"dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";;
"esound") PKGDEVEL="esound-devel";;
+ "imlib1") PKGDEVEL="${lib}Imlib-devel";;
"pan") PKGDEVEL="uulib-devel";;
"libart-lgpl") PKGDEVEL="libart_lgpl-devel";;
"libcaldav") PKGDEVEL="${lib}caldav-devel";;
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 29a1035a5..d2efe1cc2 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -86,13 +86,10 @@ BuildRequires: esound-devel
# JACK support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
%define with_jack 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define jack_devel %{_lib}jack-devel
-%endif
%if 0%{?rhel} >= 5 || 0%{?fedora}
%define jack_devel jack-audio-connection-kit-devel
%endif
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define jack_devel libjack-devel
%endif
BuildRequires: %{jack_devel}
@@ -100,7 +97,7 @@ BuildRequires: %{jack_devel}
# LIBTOOL
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}ltdl-devel
+BuildRequires: libltdl-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: libtool-ltdl-devel
@@ -117,10 +114,7 @@ BuildRequires: libtool
%ifarch %{ix86} x86_64
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
%define with_libmad 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%define mad_devel %{_lib}mad-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} || 0%{?mdkversion} || 0%{?mgaversion}
%define mad_devel libmad-devel
%endif
BuildRequires: %{mad_devel}
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index b4e34f5a2..cb6af234c 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -227,7 +227,7 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
%define xi_devel xorg-x11-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-%define xi_devel %{_lib}xi-devel
+%define xi_devel libxi-devel
%endif
%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
%define xi_devel libXi-devel
@@ -1257,7 +1257,7 @@ things that are possible with TQt3.
# Fix strange FTBFS on RHEL5
%if 0%{?rhel} == 5
-%__sed -i src/kernel/ntqstyle.h -e "s|#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|"
+%__sed -i src/kernel/ntqstyle.h -e "s|#ifdef ENABLE_T*QSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|"
%endif
# Add missing sqlite3 header
diff --git a/redhat/extras/knoda/trinity-knoda.spec b/redhat/extras/knoda/trinity-knoda.spec
index 8f643cd31..541c23b4d 100644
--- a/redhat/extras/knoda/trinity-knoda.spec
+++ b/redhat/extras/knoda/trinity-knoda.spec
@@ -8,6 +8,7 @@
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
@@ -67,6 +68,7 @@ Requires: %{name} = %{version}-%{release}
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
%configure \
@@ -138,7 +140,7 @@ done
%{tde_datadir}/applnk/Office/knoda.desktop
%{tde_datadir}/apps/hk_kdeclasses/
%{tde_datadir}/apps/knoda/
-%{tde_datadir}/config/magic/hk_classes.magic
+%{tde_confdir}/magic/hk_classes.magic
%{tde_tdedocdir}/HTML/en/knoda/
%{tde_datadir}/icons/hicolor/*/apps/knoda.png
%{tde_datadir}/icons/locolor/*/apps/knoda.png
diff --git a/redhat/extras/kpacman/kpacman-14.0.0.spec b/redhat/extras/kpacman/kpacman-14.0.0.spec
index c2865c8fa..a30c6b6e1 100644
--- a/redhat/extras/kpacman/kpacman-14.0.0.spec
+++ b/redhat/extras/kpacman/kpacman-14.0.0.spec
@@ -28,6 +28,7 @@
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -92,6 +93,7 @@ United States by Bally, Pacman is an icon of 1980's popular culture
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
%configure \
--prefix=%{tde_prefix} \
@@ -147,7 +149,7 @@ done
%{tde_bindir}/kpacman
%{tde_datadir}/applnk/Games/kpacman.desktop
%{tde_datadir}/apps/kpacman/
-%{tde_datadir}/config/kpacmanrc
+%{tde_confdir}/kpacmanrc
%lang(de) %{tde_tdedocdir}/HTML/de/kpacman/
%{tde_tdedocdir}/HTML/en/kpacman/
%{tde_datadir}/icons/hicolor/16x16/apps/kpacman.png
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
index c985dc14c..43d8d31c6 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
@@ -21,6 +21,7 @@
%endif
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define _docdir %{tde_docdir}
%define tde_docdir %{tde_datadir}/doc
@@ -69,8 +70,8 @@ This package installs the Trinity directory structure.
%dir %{tde_bindir}
%dir %{tde_datadir}
-%dir %{tde_datadir}/config
-%dir %{tde_datadir}/config/magic
+%dir %{tde_confdir}
+%dir %{tde_confdir}/magic
%dir %{tde_docdir}
%dir %{tde_tdedocdir}
@@ -171,8 +172,8 @@ This package installs the Trinity directory structure.
%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/zeroconf
%__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart
%__install -d -m 755 %{?buildroot}%{tde_datadir}/cmake
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config/magic
+%__install -d -m 755 %{?buildroot}%{tde_confdir}
+%__install -d -m 755 %{?buildroot}%{tde_confdir}/magic
%__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg
%__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
index 043878b56..09f3a68aa 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -27,6 +27,7 @@
%define tde_pkg tdeaccessibility
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -272,7 +273,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kmouth
%defattr(-,root,root,-)
-%{tde_datadir}/config/kmouthrc
+%{tde_confdir}/kmouthrc
%{tde_bindir}/kmouth
%{tde_tdeappdir}/kmouth.desktop
%{tde_datadir}/apps/kmouth/
@@ -515,6 +516,7 @@ programs.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+export kde_confdir="%{tde_confdir}"
%configure \
--prefix=%{tde_prefix} \
diff --git a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
index 46a4fb44b..909877ab2 100644
--- a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
+++ b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
@@ -27,6 +27,7 @@
%define tde_pkg tdeadmin
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_sbindir %{tde_prefix}/sbin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -281,7 +282,7 @@ install/remove them.
%{tde_bindir}/kpackage
%{tde_tdeappdir}/kpackage.desktop
%{tde_datadir}/apps/kpackage/
-%{tde_datadir}/config/kpackagerc
+%{tde_confdir}/kpackagerc
%{tde_datadir}/icons/hicolor/*/apps/kpackage.png
%{tde_tdedocdir}/HTML/en/kpackage/
@@ -315,7 +316,7 @@ drag and drop GUI.
%{tde_bindir}/ksysv
%{tde_tdeappdir}/ksysv.desktop
%{tde_datadir}/apps/ksysv/
-%{tde_datadir}/config/ksysvrc
+%{tde_confdir}/ksysvrc
%{tde_datadir}/icons/crystalsvg/16x16/actions/toggle_log.png
%{tde_datadir}/icons/hicolor/*/apps/ksysv.png
%{tde_datadir}/mimelnk/application/x-ksysv.desktop
@@ -361,7 +362,7 @@ A user/group administration tool for TDE.
%{tde_bindir}/kuser
%{tde_tdeappdir}/kuser.desktop
%{tde_datadir}/apps/kuser/
-%{tde_datadir}/config/kuserrc
+%{tde_confdir}/kuserrc
%{tde_datadir}/config.kcfg/kuser.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kuser.png
%{tde_tdedocdir}/HTML/en/kuser/
@@ -434,6 +435,7 @@ touch /etc/lilo.conf
%build
unset QTDIR QTLIB QTINC
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
@@ -477,7 +479,8 @@ comps="kcron kdat knetworkconf kpackage ksysv kuser"
%{buildroot}%{tde_sbindir} \
%{buildroot}%{_sbindir}
-%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/
+%__mkdir_p "%{buildroot}%{tde_confdir}/"
+%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} "%{buildroot}%{tde_confdir}/"
%if 0%{?with_consolehelper}
# Run kuser through consolehelper
diff --git a/redhat/main/tdebase/tdebase-14.0.1.spec b/redhat/main/tdebase/tdebase-14.0.1.spec
index ce37003d2..3bf85c619 100644
--- a/redhat/main/tdebase/tdebase-14.0.1.spec
+++ b/redhat/main/tdebase/tdebase-14.0.1.spec
@@ -23,6 +23,7 @@
%define tde_pkg tdebase
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -2190,7 +2191,7 @@ already. Most users won't need this.
%dir %{tdm_datadir}/sessions
%{tdm_datadir}/sessions/*.desktop
%{tdm_datadir}/themes/
-%{tde_datadir}/config/%{tdm}
+%{tde_confdir}/%{tdm}
%dir %{_sysconfdir}/trinity/%{tdm}
%config(noreplace) %{_sysconfdir}/trinity/%{tdm}/*
%{tde_tdedocdir}/HTML/en/%{tdm}/
@@ -3556,6 +3557,7 @@ fi
-DWITH_GCC_VISIBILITY=ON \
\
-DBIN_INSTALL_DIR="%{tde_bindir}" \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
@@ -3702,10 +3704,6 @@ fi
%__sed -i "s|kdm|tdm|g" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
%endif
-# Symlink TDM configuration
-%__mkdir_p "%{?buildroot}%{tde_datadir}/config"
-%__ln_s "%{_sysconfdir}/trinity/%{tdm}" "%{?buildroot}%{tde_datadir}/config/%{tdm}"
-
# SELINUX policy for RHEL / Fedora
%if 0%{?with_selinux_policy}
%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec
index c33058ca0..a275ef5ce 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec
@@ -27,6 +27,7 @@
%define tde_pkg tdeedu
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -500,7 +501,7 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-khangman
%defattr(-,root,root,-)
-%{tde_datadir}/config/khangmanrc
+%{tde_confdir}/khangmanrc
%{tde_bindir}/khangman
%{tde_tdeappdir}/khangman.desktop
%{tde_datadir}/apps/khangman/
@@ -552,8 +553,8 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-kig
%defattr(-,root,root,-)
-%{tde_datadir}/config/magic/cabri.magic
-%{tde_datadir}/config/magic/drgeo.magic
+%{tde_confdir}/magic/cabri.magic
+%{tde_confdir}/magic/drgeo.magic
%{tde_bindir}/kig
%{tde_bindir}/pykig.py*
%{tde_tdelibdir}/tdefile_drgeo.la
@@ -704,7 +705,7 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-klettres
%defattr(-,root,root,-)
-%{tde_datadir}/config/klettresrc
+%{tde_confdir}/klettresrc
%{tde_bindir}/klettres
%{tde_tdeappdir}/klettres.desktop
%{tde_datadir}/config.kcfg/klettres.kcfg
@@ -862,7 +863,7 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-kstars
%defattr(-,root,root,-)
-%{tde_datadir}/config/kstarsrc
+%{tde_confdir}/kstarsrc
%{tde_bindir}/kstars
%{tde_tdeappdir}/kstars.desktop
%{tde_datadir}/config.kcfg/kstars.kcfg
@@ -1069,7 +1070,7 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-kvoctrain
%defattr(-,root,root,-)
-%{tde_datadir}/config/kvoctrainrc
+%{tde_confdir}/kvoctrainrc
%{tde_bindir}/kvoctrain
%{tde_bindir}/spotlight2kvtml
%{tde_libdir}/libkvoctraincore.so.*
@@ -1118,7 +1119,7 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-kwordquiz
%defattr(-,root,root,-)
-%{tde_datadir}/config/kwordquizrc
+%{tde_confdir}/kwordquizrc
%{tde_bindir}/kwordquiz
%{tde_tdeappdir}/kwordquiz.desktop
%{tde_datadir}/apps/kwordquiz/
@@ -1369,6 +1370,7 @@ This package contains the development files for tdeedu.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
# Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then
diff --git a/redhat/main/tdegames/tdegames-14.0.0.spec b/redhat/main/tdegames/tdegames-14.0.0.spec
index 2b6f5fe05..1d4ccca19 100644
--- a/redhat/main/tdegames/tdegames-14.0.0.spec
+++ b/redhat/main/tdegames/tdegames-14.0.0.spec
@@ -27,6 +27,7 @@
%define tde_pkg tdegames
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -905,7 +906,7 @@ This package is part of Trinity, and a component of the TDE games module.
%files -n trinity-kolf
%defattr(-,root,root,-)
-%{tde_datadir}/config/magic/kolf.magic
+%{tde_confdir}/magic/kolf.magic
%{tde_datadir}/apps/kolf/
%{tde_bindir}/kolf
%{tde_tdeappdir}/kolf.desktop
@@ -1568,6 +1569,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export TDEDIR="%{tde_prefix}"
+export kde_confdir="%{tde_confdir}"
# Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then
diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
index 705746f7f..810dc5c30 100644
--- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
@@ -23,6 +23,7 @@
%define tde_pkg tdegraphics
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -775,7 +776,7 @@ Homepage: http://kooka.kde.org/
%{tde_bindir}/kooka
%{tde_tdeappdir}/kooka.desktop
%{tde_datadir}/apps/kooka/
-%{tde_datadir}/config/kookarc
+%{tde_confdir}/kookarc
%{tde_datadir}/icons/hicolor/*/apps/kooka.png
%{tde_tdedocdir}/HTML/en/kooka/
@@ -1306,6 +1307,7 @@ fi
\
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
diff --git a/redhat/main/tdelibs/tdelibs-14.0.1.spec b/redhat/main/tdelibs/tdelibs-14.0.1.spec
index b3311fcda..6ff6e3a12 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.1.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.1.spec
@@ -27,6 +27,7 @@
%define tde_pkg tdelibs
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -469,7 +470,6 @@ kimgio (image manipulation).
%{tde_datadir}/applnk/tdeio_iso.desktop
%{tde_datadir}/apps/*
%exclude %{tde_datadir}/apps/ksgmltools2/
-%{tde_datadir}/config/*
%{tde_datadir}/emoticons/*
%{tde_datadir}/icons/crystalsvg/
%{tde_datadir}/icons/default.tde
@@ -481,6 +481,9 @@ kimgio (image manipulation).
%{tde_tdedocdir}/HTML/en/common/*
%{tde_tdedocdir}/HTML/en/tdespell/
+# Global Trinity configuration
+%config %{tde_confdir}
+
# Some setuid binaries need special care
%if 0%{?suse_version}
%verify(not mode) %{tde_bindir}/kgrantpty
@@ -605,6 +608,7 @@ fi
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DDOC_INSTALL_DIR="%{tde_docdir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
@@ -696,5 +700,5 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
+* Tue Jul 21 2015 Francois Andriot <francois.andriot@free.fr> - 14.0.1-1
+- Initial release for TDE 14.0.1
diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
index 56244cfa6..8f120bb85 100644
--- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
@@ -27,6 +27,7 @@
%define tde_pkg tdenetwork
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -999,7 +1000,7 @@ recommended package libio-socket-ssl-perl.
%{tde_tdelibdir}/ksirc.*
%{tde_tdeappdir}/ksirc.desktop
%{tde_datadir}/apps/ksirc/
-%config(noreplace) %{tde_datadir}/config/ksircrc
+%config(noreplace) %{tde_confdir}/ksircrc
%{tde_datadir}/icons/hicolor/*/apps/ksirc.*
%{tde_tdedocdir}/HTML/??/ksirc/
@@ -1038,7 +1039,7 @@ and shouldn't be run on a multi-user machine.
%{tde_bindir}/mail.local
%{tde_tdelibdir}/kcm_ktalkd.*
%{tde_tdeappdir}/kcmktalkd.desktop
-%config(noreplace) %{tde_datadir}/config/ktalkdrc
+%config(noreplace) %{tde_confdir}/ktalkdrc
%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
%{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
%{tde_datadir}/sounds/ktalkd.wav
@@ -1240,6 +1241,7 @@ fi
-DWITH_GCC_VISIBILITY=OFF \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
diff --git a/redhat/main/tdepim/tdepim-14.0.0.spec b/redhat/main/tdepim/tdepim-14.0.0.spec
index c07496fa4..e1325e0a2 100644
--- a/redhat/main/tdepim/tdepim-14.0.0.spec
+++ b/redhat/main/tdepim/tdepim-14.0.0.spec
@@ -27,6 +27,7 @@
%define tde_pkg tdepim
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -1010,8 +1011,8 @@ mbox files, and/or trinity-tdebase-tdeio-plugins if you want to use POP3.
%files -n trinity-kmail
%defattr(-,root,root,-)
-%{tde_datadir}/config/kmail.antispamrc
-%{tde_datadir}/config/kmail.antivirusrc
+%{tde_confdir}/kmail.antispamrc
+%{tde_confdir}/kmail.antivirusrc
%{tde_bindir}/kmail
%{tde_bindir}/kmail_*.sh
%{tde_tdelibdir}/kcm_kmail.la
@@ -1880,7 +1881,7 @@ This is the runtime package for programs that use the libkleopatra-trinity libra
%files -n trinity-libkleopatra
%defattr(-,root,root,-)
-%{tde_datadir}/config/libkleopatrarc
+%{tde_confdir}/libkleopatrarc
%{tde_libdir}/libgpgme++.so.*
%{tde_libdir}/libkleopatra.so.*
%{tde_libdir}/libkpgp.so.*
@@ -2310,6 +2311,7 @@ fi
\
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec
index 1982c59a7..e75b1b94c 100644
--- a/redhat/main/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec
@@ -26,6 +26,7 @@
%define tde_pkg tdeutils
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -717,7 +718,7 @@ power management, for laptops, from within TDE.
%{_sbindir}/klaptop_acpi_helper
%endif
-%config %{tde_datadir}/config/kcmlaptoprc
+%config %{tde_confdir}/kcmlaptoprc
%post -n trinity-klaptopdaemon
/sbin/ldconfig
@@ -861,7 +862,7 @@ connections, power, etc.
%files -n trinity-ksim
%defattr(-,root,root,-)
-%config %{tde_datadir}/config/ksim_panelextensionrc
+%config %{tde_confdir}/ksim_panelextensionrc
%{tde_tdelibdir}/ksim_*.la
%{tde_tdelibdir}/ksim_*.so
%{tde_libdir}/libksimcore.so.*
@@ -1084,6 +1085,7 @@ fi
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DDOC_INSTALL_DIR="%{tde_docdir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
@@ -1132,7 +1134,7 @@ export PATH="%{tde_bindir}:${PATH}"
%endif
# klaptop settings file
-%__install -p -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/config/kcmlaptoprc"
+%__install -p -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_confdir}/kcmlaptoprc"
%else
diff --git a/redhat/main/tdevelop/tdevelop-14.0.1.spec b/redhat/main/tdevelop/tdevelop-14.0.1.spec
index af521d9ea..a767b72f9 100644
--- a/redhat/main/tdevelop/tdevelop-14.0.1.spec
+++ b/redhat/main/tdevelop/tdevelop-14.0.1.spec
@@ -27,6 +27,7 @@
%define tde_pkg tdevelop
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -171,6 +172,8 @@ individual needs.
%{tde_bindir}/kdevprj2kdevelop
%{tde_bindir}/kdevprofileeditor
%{tde_libdir}/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
+%{tde_confdir}/kdevassistantrc
+%{tde_confdir}/tdeveloprc
%{tde_tdeappdir}/kdevassistant.desktop
%{tde_tdeappdir}/kdevdesigner.desktop
%{tde_tdeappdir}/tdevelop.desktop
@@ -490,8 +493,6 @@ individual needs.
%{tde_datadir}/apps/kdevtrollproject/
%{tde_datadir}/apps/kdevvalgrind/
%{tde_datadir}/apps/tdeio_pydoc/
-%{tde_datadir}/config/kdevassistantrc
-%{tde_datadir}/config/tdeveloprc
%{tde_datadir}/desktop-directories/tde-development-tdevelop.directory
%{tde_tdedocdir}/HTML/en/tdevelop/
%{tde_libdir}/libd.so.0
@@ -641,6 +642,7 @@ fi
-DWITH_GCC_VISIBILITY=OFF \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
@@ -667,5 +669,5 @@ fi
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
+* Tue Jul 21 2015 Francois Andriot <francois.andriot@free.fr> - 14.0.1-1
+- Initial release