summaryrefslogtreecommitdiffstats
path: root/redhat/main
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2015-07-22 21:26:05 +0200
committerFrançois Andriot <[email protected]>2015-07-22 21:26:05 +0200
commitf490f5210b1597b85d66ae1fd54a51bdab7ca779 (patch)
treedccb24a2e302a13c2332d330578ad97e5eecc63a /redhat/main
parent3691b7f09c6fe434f1fedec711520e4b8dab37a0 (diff)
downloadtde-packaging-f490f5210b1597b85d66ae1fd54a51bdab7ca779.tar.gz
tde-packaging-f490f5210b1597b85d66ae1fd54a51bdab7ca779.zip
RPM Packaging: massive updates for R14.0.1
Diffstat (limited to 'redhat/main')
-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
11 files changed, 55 insertions, 34 deletions
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 <[email protected]> - 14.0.0-1
-- Initial release for TDE 14.0.0
+* Tue Jul 21 2015 Francois Andriot <[email protected]> - 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 <[email protected]> - 14.0.0-1
-- Initial release for TDE 14.0.0
+* Tue Jul 21 2015 Francois Andriot <[email protected]> - 14.0.1-1
+- Initial release