rpms/kaya/devel kaya.spec,1.16,1.17

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/pkgs/rpms/kaya/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11620

Modified Files:
	kaya.spec 
Log Message:
Remove Conflict markers


Index: kaya.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaya/devel/kaya.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kaya.spec	5 May 2010 18:00:35 -0000	1.16
+++ kaya.spec	5 May 2010 18:03:01 -0000	1.17
@@ -27,13 +27,8 @@ ExcludeArch:	alpha ppc64
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-<<<<<<< kaya.spec
 BuildRequires:  libtool, autoconf, pkgconfig 
 BuildRequires:	ghc >= 6.10.3, gc-devel, happy, zlib-devel, gnutls-devel
-=======
-BuildRequires:  autoconf
-BuildRequires:	ghc >= 6.10.3, gc-devel >= 7.2, happy, zlib-devel, gnutls-devel
->>>>>>> 1.15
 BuildRequires:  libgcrypt-devel, pcre-devel ghc-editline-devel
 BuildRequires:	postgresql-devel, mysql-devel, sqlite-devel
 BuildRequires:  gd-devel, SDL-devel, mesa-libGL-devel
@@ -68,22 +63,12 @@ Additional you may find samples for this
 %setup -q
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .ghc621
-<<<<<<< kaya.spec
 %patch3 -p1 -b .gc
 %patch4 -p1 -b .dyn
-=======
-%patch3 -p1 -b .gc_api
-
-autoreconf
-
->>>>>>> 1.15
 
 %build
-<<<<<<< kaya.spec
 autoconf
 autoreconf
-=======
->>>>>>> 1.15
 CFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/\-wp,\-D_FORTIFY_SOURCE=2//g' | \
                                sed -e 's/\-fstack\-protector//g' )
 %configure