jreznik pushed to kdelibs3 (epel7). "disable cups support on f19+ (for now, needs lots 'o love)"

[notifications at fedoraproject.org]

>From 28da85f130fd00bc7769524a3e901a1ec7805568 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 21 Dec 2012 12:37:07 -0600
Subject: disable cups support on f19+ (for now, needs lots 'o love)


diff --git a/kdelibs3.spec b/kdelibs3.spec
index 0530acd..8e95f94 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -19,7 +19,7 @@
 %define apidocs 0
 
 %if 0%{?fedora} < 19 && 0%{?rhel} < 7
-%global cupsdconf 1
+%global _enable_cups --enable-cups
 %endif
 
 Summary: KDE 3 Libraries
@@ -132,7 +132,7 @@ Requires: hunspell
 
 BuildRequires: gettext
 BuildRequires: pcre-devel
-BuildRequires: cups-devel cups
+%{?_enable_cups:BuildRequires: cups-devel cups}
 BuildRequires: %{qt3}-devel %{qt3}-devel-docs
 BuildRequires: arts-devel >= %{arts_ev}
 BuildRequires: flex >= 2.5.4a-13
@@ -262,10 +262,6 @@ 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
 
 
@@ -294,7 +290,7 @@ export DO_NOT_COMPILE="libkscreensaver"
 %if "%{_lib}" == "lib64"
   --enable-libsuffix="64" \
 %endif
-   --enable-cups \
+   %{?_enable_cups}%{!?enable_cups:--disable-cups} \
    --enable-mitshm \
    --enable-pie \
    --enable-sendfile \
@@ -577,7 +573,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 %changelog
 * Fri Dec 21 2012 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-44
-- fix rawhide build
+- disable cups support on f19+ (for now, needs lots 'o love)
 
 * Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 3.5.10-43
 - rebuild against new libjpeg
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=28da85f130fd00bc7769524a3e901a1ec7805568