diff options
| author | François Andriot <[email protected]> | 2015-07-22 21:26:05 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2015-07-22 21:26:05 +0200 |
| commit | f490f5210b1597b85d66ae1fd54a51bdab7ca779 (patch) | |
| tree | dccb24a2e302a13c2332d330578ad97e5eecc63a /redhat/main/tdebase | |
| parent | 3691b7f09c6fe434f1fedec711520e4b8dab37a0 (diff) | |
| download | tde-packaging-f490f5210b1597b85d66ae1fd54a51bdab7ca779.tar.gz tde-packaging-f490f5210b1597b85d66ae1fd54a51bdab7ca779.zip | |
RPM Packaging: massive updates for R14.0.1
Diffstat (limited to 'redhat/main/tdebase')
| -rw-r--r-- | redhat/main/tdebase/tdebase-14.0.1.spec | 8 |
1 files changed, 3 insertions, 5 deletions
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" |