rpms/skychart/devel skychart.spec, 1.5, 1.6 skychart-3.0.1.5-ppc64dbg.patch, 1.1, NONE

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/skychart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16929

Modified Files:
	skychart.spec 
Removed Files:
	skychart-3.0.1.5-ppc64dbg.patch 
Log Message:
Correct wrong cross-merge


Index: skychart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/devel/skychart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- skychart.spec	1 Dec 2008 21:30:39 -0000	1.5
+++ skychart.spec	2 Dec 2008 08:33:14 -0000	1.6
@@ -14,9 +14,11 @@
 Patch0:         skychart-3.0.1.5-config.patch
 Patch1:         skychart-3.0.1.5-wl.patch
 Patch2:         skychart-3.0.1.5-paths.patch
-Patch666:       skychart-3.0.1.5-ppc64dbg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# FIXME: http://koji.fedoraproject.org/koji/taskinfo?taskID=918916
+ExcludeArch:    ppc64
+
 BuildRequires:  lazarus >= 0.9.26
 BuildRequires:  ImageMagick
 BuildRequires:  desktop-file-utils
@@ -45,11 +47,9 @@
 %patch0 -p1 -b .config
 %patch1 -p1 -b .wl
 %patch2 -p1 -b .paths
-%patch666 -p1 -b .ppc64dbg
 find . -type f -print0 |xargs -0 chmod 644
 
 
-
 %build
 lazbuild --primary-config-path=$PWD/.lazarus skychart/component/cdccomponents.lpk
 lazbuild --primary-config-path=$PWD/.lazarus skychart/cdc.lpi


--- skychart-3.0.1.5-ppc64dbg.patch DELETED ---