From aab483c03e34e95ee5cbf6570fc8ef5dc09fd1d0 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Nov 19 2004 10:44:06 +0000
Subject: fix xf86gammacfg to work with xorg.conf


---

diff --git a/kdegraphics-3.3.1-xorg.patch b/kdegraphics-3.3.1-xorg.patch
new file mode 100644
index 0000000..6488e3f
--- /dev/null
+++ b/kdegraphics-3.3.1-xorg.patch
@@ -0,0 +1,11 @@
+--- kdegraphics-3.3.1/kgamma/xf86gammacfg/xf86gammacfg.cpp.orig	2004-10-03 03:14:01.000000000 -0400
++++ kdegraphics-3.3.1/kgamma/xf86gammacfg/xf86gammacfg.cpp	2004-11-18 06:23:30.000000000 -0500
+@@ -55,6 +55,8 @@
+     searchPaths.push_back("/usr/X11R6/etc/X11/XF86Config");
+     searchPaths.push_back("/usr/X11R6/lib/X11/XF86Config-4");
+     searchPaths.push_back("/usr/X11R6/lib/X11/XF86Config");
++    searchPaths.push_back("/usr/X11R6/lib/X11/xorg.conf");
++    searchPaths.push_back("/etc/X11/xorg.conf");
+ 
+     std::vector<string>::iterator it = searchPaths.begin();
+     for (; it != searchPaths.end(); ++it ) {
diff --git a/kdegraphics.spec b/kdegraphics.spec
index 2679c50..0fa3e5e 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -10,7 +10,7 @@
 %define no_scanner_archs s390 s390x
 
 Version: 3.3.1
-Release: 3
+Release: 4
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -23,6 +23,7 @@ Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.b
 Patch0: kde-libtool.patch
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-tiff.patch
+Patch3: kdegraphics-3.3.1-xorg.patch
 
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
@@ -256,6 +257,7 @@ This package contains a model editor for the PovRay raytracer.
 %setup -q
 %patch0 -p1 -b .libtool
 %patch1 -p1 -b .misc
+%patch3 -p1 -b .xorg
 
 %if %{rhel}
 echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
@@ -264,6 +266,7 @@ echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in
 %patch2 -p1 -b libtiff
 %endif
 
+
 # disable kpovmodeler temporary. waiting for freeglut
 %if !%{kpovmodeler}
    echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kpovmodeler\"" >kpovmodeler/configure.in.in
@@ -343,6 +346,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/kde/*
 
 %changelog
+* Fri Nov 19 2004 Than Ngo <than@redhat.com> 7:3.3.1-4
+- fix xf86gammacfg to work with xorg.conf
+
 * Mon Nov 01 2004 Than Ngo <than@redhat.com> 7:3.3.1-3
 - rebuilt