rpms/aplus-fsf/devel aplus-fsf-4.20-makefile.patch, 1.4, 1.5 aplus-fsf.spec, 1.7, 1.8
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Thu Feb 15 19:25:28 UTC 2007
- Previous message: rpms/jd/devel .cvsignore, 1.69, 1.70 jd.spec, 1.80, 1.81 sources, 1.69, 1.70
- Next message: rpms/aplus-fsf/devel aplus-fsf-4.20-makefile.patch, 1.5, 1.6 aplus-fsf.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: s4504kr
Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31418
Modified Files:
aplus-fsf-4.20-makefile.patch aplus-fsf.spec
Log Message:
Remove dependency to automake-1.6
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aplus-fsf-4.20-makefile.patch 11 Dec 2006 17:10:19 -0000 1.4
+++ aplus-fsf-4.20-makefile.patch 15 Feb 2007 19:24:56 -0000 1.5
@@ -1,5 +1,57 @@
+--- 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
+@@ -8,7 +8,7 @@
+ ## ##
+ ###############################################################################
+
+-fonts_pcfdir = $(prefix)/fonts/X11/pcf
++fonts_pcfdir = @datadir@/fonts/apl/pcf
+
+ 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
+@@ -8,4 +8,4 @@
+ ## ##
+ ###############################################################################
+
+-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
+@@ -8,7 +8,7 @@
+ ## ##
+ ###############################################################################
+
+-TrueTypedir = $(prefix)/fonts/TrueType
++TrueTypedir = @datadir@/fonts/apl/TrueType
+
+ 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
+@@ -298,8 +298,7 @@
+ MSTypeMatrix.C\
+ MSTypeVector.C
+
+-
+-
++libMSTypes_la_LIBADD = -L../a -la -lstdc++
+
+ 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
+@@ -13,5 +13,7 @@
+ libcxb_la_SOURCES = \
+ binary.c
+
++libcxb_la_LIBADD = -L../a -L../dap -la -ldap
++
+ 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 2006-12-10 23:05:42.000000000 +0100
++++ aplus-fsf-4.20/src/IPC/Makefile.am 2007-02-15 18:37:36.000000000 +0100
@@ -52,6 +52,8 @@
pString_Connection.H\
pString_Listener.H
@@ -10,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 2006-12-10 23:04:20.000000000 +0100
++++ aplus-fsf-4.20/src/cxs/Makefile.am 2007-02-15 18:37:36.000000000 +0100
@@ -12,6 +12,8 @@
libcxs_la_SOURCES = S.c
@@ -20,18 +72,8 @@
INCLUDES = -I..
sdir = $(libdir)
---- 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 2006-12-10 23:03:38.000000000 +0100
-@@ -13,5 +13,7 @@
- libcxb_la_SOURCES = \
- binary.c
-
-+libcxb_la_LIBADD = -L../a -L../dap -la -ldap
-+
- INCLUDES = -I..
-
--- 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 2006-12-10 23:03:11.000000000 +0100
++++ aplus-fsf-4.20/src/AplusGUI/Makefile.am 2007-02-15 18:37:36.000000000 +0100
@@ -125,5 +125,7 @@
EnumTables.H\
Macros.H
@@ -40,57 +82,8 @@
+
INCLUDES = -I.. -I/usr/X11R6/include
---- 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 2006-12-10 23:04:40.000000000 +0100
-@@ -20,5 +20,7 @@
- impexp.c \
- impexp.h
-
-+libcxsys_la_LIBADD = -L../a -L../dap -L../cxc -la -ldap -lcxc
-+
- INCLUDES = -I..
-
---- 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 2006-12-10 23:03:55.000000000 +0100
-@@ -15,5 +15,7 @@
- cform.c \
- cxc.h
-
-+libcxc_la_LIBADD = -L../a -la
-+
- 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 2006-12-10 23:05:25.000000000 +0100
-@@ -24,5 +24,7 @@
- kcheck.c \
- dyld2.c
-
-+libesf_la_LIBADD = -L../a -L../dap -la -ldap
-+
- INCLUDES = -I..
-
---- 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 2006-12-10 23:02:46.000000000 +0100
-@@ -49,6 +49,7 @@
- s.h\
- x.h
-
-+liba_la_LIBADD = -L../dap -ldap
-
- CFLAGS = @CFLAGS@ -DBSTUB
-
-@@ -66,7 +67,7 @@
-
- EXTRA_DIST = fsftest.+ apter.+ t.+ dio.+
-
--a_includedir = $(prefix)/include/a
-+a_includedir = $(prefix)/include/a+
- a_include_DATA = \
- beam.h \
- fir.h \
--- 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 2006-12-10 23:06:16.000000000 +0100
++++ aplus-fsf-4.20/src/MSGUI/Makefile.am 2007-02-15 18:37:36.000000000 +0100
@@ -382,6 +382,8 @@
MSWidgetView.H\
MSWindow.H
@@ -100,83 +93,8 @@
EXTRA_DIST = \
MSArrayViewInlines.C\
MSCompositeTextInlines.C\
---- 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 2006-12-10 23:06:39.000000000 +0100
-@@ -52,6 +52,8 @@
- MSTimer.H\
- MSTv.H
-
-+libMSIPC_la_LIBADD = -L../MSTypes -lMSTypes
-+
- EXTRA_DIST = MSProtocolConnection.C
-
- INCLUDES = -I..
---- 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 2006-12-10 23:07:02.000000000 +0100
-@@ -298,8 +298,7 @@
- MSTypeMatrix.C\
- MSTypeVector.C
-
--
--
-+libMSTypes_la_LIBADD = -L../a -la -lstdc++
-
- INCLUDES = -I..
-
---- 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 2006-12-10 22:01:34.000000000 +0100
-@@ -64,7 +64,7 @@
- static C *_whoseTree = "";
- static C *_banner = BANNER;
- static C *_copyright = COPYRIGHT;
--static C *_defaultATREE = (char *)0;
-+static C *_defaultATREE = (char *)"/usr/lib/a+";
- 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/fonts/TrueType/Makefile.am.org 2001-01-19 22:10:06.000000000 +0100
-+++ aplus-fsf-4.20/src/fonts/TrueType/Makefile.am 2006-12-10 22:01:34.000000000 +0100
-@@ -8,7 +8,7 @@
- ## ##
- ###############################################################################
-
--TrueTypedir = $(prefix)/fonts/TrueType
-+TrueTypedir = @datadir@/fonts/apl/TrueType
-
- TrueType_DATA = KAPL.TTF
-
---- 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 2006-12-10 22:01:34.000000000 +0100
-@@ -8,7 +8,7 @@
- ## ##
- ###############################################################################
-
--fonts_pcfdir = $(prefix)/fonts/X11/pcf
-+fonts_pcfdir = @datadir@/fonts/apl/pcf
-
- 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 2006-12-10 22:01:34.000000000 +0100
-@@ -8,4 +8,4 @@
- ## ##
- ###############################################################################
-
--SUBDIRS = pcf bdf
-+SUBDIRS = pcf
---- 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 2006-12-10 22:01:34.000000000 +0100
-@@ -8,7 +8,7 @@
- ## ##
- ###############################################################################
-
--appdefaultsdir = $(prefix)/app-defaults
-+appdefaultsdir = @datadir@/X11/app-defaults
-
- appdefaults_DATA = XTerm
-
--- 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 2006-12-10 22:01:34.000000000 +0100
++++ aplus-fsf-4.20/src/lisp.1/Makefile.am 2007-02-15 18:37:36.000000000 +0100
@@ -8,10 +8,9 @@
## ##
###############################################################################
@@ -197,46 +115,8 @@
a.el \
a-font.el \
aplus.el \
---- 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 2006-12-10 22:01:44.000000000 +0100
-@@ -69,6 +69,7 @@
- OBJEXT = @OBJEXT@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- AMTAR = @AMTAR@
-+APLVERSION = @APLVERSION@
- AS = @AS@
- AWK = @AWK@
- CC = @CC@
-@@ -80,6 +81,10 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_DEPS = @LIBTOOL_DEPS@
- LN_S = @LN_S@
-+LT_AGE = @LT_AGE@
-+LT_CURRENT = @LT_CURRENT@
-+LT_RELEASE = @LT_RELEASE@
-+LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
-@@ -88,6 +93,7 @@
- VERSION = @VERSION@
- X_INCLUDES = @X_INCLUDES@
- X_LIBS = @X_LIBS@
-+X_PREFIX = @X_PREFIX@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
-@@ -121,7 +127,7 @@
- .SUFFIXES:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --foreign src/lisp.0/Makefile
-+ $(AUTOMAKE) --gnu src/lisp.0/Makefile
- Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
--- aplus-fsf-4.20/src/Makefile.am.org 2005-08-29 04:55:30.000000000 +0200
-+++ aplus-fsf-4.20/src/Makefile.am 2006-12-10 22:01:34.000000000 +0100
++++ aplus-fsf-4.20/src/Makefile.am 2007-02-15 18:37:36.000000000 +0100
@@ -9,24 +9,21 @@
###############################################################################
@@ -271,8 +151,510 @@
+ lisp.1
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
+@@ -20,5 +20,7 @@
+ impexp.c \
+ impexp.h
+
++libcxsys_la_LIBADD = -L../a -L../dap -L../cxc -la -ldap -lcxc
++
+ 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
+@@ -24,5 +24,7 @@
+ kcheck.c \
+ dyld2.c
+
++libesf_la_LIBADD = -L../a -L../dap -la -ldap
++
+ 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
+@@ -8,7 +8,7 @@
+ ## ##
+ ###############################################################################
+
+-appdefaultsdir = $(prefix)/app-defaults
++appdefaultsdir = @datadir@/X11/app-defaults
+
+ 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
+@@ -64,7 +64,7 @@
+ static C *_whoseTree = "";
+ static C *_banner = BANNER;
+ static C *_copyright = COPYRIGHT;
+-static C *_defaultATREE = (char *)0;
++static C *_defaultATREE = (char *)"/usr/lib/a+";
+ 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
+@@ -21,7 +21,7 @@
+ matherr.c \
+ version.h
+
+-CFLAGS = @CFLAGS@ -DBSTUB
++AM_CFLAGS = @CFLAGS@ -DBSTUB
+
+ 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
+@@ -52,6 +52,8 @@
+ MSTimer.H\
+ MSTv.H
+
++libMSIPC_la_LIBADD = -L../MSTypes -lMSTypes
++
+ 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 @@
+
+ liba_la_LIBADD = -L../dap -ldap
+
+-CFLAGS = @CFLAGS@ -DBSTUB
++AM_CFLAGS = @CFLAGS@ -DBSTUB
+
+ 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
+@@ -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.
+ # @configure_input@
+
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,84 +16,161 @@
+
+ ###############################################################################
+ ###############################################################################
+-SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libexecdir = @libexecdir@
+-datadir = @datadir@
+-sysconfdir = @sysconfdir@
+-sharedstatedir = @sharedstatedir@
+-localstatedir = @localstatedir@
+-libdir = @libdir@
+-infodir = @infodir@
+-mandir = @mandir@
+-includedir = @includedir@
+-oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = @program_transform_name@
++transform = $(program_transform_name)
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-host_alias = @host_alias@
++build_triplet = @build@
+ host_triplet = @host@
+-
+-EXEEXT = @EXEEXT@
+-OBJEXT = @OBJEXT@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
++subdir = src/lisp.0
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++ *) f=$$p;; \
++ esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(lisp0dir)"
++lisp0DATA_INSTALL = $(INSTALL_DATA)
++DATA = $(lisp0_DATA)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+-AS = @AS@
++APLVERSION = @APLVERSION@
++AR = @AR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++GREP = @GREP@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
+ LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-OBJDUMP = @OBJDUMP@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
++MAKEINFO = @MAKEINFO@
++OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
++SED = @SED@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
++XMKMF = @XMKMF@
+ X_INCLUDES = @X_INCLUDES@
+ X_LIBS = @X_LIBS@
++X_PREFIX = @X_PREFIX@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
++am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
+ install_sh = @install_sh@
+-
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
+ lisp0dir = $(prefix)/lisp.0
+-
+ lisp0_DATA = \
+ .emacs \
+ a.el \
+@@ -101,7 +178,6 @@
+ keyb.el \
+ xa.el
+
+-
+ EXTRA_DIST = \
+ .emacs \
+ a.el \
+@@ -109,21 +185,38 @@
+ keyb.el \
+ xa.el
+
+-subdir = src/lisp.0
+-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DATA = $(lisp0_DATA)
+-
+-DIST_COMMON = Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lisp.0/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign src/lisp.0/Makefile
+-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++ $(AUTOMAKE) --gnu src/lisp.0/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ @case '$?' in \
++ *config.status*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++ *) \
++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++ esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -134,39 +227,43 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
+-lisp0DATA_INSTALL = $(INSTALL_DATA)
+ install-lisp0DATA: $(lisp0_DATA)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(lisp0dir)
++ test -z "$(lisp0dir)" || $(mkdir_p) "$(DESTDIR)$(lisp0dir)"
+ @list='$(lisp0_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(lisp0DATA_INSTALL) $$d$$p $(DESTDIR)$(lisp0dir)/$$f"; \
+- $(lisp0DATA_INSTALL) $$d$$p $(DESTDIR)$(lisp0dir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(lisp0DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(lisp0dir)/$$f'"; \
++ $(lisp0DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(lisp0dir)/$$f"; \
+ done
+
+ uninstall-lisp0DATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(lisp0_DATA)'; for p in $$list; do \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " rm -f $(DESTDIR)$(lisp0dir)/$$f"; \
+- rm -f $(DESTDIR)$(lisp0dir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(lisp0dir)/$$f'"; \
++ rm -f "$(DESTDIR)$(lisp0dir)/$$f"; \
+ done
+ tags: TAGS
+ TAGS:
+
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ctags: CTAGS
++CTAGS:
+
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- @list='$(DISTFILES)'; for file in $$list; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -184,10 +281,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+-
+ installdirs:
+- $(mkinstalldirs) $(DESTDIR)$(lisp0dir)
+-
++ for dir in "$(DESTDIR)$(lisp0dir)"; do \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -199,7 +296,7 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- INSTALL_STRIP_FLAG=-s \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+@@ -207,7 +304,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -rm -f Makefile $(CONFIG_CLEAN_FILES)
++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -217,13 +314,15 @@
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+-
++ -rm -f Makefile
+ distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+@@ -239,24 +338,32 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+-
++ -rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
+ uninstall-am: uninstall-info-am uninstall-lisp0DATA
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-lisp0DATA install-man install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool uninstall uninstall-am uninstall-info-am \
+- uninstall-lisp0DATA
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-exec install-exec-am \
++ install-info install-info-am install-lisp0DATA install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ uninstall uninstall-am uninstall-info-am uninstall-lisp0DATA
+
+ # 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
+@@ -15,5 +15,7 @@
+ cform.c \
+ cxc.h
+
++libcxc_la_LIBADD = -L../a -la
++
+ INCLUDES = -I..
+
--- aplus-fsf-4.20/configure.in.org 2005-08-29 05:22:02.000000000 +0200
-+++ aplus-fsf-4.20/configure.in 2006-12-10 23:08:05.000000000 +0100
++++ aplus-fsf-4.20/configure.in 2007-02-15 18:37:36.000000000 +0100
@@ -17,6 +17,10 @@
AM_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aplus-fsf.spec 13 Feb 2007 17:32:04 -0000 1.7
+++ aplus-fsf.spec 15 Feb 2007 19:24:56 -0000 1.8
@@ -15,7 +15,7 @@
Name: %name
Version: 4.20.2
-Release: 13%{?dist}
+Release: 15%{?dist}
License: GPL
Summary: Advanced APL interpreter with s interface
@@ -31,7 +31,7 @@
Patch4: aplus-fsf-4.20-atree.patch
BuildRequires: xorg-x11-proto-devel
-BuildRequires: automake16 autoconf
+BuildRequires: automake autoconf
Requires: xterm
@@ -106,15 +106,16 @@
# export CXXFLAGS=-O3 CFLAGS=-O3
export CFLAGS=$RPM_OPT_FLAGS
export CXXLFAGS=$RPM_OPT_FLAGS
-automake-1.6
+aclocal
+automake
autoconf
%configure --prefix=/usr
-make %{?_smp_mflags}
+make %{?_smp_mflags} LIBTOOL="/usr/bin/libtool"
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL='/usr/bin/libtool'
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.a
@@ -142,7 +143,11 @@
cp -R src/scripts samples
+mv $RPM_BUILD_ROOT/%{_includedir}/a $RPM_BUILD_ROOT/%{_includedir}/a+
+
+%ifarch x86_64
mv samples/Makefile samples/Makefile-%{_arch}
+%endif
pushd $RPM_BUILD_ROOT/%{_x11fonts}/
@@ -258,6 +263,12 @@
%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
+- Remove dependency to automake-1.6
+
+* Wed Feb 14 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 4.20.2-14
+- A beeter solution for the multilib issue
+
* Tue Feb 13 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 4.20.2-13
- Solve multilib issue (#228353)
- Previous message: rpms/jd/devel .cvsignore, 1.69, 1.70 jd.spec, 1.80, 1.81 sources, 1.69, 1.70
- Next message: rpms/aplus-fsf/devel aplus-fsf-4.20-makefile.patch, 1.5, 1.6 aplus-fsf.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list