From 9df7db4556930d8ee6a373cf51013eb3da207aa4 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Dec 06 2012 00:59:31 +0000 Subject: omit cupsdconf (F19+), FTBFS with the latest CUPS and not worth fixing * Thu Dec 06 2012 Kevin Kofler 3.5.10-41 - omit cupsdconf (F19+), FTBFS with the latest CUPS and not worth fixing --- diff --git a/kdelibs3.spec b/kdelibs3.spec index f37eab2..e54eb53 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -18,10 +18,14 @@ %define apidocs 0 +%if 0%{?fedora} < 19 && 0%{?rhel} < 7 +%global cupsdconf 1 +%endif + Summary: KDE 3 Libraries Name: kdelibs3 Version: 3.5.10 -Release: 40%{?dist} +Release: 41%{?dist} License: LGPLv2 Url: http://www.kde.org/ @@ -258,6 +262,10 @@ format for easy browsing sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h +%if !0%{?cupsdconf} +sed -i -e '/^SUBDIRS = cupsdconf2$/d' kdeprint/cups/Makefile.am +%endif + make -f admin/Makefile.common cvs @@ -475,7 +483,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %config(noreplace) %{_sysconfdir}/profile.d/* %endif %{_bindir}/artsmessage +%if 0%{?cupsdconf} %{_bindir}/cupsdconf +%endif %{_bindir}/cupsdoprint %{_bindir}/dcop %{_bindir}/dcopclient @@ -567,6 +577,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog +* Thu Dec 06 2012 Kevin Kofler 3.5.10-41 +- omit cupsdconf (F19+), FTBFS with the latest CUPS and not worth fixing + * Tue Dec 04 2012 Rex Dieter 3.5.10-40 - kate has a file conflict with kdelibs3 (#883529)