- use ca-certificates' ca-bundle.crt (#521902)

This commit is contained in:
Rex Dieter 2010-08-26 13:20:51 -05:00
parent 337333e54a
commit 510abf9c75
1 changed files with 13 additions and 1 deletions

View File

@ -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@fedoraproject.org> - 4.5.0-6
- use ca-certificates' ca-bundle.crt (#521902)
* Wed Aug 18 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.0-5
- fix packaging of QCH apidocs