rpms/moe/F-10 moe-1.0-configure.patch, NONE, 1.1 moe-1.0-includes.patch, NONE, 1.1 moe.spec, 1.1, 1.2

[Vivek Shah]

Author: bonii

Update of /cvs/pkgs/rpms/moe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10229

Modified Files:
	moe.spec 
Added Files:
	moe-1.0-configure.patch moe-1.0-includes.patch 
Log Message:
* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> 1.0-5
- Fixed configure to respect the environment's CFLAGS and CXXFLAGS settings.


moe-1.0-configure.patch:

--- NEW FILE moe-1.0-configure.patch ---
Binary files moe-1.0.orig/arg_parser.o and moe-1.0/arg_parser.o differ
diff -urNp moe-1.0.orig/config.status moe-1.0/config.status
--- moe-1.0.orig/config.status	1970-01-01 05:30:00.000000000 +0530
+++ moe-1.0/config.status	2009-04-19 12:24:14.000000000 +0530
@@ -0,0 +1,8 @@
+#!/bin/sh
+# This file was generated automatically by configure. Do not edit.
+# Run this file to recreate the current configuration.
+#
+# This script is free software: you have unlimited permission
+# to copy, distribute and modify it.
+
+exec /bin/sh ./configure --build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu --target=x86_64-redhat-linux-gnu --program-prefix= --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/var/lib --mandir=/usr/share/man --infodir=/usr/share/info --no-create
diff -urNp moe-1.0.orig/configure moe-1.0/configure
--- moe-1.0.orig/configure	2009-04-19 12:15:03.000000000 +0530
+++ moe-1.0/configure	2009-04-19 12:38:31.000000000 +0530
@@ -26,8 +26,8 @@ sysconfdir='$(prefix)/etc'
 CC=
 CXX=
 CPPFLAGS=
-CFLAGS='-Wall -W -O2'
-CXXFLAGS='-Wall -W -O2'
+CFLAGS="-Wall -W -O2 $CFLAGS"
+CXXFLAGS="-Wall -W -O2 $CXXFLAGS"
 LDFLAGS=-lncurses
 
 # Loop over all args

moe-1.0-includes.patch:

--- NEW FILE moe-1.0-includes.patch ---
diff -ru moe-1.0.orig/menu_help.cc moe-1.0/menu_help.cc
--- moe-1.0.orig/menu_help.cc	2009-03-01 17:15:21.000000000 +0000
+++ moe-1.0/menu_help.cc	2009-03-01 17:20:00.000000000 +0000
@@ -17,6 +17,7 @@
 
 #include <string>
 #include <vector>
+#include <stdio.h>
 
 #include "buffer.h"
 #include "menu.h"
diff -ru moe-1.0.orig/menu_opts.cc moe-1.0/menu_opts.cc
--- moe-1.0.orig/menu_opts.cc	2009-03-01 17:15:21.000000000 +0000
+++ moe-1.0/menu_opts.cc	2009-03-01 17:15:55.000000000 +0000
@@ -18,6 +18,7 @@
 #include <cctype>
 #include <string>
 #include <vector>
+#include <stdio.h>
 
 #include "buffer.h"
 #include "block.h"
diff -ru moe-1.0.orig/window.cc moe-1.0/window.cc
--- moe-1.0.orig/window.cc	2009-03-01 17:15:21.000000000 +0000
+++ moe-1.0/window.cc	2009-03-01 17:22:43.000000000 +0000
@@ -19,6 +19,7 @@
 #include <cstring>
 #include <string>
 #include <vector>
+#include <stdio.h>
 
 #include "buffer.h"
 #include "buffer_handle.h"


Index: moe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moe/F-10/moe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- moe.spec	25 Sep 2008 13:02:23 -0000	1.1
+++ moe.spec	19 Apr 2009 18:05:42 -0000	1.2
@@ -1,13 +1,14 @@
 Name:		moe
 Version:	1.0
-Release:	2%{?dist}
+Release:	5%{?dist}
 Summary:	A powerful clean text editor
 
 Group:		Applications/Editors
 License:	GPLv3+
 URL:		http://www.gnu.org/software/moe/moe.html
 Source0:	http://ftp.gnu.org/gnu/moe/%{name}-%{version}.tar.bz2
-
+Patch0:		moe-1.0-configure.patch
+Patch1:		moe-1.0-includes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -24,6 +25,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .configure
+%patch1 -p1 -b .includes
 
 
 %build
@@ -59,6 +62,15 @@
 %{_mandir}/man1/%{name}*
 
 %changelog
+* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> 1.0-5
+- Fixed configure to respect the environment's CFLAGS and CXXFLAGS settings.
+
+* Sun Mar 01 2009 Caolán McNamara - 1.0-4
+- include stdio.h for snprintf
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Sep 10 2008 Vivek Shah <boni.vivek at gmail.com> 1.0-2
 - Fixed build dependencies
 - Added removal of infodir/dir to avoid overwriting