[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/emacs/devel emacs-21-personality-linux32-101818.patch, 1.1, 1.2 emacs.spec, 1.52, 1.53



Author: petersen

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3678

Modified Files:
	emacs-21-personality-linux32-101818.patch emacs.spec 
Log Message:
- add max macro to emacs-21-personality-linux32-101818.patch
- merge %setup from emacs22.spec


emacs-21-personality-linux32-101818.patch:
 configure.in   |   12 ++++++++++
 src/emacs.c    |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lastfile.c |    2 -
 src/lisp.h     |   10 ++++++++
 4 files changed, 90 insertions(+), 2 deletions(-)

Index: emacs-21-personality-linux32-101818.patch
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs-21-personality-linux32-101818.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-21-personality-linux32-101818.patch	14 Jul 2005 11:06:06 -0000	1.1
+++ emacs-21-personality-linux32-101818.patch	14 Jul 2005 12:59:04 -0000	1.2
@@ -1,5 +1,5 @@
---- emacs-21.3/src/emacs.c~	2002-08-30 04:27:07.000000000 +0900
-+++ emacs-21.3/src/emacs.c	2005-07-14 15:36:48.000000000 +0900
+--- emacs-21.4/src/emacs.c~	2002-08-30 04:27:07.000000000 +0900
++++ emacs-21.4/src/emacs.c	2005-07-14 15:36:48.000000000 +0900
 @@ -61,6 +61,10 @@
  #include <sys/resource.h>
  #endif
@@ -103,8 +103,8 @@
    /* Bind `command-line-processed' to nil before dumping,
       so that the dumped Emacs will process its command line
       and set up to work with X windows if appropriate.  */
---- emacs-21.3/src/lastfile.c~	1999-01-18 04:16:08.000000000 +0900
-+++ emacs-21.3/src/lastfile.c	2005-07-14 15:56:18.000000000 +0900
+--- emacs-21.4/src/lastfile.c~	1999-01-18 04:16:08.000000000 +0900
++++ emacs-21.4/src/lastfile.c	2005-07-14 15:56:18.000000000 +0900
 @@ -40,7 +40,6 @@
  
  char my_edata[] = "End of Emacs initialized data";
@@ -118,8 +118,8 @@
  static char _my_endbss[1];
  char * my_endbss_static = _my_endbss;
 -#endif
---- emacs-21.3/configure.in~	2005-04-06 23:47:05.000000000 +0900
-+++ emacs-21.3/configure.in	2005-07-14 15:39:47.000000000 +0900
+--- emacs-21.4/configure.in~	2005-04-06 23:47:05.000000000 +0900
++++ emacs-21.4/configure.in	2005-07-14 15:39:47.000000000 +0900
 @@ -1350,6 +1350,18 @@
  AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
    linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
@@ -139,3 +139,19 @@
  AC_HEADER_STDC
  AC_HEADER_TIME
  AC_DECL_SYS_SIGLIST
+--- emacs-21.4/src/lisp.h~	2002-02-08 05:20:12.000000000 +0900
++++ emacs-21.4/src/lisp.h	2005-07-14 21:36:54.000000000 +0900
+@@ -2987,3 +2987,13 @@
+ #else
+ #define SWITCH_ENUM_CAST(x) (x)
+ #endif
++
++
++/* The ubiquitous min and max macros.  */
++
++#ifdef max
++#undef max
++#undef min
++#endif
++#define min(a, b)	((a) < (b) ? (a) : (b))
++#define max(a, b)	((a) > (b) ? (a) : (b))


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- emacs.spec	14 Jul 2005 08:34:35 -0000	1.52
+++ emacs.spec	14 Jul 2005 12:59:04 -0000	1.53
@@ -189,7 +189,11 @@
 %define emacs_libexecdir %{_libexecdir}/emacs/%{version}/%{_host}
 
 %prep
+%if %{emacs21}
 %setup -q -b 1 -a 24 -a 28 -a 33
+%else
+%setup -q -a 33
+%endif
 
 %patch2 -p1 -b .2-s390
 %if %{emacs21}


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]