rpms/kaya/F-11 kaya-0.5.2-conf.patch, NONE, 1.1 kaya.spec, 1.6, 1.7 kaya-0.5.0-conf.patch, 1.1, NONE kaya-0.5.1-ghc.patch, 1.1, NONE kaya-0.5.1-tst.patch, 1.1, NONE

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/kaya/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27313

Modified Files:
	kaya.spec 
Added Files:
	kaya-0.5.2-conf.patch 
Removed Files:
	kaya-0.5.0-conf.patch kaya-0.5.1-ghc.patch 
	kaya-0.5.1-tst.patch 
Log Message:
Fix wrong BR

kaya-0.5.2-conf.patch:
 configure.ac       |    3 ++-
 stdlib/Makefile.in |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE kaya-0.5.2-conf.patch ---
diff -up kaya-0.5.2/configure.ac.orig kaya-0.5.2/configure.ac
--- kaya-0.5.2/configure.ac.orig	2009-04-12 12:02:24.000000000 +0200
+++ kaya-0.5.2/configure.ac	2009-07-09 19:11:20.000000000 +0200
@@ -248,7 +248,7 @@ PGINC=""
 AC_ARG_DISABLE([postgres],
 	AS_HELP_STRING([--disable-postgres],
 	[Disable Postgres database support]),
-	[AC_CHECK_HEADER([postgresql/libpq-fe.h],[PGINC="-I/usr/include/postgresql"])
+	[AC_CHECK_HEADER([libpq-fe.h],[PGINC="-I/usr/include"])
 	AC_CHECK_LIB(pq, PQconnectdb, 
 		[PGSTUB=""
 	         PGMAN="PostgresDB.libs"
@@ -275,6 +275,7 @@ AC_ARG_DISABLE([mysql],
 	AS_HELP_STRING([--disable-mysql],
 	[Disable MySQL database support]),
 [AC_CHECK_HEADER([mysql/mysql.h])
+LIBS="$LIBS -L${libdir}/mysql"
 AC_CHECK_LIB(mysqlclient, mysql_init, 
 	[AC_MSG_NOTICE([Found libmysqlclient, is it recent enough?])
 	 AC_CHECK_LIB(mysqlclient, mysql_stmt_init, 
diff -up kaya-0.5.2/stdlib/Makefile.in.orig kaya-0.5.2/stdlib/Makefile.in
--- kaya-0.5.2/stdlib/Makefile.in.orig	2009-04-12 12:02:24.000000000 +0200
+++ kaya-0.5.2/stdlib/Makefile.in	2009-07-09 19:15:23.000000000 +0200
@@ -87,7 +87,7 @@ Mime.o: Binary.ki Strings.ki IO.ki Regex
 Compress.o: Binary.ki zlib_glue.h Strings.ki Regex.ki
 Reflect.o: Builtins.ki Prelude.ki
 Pickle.o: Prelude.ki Binary.ki Reflect.ki Strings.ki Parse.ki
-Plugins.o: dl.h
+Plugins.o: dl.h Array.ki Regex.ki
 KayaDoc.o: ElementTree.ki Strings.ki HTMLDocument.ki Time.ki Regex.ki
 ElementTreeData.o: Dict.ki
 ElementTree.o: XMLentities.ki ElementTreeData.ki Regex.ki


Index: kaya.spec
===================================================================
RCS file: /cvs/extras/rpms/kaya/F-11/kaya.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kaya.spec	5 Mar 2009 21:05:46 -0000	1.6
+++ kaya.spec	29 Jul 2009 16:53:33 -0000	1.7
@@ -3,7 +3,7 @@
 %define debug_package %{nil}
 
 Name:		kaya
-Version:	0.5.1
+Version:	0.5.2
 Release:	4%{?dist}
 Summary:	A Statically typed, imperative programming-language
 
@@ -11,9 +11,7 @@ Group:		Development/Languages
 License:	GPLv2+ and LGPLv2+
 URL:		http://kayalang.org
 Source0:	http://kayalang.org/src/%{name}-%{version}.tgz
-Patch1:		kaya-0.5.1-tst.patch
-Patch2:		kaya-0.5.0-conf.patch
-Patch3:		kaya-0.5.1-ghc.patch
+Patch1:		kaya-0.5.2-conf.patch
 
 #
 # ghc is not supported on alpha and ppc64
@@ -23,12 +21,12 @@ ExcludeArch:	alpha ppc64
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf
-BuildRequires:	ghc >= 6.10.0, gc-devel, happy, zlib-devel, gnutls-devel
-BuildRequires:  libgcrypt-devel, pcre-devel
+BuildRequires:	ghc >= 6.10.3, gc-devel, happy, zlib-devel, gnutls-devel
+BuildRequires:  libgcrypt-devel, pcre-devel ghc-editline-devel
 BuildRequires:	postgresql-devel, mysql-devel, sqlite-devel
 BuildRequires:  gd-devel, SDL-devel, mesa-libGL-devel
 BuildRequires:  ncurses-devel, freeglut-devel
-BuildRequires:	libtool
+BuildRequires:	libtool, autoconf
 
 %description
 Kaya is a compiled statically typed (ie, types are checked at compile time)
@@ -53,12 +51,10 @@ Additional you may find samples for this
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1 
-%patch3 -p1
+%patch1 -p1 -b .orig
 
 %build
-autoconf
+autoreconf
 CFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/\-wp,\-D_FORTIFY_SOURCE=2//g' | \
                                sed -e 's/\-fstack\-protector//g' )
 %configure
@@ -99,6 +95,18 @@ rm -rf $RPM_BUILD_ROOT
 %doc examples/ docs/
 
 %changelog
+* Wed Jul 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5.2-4
+- Fix wrong BR.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5.2-2
+- Bump release
+
+* Sun Jun 28 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5.2-1
+- New upstream release
+
 * Thu Mar  5 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5.1-4
 - Supporting noarch subpackages
 


--- kaya-0.5.0-conf.patch DELETED ---


--- kaya-0.5.1-ghc.patch DELETED ---


--- kaya-0.5.1-tst.patch DELETED ---