rpms/aplus-fsf/FC-4 aplus-fsf-4.20-makefile.patch, 1.2, 1.3 aplus-fsf.spec, 1.2, 1.3
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Thu Aug 3 16:42:35 UTC 2006
Author: s4504kr
Update of /cvs/extras/rpms/aplus-fsf/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6172
Modified Files:
aplus-fsf-4.20-makefile.patch aplus-fsf.spec
Log Message:
Fix some x86-64 releated stuff
aplus-fsf-4.20-makefile.patch:
Index: aplus-fsf-4.20-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/FC-4/aplus-fsf-4.20-makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aplus-fsf-4.20-makefile.patch 1 Aug 2006 20:03:44 -0000 1.2
+++ aplus-fsf-4.20-makefile.patch 3 Aug 2006 16:42:35 -0000 1.3
@@ -1,5 +1,5 @@
--- 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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/IPC/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -52,6 +52,12 @@
pString_Connection.H\
pString_Listener.H
@@ -14,7 +14,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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/cxs/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -12,6 +12,12 @@
libcxs_la_SOURCES = S.c
@@ -29,7 +29,7 @@
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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/cxb/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -13,5 +13,11 @@
libcxb_la_SOURCES = \
binary.c
@@ -43,7 +43,7 @@
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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/AplusGUI/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -125,5 +125,11 @@
EnumTables.H\
Macros.H
@@ -57,7 +57,7 @@
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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/cxsys/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -20,5 +20,11 @@
impexp.c \
impexp.h
@@ -71,7 +71,7 @@
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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/cxc/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -15,5 +15,11 @@
cform.c \
cxc.h
@@ -85,7 +85,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 2006-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/esf/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -24,5 +24,11 @@
kcheck.c \
dyld2.c
@@ -99,7 +99,7 @@
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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/a/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -49,6 +49,11 @@
s.h\
x.h
@@ -122,7 +122,7 @@
beam.h \
fir.h \
--- aplus-fsf-4.20/src/dap/Makefile.am.org 2001-11-25 21:36:25.000000000 +0100
-+++ aplus-fsf-4.20/src/dap/Makefile.am 2006-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/dap/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -8,9 +8,9 @@
## ##
###############################################################################
@@ -146,7 +146,7 @@
INCLUDES = -I..
--- 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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/MSGUI/Makefile.am 2006-08-03 17:32:06.000000000 +0200
@@ -382,6 +382,12 @@
MSWidgetView.H\
MSWindow.H
@@ -155,13 +155,13 @@
+
+libMSGUI_la_LDFLAGS = $(libMSGUI_version)
+
-+libMSGUI_la_LIBADD = -L../MSTypes -L../MSIPC -L../dap -L/usr/X11R6/lib -lMSTypes -lMSIPC -ladap -lX11 -lstdc++
++libMSGUI_la_LIBADD = -L../MSTypes -L../MSIPC -L../dap @X_LIBS@ -lMSTypes -lMSIPC -ladap -lX11 -lstdc++
+
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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/MSIPC/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -52,6 +52,12 @@
MSTimer.H\
MSTv.H
@@ -176,7 +176,7 @@
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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/MSTypes/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -298,8 +298,11 @@
MSTypeMatrix.C\
MSTypeVector.C
@@ -191,7 +191,7 @@
INCLUDES = -I..
--- 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 2006-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/main/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -34,7 +34,7 @@
$(top_srcdir)/src/cxc/libcxc.la \
$(top_srcdir)/src/esf/libesf.la \
@@ -202,7 +202,7 @@
$(top_srcdir)/src/MSIPC/libMSIPC.la \
$(top_srcdir)/src/MSTypes/libMSTypes.la
--- 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-08-01 20:09:45.000000000 +0200
++++ aplus-fsf-4.20/src/fonts/TrueType/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -213,7 +213,7 @@
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-08-01 20:09:07.000000000 +0200
++++ aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -224,7 +224,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 2006-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/fonts/X11/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -8,4 +8,4 @@
## ##
###############################################################################
@@ -232,7 +232,7 @@
-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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/app-defaults/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -243,7 +243,7 @@
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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/lisp.1/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -8,10 +8,9 @@
## ##
###############################################################################
@@ -265,7 +265,7 @@
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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/lisp.0/Makefile.in 2006-08-02 17:14:10.000000000 +0200
@@ -69,6 +69,7 @@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
@@ -292,7 +292,7 @@
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-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/src/Makefile.am 2006-08-02 17:14:10.000000000 +0200
@@ -9,24 +9,21 @@
###############################################################################
@@ -328,7 +328,7 @@
EXTRA_DIST = LICENSE
--- aplus-fsf-4.20/configure.in.org 2005-08-29 05:22:02.000000000 +0200
-+++ aplus-fsf-4.20/configure.in 2006-08-01 20:08:00.000000000 +0200
++++ aplus-fsf-4.20/configure.in 2006-08-02 17:14:10.000000000 +0200
@@ -17,6 +17,9 @@
AM_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/FC-4/aplus-fsf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aplus-fsf.spec 1 Aug 2006 20:03:44 -0000 1.2
+++ aplus-fsf.spec 3 Aug 2006 16:42:35 -0000 1.3
@@ -6,13 +6,14 @@
%define _x11bindir %{_x11pref}/bin
%define _lispdir %{_datadir}/xemacs/site-packages/lisp
%define _lispstart %{_lispdir}/site-start.d
-%define _x11lib %{_x11pref}/lib
+%define _x11lib %{_x11pref}/%{_lib}
+
%define _x11fonts %{_x11lib}/X11/fonts
%define _x11appdef %{_x11lib}/X11/app-defaults
Name: %name
Version: 4.20.2
-Release: 6%{?dist}
+Release: 7%{?dbuild.logist}
License: GPL
Summary: Advanced APL interpreter with s interface
@@ -101,7 +102,7 @@
export CXXLFAGS=$RPM_OPT_FLAGS
automake-1.6
autoconf
-%configure --prefix=/usr
+%configure --prefix=/usr --x-libraries=%{_x11lib}
make %{?_smp_mflags}
%install
@@ -207,6 +208,9 @@
%{_x11fonts}/apl/TTF/*
%Changelog
+* Thu Aug 3 2006 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-7
+- Fix some x86_64 stuff
+
* Tue Aug 1 2006 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-6
- Backport to FC-4
More information about the fedora-extras-commits
mailing list