[kdelibs] - use ca-certificates' ca-bundle.crt (#521902)
Rex Dieter
rdieter at fedoraproject.org
Thu Aug 26 18:15:45 UTC 2010
commit 510abf9c752edca5176c89226e4213d64a6515b6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Aug 26 13:20:51 2010 -0500
- use ca-certificates' ca-bundle.crt (#521902)
kdelibs.spec | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index e4dd50f..89e5f1c 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -10,7 +10,7 @@
Summary: KDE Libraries
Version: 4.5.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Name: kdelibs
Epoch: 6
@@ -28,6 +28,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kde4-macros(api) >= 2
BuildRequires: kde-filesystem >= 4-23
BuildRequires: docbook-dtds docbook-style-xsl
+Requires: ca-certificates
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version}
Requires: docbook-dtds docbook-style-xsl
@@ -288,6 +289,14 @@ mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
mkdir -p %{buildroot}%{_kde4_libdir}/plugins/{gui_platform,styles}
+## use ca-certificates' ca-bundle.crt, symlink as what most other
+## distros do these days (http://bugzilla.redhat.com/521902)
+if [ -f %{buildroot}%{_kde4_appsdir}/kssl/ca-bundle.crt -a \
+ -f /etc/pki/tls/certs/ca-bundle.crt ]; then
+ ln -sf /etc/pki/tls/certs/ca-bundle.crt \
+ %{buildroot}%{_kde4_appsdir}/kssl/ca-bundle.crt
+fi
+
# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
@@ -478,6 +487,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Aug 26 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-6
+- use ca-certificates' ca-bundle.crt (#521902)
+
* Wed Aug 18 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.0-5
- fix packaging of QCH apidocs
More information about the scm-commits
mailing list