- use ca-certificates' ca-bundle.crt (#521902)
This commit is contained in:
parent
337333e54a
commit
510abf9c75
14
kdelibs.spec
14
kdelibs.spec
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.5.0
|
Version: 4.5.0
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -28,6 +28,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|||||||
BuildRequires: kde4-macros(api) >= 2
|
BuildRequires: kde4-macros(api) >= 2
|
||||||
BuildRequires: kde-filesystem >= 4-23
|
BuildRequires: kde-filesystem >= 4-23
|
||||||
BuildRequires: docbook-dtds docbook-style-xsl
|
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})
|
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
|
||||||
Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version}
|
Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version}
|
||||||
Requires: docbook-dtds docbook-style-xsl
|
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}/kconf_update_bin
|
||||||
mkdir -p %{buildroot}%{_kde4_libdir}/plugins/{gui_platform,styles}
|
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
|
# move devel symlinks
|
||||||
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
|
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
|
||||||
pushd %{buildroot}%{_kde4_libdir}
|
pushd %{buildroot}%{_kde4_libdir}
|
||||||
@ -478,6 +487,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Aug 18 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.0-5
|
||||||
- fix packaging of QCH apidocs
|
- fix packaging of QCH apidocs
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user