diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-07-26 09:53:33 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-07-26 09:53:33 +0200 |
| commit | a6addf0c3f16eff1463d765975721a92e69c053b (patch) | |
| tree | 7fbe8636b75d9e4c5594a02fede95a18e41e53dd /redhat/tdelibs | |
| parent | 8b0482ca988f8036b84d093f89453f3235fda484 (diff) | |
| download | tde-packaging-a6addf0c3f16eff1463d765975721a92e69c053b.tar.gz tde-packaging-a6addf0c3f16eff1463d765975721a92e69c053b.zip | |
RPM Packaging: some updates
Diffstat (limited to 'redhat/tdelibs')
| -rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index 770837eaa..3277300ae 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -255,10 +255,15 @@ BuildRequires: NetworkManager-glib-devel %endif %endif +# Certificates support +Requires: ca-certificates + +# Trinity dependencies Requires: trinity-tqt3 >= 3.5.0 Requires: trinity-tqtinterface >= %{tde_version} Requires: trinity-arts >= %{tde_version} + %description Libraries for the Trinity Desktop Environment: TDE Libraries included: tdecore (TDE core library), kdeui (user interface), @@ -435,7 +440,7 @@ applications for TDE. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" +export CMAKE_INCLUDE_PATH="%{tde_includedir}" # We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet export LD_LIBRARY_PATH="%{tde_libdir}" @@ -507,6 +512,10 @@ EOF # Appends TDE version to '.pc' file echo "Version: %{version}" >>"%{?buildroot}%{tde_libdir}/pkgconfig/tdelibs.pc" +# Use system-wide CA certificate +%__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt" +%__ln_s "%{_sysconfdir}/ssl/certs/ca-certificates.crt" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt" + %clean %__rm -rf "%{?buildroot}" |