From 28798414d77c369172985333fd3b14111e413fd0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Nov 19 2007 14:36:21 +0000 Subject: - kpat does not start when kdebase not installed (#247746) --- diff --git a/kdegames-3.5.8-kpat_background.patch b/kdegames-3.5.8-kpat_background.patch new file mode 100644 index 0000000..db71d4b --- /dev/null +++ b/kdegames-3.5.8-kpat_background.patch @@ -0,0 +1,21 @@ +diff -up kdegames-3.5.8/kpat/pwidget.cpp.kpat_background kdegames-3.5.8/kpat/pwidget.cpp +--- kdegames-3.5.8/kpat/pwidget.cpp.kpat_background 2005-09-10 03:18:32.000000000 -0500 ++++ kdegames-3.5.8/kpat/pwidget.cpp 2007-11-19 08:28:06.000000000 -0600 +@@ -125,7 +125,7 @@ pWidget::pWidget() + } + + wallpapers->setItems(list2); +- wallpapers->setCurrentItem(list2.findIndex("No-Ones-Laughing-3")); ++ wallpapers->setCurrentItem(list2.findIndex("green")); + + changeWallpaper(); + +@@ -151,7 +151,7 @@ pWidget::pWidget() + QString bgpath = config->readPathEntry("Background"); + kdDebug(11111) << "bgpath '" << bgpath << "'" << endl; + if (bgpath.isEmpty()) +- bgpath = locate("wallpaper", "No-Ones-Laughing-3.jpg"); ++ bgpath = locate("wallpaper", "green.png"); + background = QPixmap(bgpath); + + bool animate = config->readBoolEntry( "Animation", true); diff --git a/kdegames.spec b/kdegames.spec index c5b21ac..515a8ee 100644 --- a/kdegames.spec +++ b/kdegames.spec @@ -12,7 +12,7 @@ Name: kdegames Summary: K Desktop Environment - Games Epoch: 6 Version: 3.5.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Amusements/Games @@ -22,6 +22,8 @@ Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.b Patch0: kdegames-3.1.1-konquest.patch Patch1: kdegames-3.5.8-trademarks.patch +# http://bugzilla.redhat.com/247746 +Patch2: kdegames-3.5.8-kpat_background.patch Provides: kdegames3 = %{version}-%{release} @@ -30,10 +32,9 @@ Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} %else Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release} Provides: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig +%endif BuildRequires: kdelibs3-devel >= %{version} %if %{make_cvs} @@ -77,6 +78,7 @@ License: LGPLv2 %patch0 -p1 -b .konquest %patch1 -p1 -b .trademarks +%patch2 -p1 -b .kpat_background %if %{make_cvs} make -f admin/Makefile.common cvs @@ -193,6 +195,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Mon Nov 19 2007 Rex Dieter 6:3.5.8-4 +- kpat does not start when kdebase not installed (#247746) + * Wed Oct 24 2007 Rex Dieter 6:3.5.8-3 - -libs conditional (f8+) - -libs: %%post/%%postun -p /sbin/ldconfig