rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up fedora conditonals

This commit is contained in:
Than Ngo 2011-08-30 10:54:52 +02:00
parent 36f80355f5
commit b44e696b74
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kdelibs.spec
View File

@ -6,17 +6,21 @@
%define shared_desktop_ontologies_ver 0.7.0
%define soprano_ver 2.6.51
%define strigi_ver 0.7.2
# to build/include apidocs or not
%define apidocs 1
# to build/include QCH apidocs or not (currently broken)
#define apidocs_qch 1
%if 0%{?fedora} > 16
%if 0%{?fedora} && 0%{?fedora} > 16
%define libplasma_pk 1
%endif
%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
%global shared_desktop_ontologies_version %(pkg-config --modversion shared-desktop-ontologies 2>/dev/null || echo %{shared_desktop_ontologies_ver})
%global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
Summary: KDE Libraries
Version: 4.7.0
Release: 4%{?dist}
Release: 5%{?dist}
Name: kdelibs
Epoch: 6
@ -50,14 +54,10 @@ Requires: hunspell
# beware of possible bootstrapping problems
# moved back to kdebase-runtime
#Requires: oxygen-icon-theme >= %{version}
%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
Requires: phonon%{?_isa} >= %{phonon_version}
%global shared_desktop_ontologies_version %(pkg-config --modversion shared-desktop-ontologies 2>/dev/null || echo %{shared_desktop_ontologies_ver})
Requires: shared-desktop-ontologies >= %{shared_desktop_ontologies_version}
Requires: shared-mime-info
%global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
Requires: soprano%{?_isa} >= %{soprano_version}
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
Requires: strigi-libs%{?_isa} >= %{strigi_version}
# make kdelibs-devel parallel-installable with kdelibs3-devel
@ -103,12 +103,15 @@ Patch27: kdelibs-4.5.80-no_rpath.patch
# Add an API (currently private) for installing missing Plasma engines.
# https://git.reviewboard.kde.org/r/102175/
Patch40: 0001-Add-an-API-currently-private-for-installing-missing-.patch
# Trigger installation of missing components when installing a package.
# https://git.reviewboard.kde.org/r/102291/
Patch41: 0002-Trigger-installation-of-missing-components-when-inst.patch
# Implement automatic scanning of source code for required data engines.
# https://git.reviewboard.kde.org/r/102350/
Patch42: 0003-Implement-automatic-scanning-of-source-code-for-requ.patch
# Bugfix: Plasma::PackageMetadata::read: Match the behavior of KService.
# https://git.reviewboard.kde.org/r/102404/
Patch43: 0004-Bugfix-Plasma-PackageMetadata-read-Match-the-behavio.patch
@ -118,9 +121,11 @@ Patch43: 0004-Bugfix-Plasma-PackageMetadata-read-Match-the-behavio.patch
# reverting to our past gnupg2-only setup.
# TODO: try to use either gpg or gpg2, whichever is available
Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
# https://bugs.kde.org/show_bug.cgi?id=269045
# https://git.reviewboard.kde.org/r/101231/
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
# Fix for KHTML form completion regression (kde#277457) from bugs.kde.org
# attachment (patch by Andrea Iacovitti)
# https://bugs.kde.org/show_bug.cgi?id=277457#c2
@ -363,7 +368,7 @@ mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
# create/own stuff
# see http://bugzilla.redhat.com/483318
mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
%if 0%{?fedora} < 15
%if 0%{?fedora} && 0%{?fedora} < 15
# moved to kde-filesystem f15+
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/plugins/{gui_platform,styles}
%endif
@ -570,6 +575,9 @@ rm -rf %{buildroot}
%changelog
* Tue Aug 30 2011 Than Ngo <than@redhat.com> - 4.7.0-5
- clean up fedora conditonals
* Mon Aug 22 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.7.0-4
- fix Plasma::PackageMetadata::read to match the behavior of KService