6:4.14.3-7

- borrow Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch from obs
- start work to support -nepomuk, -nepomuk-devel subpkgs (wip)
This commit is contained in:
Rex Dieter 2014-12-20 16:13:47 -06:00
parent 177d6f0d7c
commit 3a97198c66
2 changed files with 69 additions and 5 deletions

View File

@ -0,0 +1,27 @@
From 02966e348e37ebf6269aaed238e7ce67fbe958e7 Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Sun, 25 May 2014 00:36:08 +0200
Subject: [PATCH 1/1] Drop Nepomuk from KParts' LINK_INTERFACE_LIBRARIES
Nepomuk is only used in a private header, browserrun_p.h,
thus it is not needed as KParts public dependancy
Makes it possible to drop libsoprano-devel from libkde4-devel Requires
---
kparts/CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/kparts/CMakeLists.txt b/kparts/CMakeLists.txt
index 2eab2e8..e17ef5e 100644
--- a/kparts/CMakeLists.txt
+++ b/kparts/CMakeLists.txt
@@ -39,7 +39,6 @@ target_link_libraries(kparts ${KDE4_KDECORE_LIBS} kdeui kio)
target_link_libraries(kparts LINK_INTERFACE_LIBRARIES kio kdeui kdecore ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} )
if(HAVE_NEPOMUK)
target_link_libraries(kparts nepomuk nepomukutils)
- target_link_libraries(kparts LINK_INTERFACE_LIBRARIES nepomuk nepomukutils )
endif(HAVE_NEPOMUK)
set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION}
--
1.9.3

View File

