From 15667de6c5a7b73d63f6fdee20d144fba2b34895 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 10 2017 15:20:47 +0000 Subject: 16.12.1, drop -drkonqi (f26+) --- diff --git a/.gitignore b/.gitignore index aebb3ac..299185d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kde-runtime-16.12.0.tar.xz +/kde-runtime-16.12.1.tar.xz diff --git a/kde-runtime.spec b/kde-runtime.spec index c78d4ba..c498c4f 100644 --- a/kde-runtime.spec +++ b/kde-runtime.spec @@ -17,12 +17,16 @@ %endif %if 0%{?fedora} < 25 +%global drkonqi 1 +%endif + +%if 0%{?fedora} < 25 %global strigi 1 %endif Name: kde-runtime Summary: KDE Runtime -Version: 16.12.0 +Version: 16.12.1 Release: 1%{?dist} # http://techbase.kde.org/Policies/Licensing_Policy @@ -98,12 +102,13 @@ Provides: desktop-notification-daemon # http://bugzilla.redhat.com/794958 Requires: dbus-x11 Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%if 0%{?plasma5} -# soft dep allows removal to workaround bug #1264486 -Recommends: %{name}-drkonqi = %{version}-%{release} -%else +%if 0%{?drkonqi} && ! 0%{?plasma5} Requires: %{name}-drkonqi = %{version}-%{release} +%endif +%if 0%{?kuiserver} Requires: %{name}-kuiserver = %{version}-%{release} +%endif +%if ! 0%{?plasma5} %ifnarch s390 s390x Requires: eject %endif @@ -126,8 +131,6 @@ BuildRequires: kdelibs4-devel >= 4.14.4 %if 0%{?webkit} BuildRequires: kdelibs4-webkit-devel %endif -# kdepimlibs' kxmlrpcclient used for drkonqi, ok to leave unversioned -BuildRequires: kdepimlibs-devel BuildRequires: kactivities-devel BuildRequires: libgcrypt-devel >= 1.5.0 BuildRequires: libjpeg-devel @@ -181,8 +184,10 @@ Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel %{summary}. +%if 0%{?drkonqi} %package drkonqi Summary: DrKonqi crash handler for KDE4 +BuildRequires: kdepimlibs-devel Requires: %{name} = %{version}-%{release} %if 0%{?fedora} > 23 Requires: dnf-command(debuginfo-install) @@ -192,6 +197,7 @@ Requires: kdialog Requires: polkit %description drkonqi %{summary}. +%endif %package kuiserver Summary: KDE Progress Info UI server @@ -292,6 +298,7 @@ pushd %{_target_platform} %{?no_webkit} \ %if 0%{?plasma5} -DBUILD_khelpcenter:BOOL=OFF \ + %{?!drkonqi:-DBUILD_drkonqi:BOOL=OFF} \ %{?!kuiserver:-DBUILD_kuiserver:BOOL=OFF} %endif @@ -322,9 +329,11 @@ rm -f %{buildroot}%{_kde4_iconsdir}/hicolor/index.theme # people/countries' flags :-( %{!?flags:rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png} +%if 0%{?drkonqi} # installdbgsymbols script install -p -D -m755 drkonqi/doc/examples/installdbgsymbols_fedora.sh \ %{buildroot}%{_kde4_libexecdir}/installdbgsymbols.sh +%endif # FIXME: -devel type files, omit for now rm -vf %{buildroot}%{_kde4_libdir}/lib{kwalletbackend,molletnetwork}.so @@ -487,6 +496,7 @@ fi %{_kde4_appsdir}/cmake/modules/*.cmake %{_datadir}/dbus-1/interfaces/*.xml +%if 0%{?drkonqi} %if 0%{?fedora} > 16 || 0%{?rhel} > 6 %post drkonqi # make DrKonqi work by default by taming SELinux enough (suggested by dwalsh) @@ -504,6 +514,7 @@ fi %{_kde4_libexecdir}/drkonqi %{_kde4_libexecdir}/installdbgsymbols.sh %{_kde4_appsdir}/drkonqi/ +%endif %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -565,6 +576,9 @@ fi %changelog +* Tue Jan 10 2017 Rex Dieter - 16.12.1-1 +- 16.12.1, drop -drkonqi (f26+) + * Thu Dec 22 2016 Rex Dieter - 16.12.0-1 - 16.12.0 diff --git a/sources b/sources index dc32a4f..a2270a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kde-runtime-16.12.0.tar.xz) = 8b5329f92a7e58a596804614be7b69ed600229450f8df15c7f188f4116e2e7569699177ae5d0b465395be73fa4bcae0d93e84a410d0935db8b1151a97d070e5f +SHA512 (kde-runtime-16.12.1.tar.xz) = a750274745f9b015bd19cb12983326cceb0772613a817f5ecc15b6585216fd2b10d3fed201951677363c1db8c09bc03a90fb0d993dceee38d1633f97d7975d52