rpms/aplus-fsf/devel aplus-fsf-4.20-makefile.patch, 1.5, 1.6 aplus-fsf.spec, 1.8, 1.9

Jochen Schmitt (s4504kr) fedora-extras-commits at redhat.com
Thu Feb 15 19:43:30 UTC 2007


Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31740

Modified Files:
	aplus-fsf-4.20-makefile.patch aplus-fsf.spec 
Log Message:
Try it again

aplus-fsf-4.20-makefile.patch:

Index: aplus-fsf-4.20-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf-4.20-makefile.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aplus-fsf-4.20-makefile.patch	15 Feb 2007 19:24:56 -0000	1.5
+++ aplus-fsf-4.20-makefile.patch	15 Feb 2007 19:42:57 -0000	1.6
@@ -1,5 +1,5 @@
 --- aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am.org	2001-01-19 22:11:24.000000000 +0100
-+++ aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -8,7 +8,7 @@
  ##                                                                           ##
  ###############################################################################
@@ -10,7 +10,7 @@
  fonts_pcf_DATA = \
  	Kapl.alias \
 --- aplus-fsf-4.20/src/fonts/X11/Makefile.am.org	2001-01-19 22:10:32.000000000 +0100
-+++ aplus-fsf-4.20/src/fonts/X11/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/fonts/X11/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -8,4 +8,4 @@
  ##                                                                           ##
  ###############################################################################
@@ -18,7 +18,7 @@
 -SUBDIRS = pcf bdf
 +SUBDIRS = pcf
 --- aplus-fsf-4.20/src/fonts/TrueType/Makefile.am.org	2001-01-19 22:10:06.000000000 +0100
-+++ aplus-fsf-4.20/src/fonts/TrueType/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/fonts/TrueType/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -8,7 +8,7 @@
  ##                                                                           ##
  ###############################################################################
@@ -29,7 +29,7 @@
  TrueType_DATA = KAPL.TTF
  
 --- aplus-fsf-4.20/src/MSTypes/Makefile.am.org	2001-01-19 21:46:18.000000000 +0100
-+++ aplus-fsf-4.20/src/MSTypes/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/MSTypes/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -298,8 +298,7 @@
  	MSTypeMatrix.C\
  	MSTypeVector.C
@@ -41,7 +41,7 @@
  INCLUDES = -I..
  
 --- aplus-fsf-4.20/src/cxb/Makefile.am.org	2001-01-19 22:28:09.000000000 +0100
-+++ aplus-fsf-4.20/src/cxb/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/cxb/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -13,5 +13,7 @@
  libcxb_la_SOURCES = \
  	binary.c
@@ -51,7 +51,7 @@
  INCLUDES = -I..
  
 --- aplus-fsf-4.20/src/IPC/Makefile.am.org	2001-01-19 21:38:33.000000000 +0100
-+++ aplus-fsf-4.20/src/IPC/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/IPC/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -52,6 +52,8 @@
  	pString_Connection.H\
  	pString_Listener.H
@@ -62,7 +62,7 @@
  
  idapdir = $(libdir)
 --- aplus-fsf-4.20/src/cxs/Makefile.am.org	2001-11-25 21:31:02.000000000 +0100
-+++ aplus-fsf-4.20/src/cxs/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/cxs/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -12,6 +12,8 @@
  
  libcxs_la_SOURCES = S.c
@@ -73,7 +73,7 @@
  
  sdir = $(libdir)
 --- aplus-fsf-4.20/src/AplusGUI/Makefile.am.org	2001-01-30 21:48:35.000000000 +0100
-+++ aplus-fsf-4.20/src/AplusGUI/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/AplusGUI/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -125,5 +125,7 @@
  	EnumTables.H\
  	Macros.H
@@ -83,7 +83,7 @@
  INCLUDES = -I.. -I/usr/X11R6/include
  
 --- aplus-fsf-4.20/src/MSGUI/Makefile.am.org	2001-01-30 21:49:25.000000000 +0100
-+++ aplus-fsf-4.20/src/MSGUI/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/MSGUI/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -382,6 +382,8 @@
  	MSWidgetView.H\
  	MSWindow.H
@@ -94,7 +94,7 @@
  	MSArrayViewInlines.C\
  	MSCompositeTextInlines.C\
 --- aplus-fsf-4.20/src/lisp.1/Makefile.am.org	2001-03-09 23:38:09.000000000 +0100
-+++ aplus-fsf-4.20/src/lisp.1/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/lisp.1/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -8,10 +8,9 @@
  ##                                                                           ##
  ###############################################################################
@@ -116,7 +116,7 @@
  	a-font.el \
  	aplus.el \
 --- aplus-fsf-4.20/src/Makefile.am.org	2005-08-29 04:55:30.000000000 +0200
-+++ aplus-fsf-4.20/src/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -9,24 +9,21 @@
  ###############################################################################
  
@@ -152,7 +152,7 @@
  
  EXTRA_DIST = LICENSE
 --- aplus-fsf-4.20/src/cxsys/Makefile.am.org	2001-01-19 22:28:29.000000000 +0100
-+++ aplus-fsf-4.20/src/cxsys/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/cxsys/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -20,5 +20,7 @@
  	impexp.c \
  	impexp.h
@@ -162,7 +162,7 @@
  INCLUDES = -I..
  
 --- aplus-fsf-4.20/src/esf/Makefile.am.org	2001-01-19 22:28:59.000000000 +0100