@ -41,7 +41,7 @@
Summary: KDE Libraries Summary: KDE Libraries
Version: 4.14.3 Version: 4.14.3
Release: 6%{?dist} Release: 7%{?dist}
Name: kdelibs Name: kdelibs
Epoch: 6 Epoch: 6
@ -84,10 +84,12 @@ Requires: kde-l10n
#Requires: oxygen-icon-theme >= %{version} #Requires: oxygen-icon-theme >= %{version}
%endif %endif
Requires: phonon%{?_isa} >= %{phonon_version} Requires: phonon%{?_isa} >= %{phonon_version}
Requires: shared-desktop-ontologies >= %{shared_desktop_ontologies_version}
Requires: shared-mime-info Requires: shared-mime-info
Requires: soprano%{?_isa} >= %{soprano_version}
Requires: strigi-libs%{?_isa} >= %{strigi_version} Requires: strigi-libs%{?_isa} >= %{strigi_version}
%if ! 0%{?nepomuk}
Requires: shared-desktop-ontologies >= %{shared_desktop_ontologies_version}
Requires: soprano%{?_isa} >= %{soprano_version}
%endif
# make kdelibs-devel parallel-installable with kdelibs3-devel # make kdelibs-devel parallel-installable with kdelibs3-devel
Patch0: kdelibs-4.9.95-parallel_devel.patch Patch0: kdelibs-4.9.95-parallel_devel.patch
@ -153,6 +155,10 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch
# return valid locale (RFC 1766) # return valid locale (RFC 1766)
Patch54: kdelibs-4.8.4-kjs-locale.patch Patch54: kdelibs-4.8.4-kjs-locale.patch
# borrow from opensuse
# https://build-test.opensuse.org/package/view_file/home:coolo:test/kdelibs4/0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch
Patch55: Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch
# make filter working, TODO: upstream? -- rex # make filter working, TODO: upstream? -- rex
Patch59: kdelibs-4.9.3-kcm_ssl.patch Patch59: kdelibs-4.9.3-kcm_ssl.patch
@ -298,7 +304,6 @@ This package includes the common files for the KDE 3 and KDE 4 libraries.
%package devel %package devel
Summary: Header files for compiling KDE 4 applications Summary: Header files for compiling KDE 4 applications
Provides: plasma-devel = %{version}-%{release} Provides: plasma-devel = %{version}-%{release}
Provides: nepomuk-devel = %{version}-%{release}
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: kdelibs4-devel < %{version}-%{release} Obsoletes: kdelibs4-devel < %{version}-%{release}
Provides: kdelibs4-devel = %{version}-%{release} Provides: kdelibs4-devel = %{version}-%{release}
@ -313,8 +318,13 @@ Requires: %{cmake_pkg} >= 2.8.9
Requires: pkgconfig(libattica) >= %{attica_ver} Requires: pkgconfig(libattica) >= %{attica_ver}
Requires: pkgconfig(openssl) Requires: pkgconfig(openssl)
Requires: pkgconfig(phonon) Requires: pkgconfig(phonon)
%if ! 0%{?nepomuk}
# considered part of nepomuk-devel # considered part of nepomuk-devel
Requires: pkgconfig(shared-desktop-ontologies) pkgconfig(soprano) Provides: nepomuk-devel = %{version}-%{release}
Requires: pkgconfig(shared-desktop-ontologies)
## Can consider dropping, thanks to Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch
Requires: pkgconfig(soprano)
%endif
Requires: qt4-devel Requires: qt4-devel
%{?x_deps:Requires: %{x_deps}} %{?x_deps:Requires: %{x_deps}}
@ -322,6 +332,27 @@ Requires: qt4-devel
This package includes the header files you will need to compile This package includes the header files you will need to compile
applications for KDE 4. applications for KDE 4.
%package nepomuk
Summary: KDE Nepomuk library
Provides: kdelibs4-nepomuk = %{version}-%{release}
%{?_isa:Provides: kdelibs4-nepomuk%{?_isa} = %{version}-%{release}}
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: shared-desktop-ontologies >= %{shared_desktop_ontologies_version}
Requires: soprano%{?_isa} >= %{soprano_version}
%description nepomuk
%{summary}.
%package nepomuk-devel
Summary: Development files for KDE Nepomuk
Obsoletes: kdelibs < 6:4.14.3-10
Provides: kdelibs4-nepomuk = %{version}-%{release}
%{?_isa:Provides: kdelibs4-nepomuk%{?_isa} = %{version}-%{release}}
Requires: %{name}-nepomuk%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: pkgconfig(shared-desktop-ontologies)
Requires: pkgconfig(soprano)
%description nepomuk-devel
%{summary}.
%package webkit %package webkit
Summary: KDE WebKit support library Summary: KDE WebKit support library
# upgrade path, when -webkit subpkg landed # upgrade path, when -webkit subpkg landed
@ -395,6 +426,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch52 -p1 -b .SOLID_UPNP %patch52 -p1 -b .SOLID_UPNP
%patch53 -p1 -b .kjs-s390 %patch53 -p1 -b .kjs-s390
%patch54 -p1 -b .kjs-locale %patch54 -p1 -b .kjs-locale
%patch55 -p1 -b .Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES
%patch59 -p1 -b .filter %patch59 -p1 -b .filter
%patch61 -p1 -b .dot %patch61 -p1 -b .dot
%patch62 -p1 -b .arm-plasma %patch62 -p1 -b .arm-plasma
@ -430,6 +462,7 @@ pushd %{_target_platform}
-DHUPNP_ENABLED:BOOL=ON \ -DHUPNP_ENABLED:BOOL=ON \
-DKAUTH_BACKEND:STRING="PolkitQt-1" \ -DKAUTH_BACKEND:STRING="PolkitQt-1" \
-DKDE_DISTRIBUTION_TEXT="%{version}-%{release}%{?fedora: Fedora}%{?rhel: Red Hat Enterprise Linux}" \ -DKDE_DISTRIBUTION_TEXT="%{version}-%{release}%{?fedora: Fedora}%{?rhel: Red Hat Enterprise Linux}" \
-DKIO_NO_SOPRANO:BOOL=ON \
%{?udisks2:-DWITH_SOLID_UDISKS2:BOOL=ON} \ %{?udisks2:-DWITH_SOLID_UDISKS2:BOOL=ON} \
.. ..
popd popd
@ -744,6 +777,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Sat Dec 20 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.3-7
- borrow Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch from obs
- start work to support -nepomuk, -nepomuk-devel subpkgs (wip)
* Thu Dec 18 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.3-6 * Thu Dec 18 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.3-6
- kill uri/ fake mimetypes (#587573, kde#269045) - kill uri/ fake mimetypes (#587573, kde#269045)
- own fake mimetype dirs, e.g. mime/all/ (#907667) - own fake mimetype dirs, e.g. mime/all/ (#907667)