-+++ aplus-fsf-4.20/src/esf/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/esf/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -24,5 +24,7 @@
  	kcheck.c \
  	dyld2.c
@@ -172,7 +172,7 @@
  INCLUDES = -I..
  
 --- aplus-fsf-4.20/src/app-defaults/Makefile.am.org	2001-01-22 21:35:46.000000000 +0100
-+++ aplus-fsf-4.20/src/app-defaults/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/app-defaults/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -8,7 +8,7 @@
  ##                                                                           ##
  ###############################################################################
@@ -183,7 +183,7 @@
  appdefaults_DATA = XTerm
  
 --- aplus-fsf-4.20/src/main/aplus_main.c.org	2005-08-29 16:47:10.000000000 +0200
-+++ aplus-fsf-4.20/src/main/aplus_main.c	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/main/aplus_main.c	2007-02-15 20:37:49.000000000 +0100
 @@ -64,7 +64,7 @@
  static C *_whoseTree = "";
  static C *_banner = BANNER;
@@ -193,8 +193,8 @@
  static C *_version = (char *)0;
  static C *usage = "usage: a+ [-d display] [-s] [-w workarea] [-q] [-h megsforheap] [-m atmpMode] [script [args]]\n";
  static I _enable_coredump;
---- aplus-fsf-4.20/src/main/Makefile.am.org	2007-02-15 18:43:29.000000000 +0100
-+++ aplus-fsf-4.20/src/main/Makefile.am	2007-02-15 18:43:46.000000000 +0100
+--- aplus-fsf-4.20/src/main/Makefile.am.org	2005-08-29 03:32:27.000000000 +0200
++++ aplus-fsf-4.20/src/main/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -21,7 +21,7 @@
  	matherr.c \
  	version.h
@@ -205,7 +205,7 @@
  INCLUDES = -I.. $(X_INCLUDES)
  
 --- aplus-fsf-4.20/src/MSIPC/Makefile.am.org	2001-01-19 21:44:13.000000000 +0100
-+++ aplus-fsf-4.20/src/MSIPC/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/MSIPC/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -52,6 +52,8 @@
  	MSTimer.H\
  	MSTv.H
@@ -215,11 +215,11 @@
  EXTRA_DIST = MSProtocolConnection.C
  
  INCLUDES = -I..
---- aplus-fsf-4.20/src/a/Makefile.am.org	2007-02-15 18:42:45.000000000 +0100
-+++ aplus-fsf-4.20/src/a/Makefile.am	2007-02-15 18:43:12.000000000 +0100
-@@ -51,7 +51,7 @@
+--- aplus-fsf-4.20/src/a/Makefile.am.org	2003-12-30 16:27:54.000000000 +0100
++++ aplus-fsf-4.20/src/a/Makefile.am	2007-02-15 20:37:49.000000000 +0100
+@@ -50,7 +50,7 @@
+ 	x.h
  
- liba_la_LIBADD = -L../dap -ldap
  
 -CFLAGS = @CFLAGS@ -DBSTUB
 +AM_CFLAGS = @CFLAGS@ -DBSTUB
@@ -227,7 +227,7 @@
  INCLUDES = -I..
  
 --- aplus-fsf-4.20/src/lisp.0/Makefile.in.org	2005-08-29 05:22:17.000000000 +0200
-+++ aplus-fsf-4.20/src/lisp.0/Makefile.in	2007-02-15 18:37:43.000000000 +0100
++++ aplus-fsf-4.20/src/lisp.0/Makefile.in	2007-02-15 20:37:49.000000000 +0100
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.6.3 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -644,7 +644,7 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
 --- aplus-fsf-4.20/src/cxc/Makefile.am.org	2001-01-19 22:28:18.000000000 +0100
-+++ aplus-fsf-4.20/src/cxc/Makefile.am	2007-02-15 18:37:36.000000000 +0100
++++ aplus-fsf-4.20/src/cxc/Makefile.am	2007-02-15 20:37:49.000000000 +0100
 @@ -15,5 +15,7 @@
  	cform.c \
  	cxc.h
@@ -654,9 +654,13 @@
  INCLUDES = -I..
  
 --- aplus-fsf-4.20/configure.in.org	2005-08-29 05:22:02.000000000 +0200
-+++ aplus-fsf-4.20/configure.in	2007-02-15 18:37:36.000000000 +0100
-@@ -17,6 +17,10 @@
- AM_PROG_LIBTOOL 
++++ aplus-fsf-4.20/configure.in	2007-02-15 20:40:12.000000000 +0100
+@@ -14,9 +14,13 @@
+ AC_PROG_CC
+ AC_PROG_CXX
+ 
+-AM_PROG_LIBTOOL 
++AC_PROG_LIBTOOL 
  AC_SUBST(LIBTOOL_DEPS)
  
 +APLVERSION=4.20.2


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aplus-fsf.spec	15 Feb 2007 19:24:56 -0000	1.8
+++ aplus-fsf.spec	15 Feb 2007 19:42:57 -0000	1.9
@@ -15,7 +15,7 @@
 
 Name: %name
 Version: 4.20.2
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPL
 
 Summary: Advanced APL interpreter with s interface
@@ -263,7 +263,7 @@
 %ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.cache-*
 
 %Changelog
-* Thu Feb 15 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 4.20.2-15
+* Thu Feb 15 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 4.20.2-16
 - Remove dependency to automake-1.6
 
 * Wed Feb 14 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 4.20.2-14




More information about the scm-commits mailing list