rpms/aplus-fsf/devel aplus-fsf-4.20-atree.patch, NONE, 1.1 aplus-fsf-4.20-el.patch, NONE, 1.1 aplus-fsf-4.20-makefile.patch, 1.1, 1.2 aplus-fsf.spec, 1.1, 1.2
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Tue Aug 8 18:27:34 UTC 2006
- Previous message (by thread): extras-repoclosure PackageOwners.py, 1.2, 1.3 PackageOwnersTests.py, 1.1, 1.2
- Next message (by thread): rpms/aplus-fsf/FC-5 aplus-fsf-4.20-atree.patch, NONE, 1.1 aplus-fsf-4.20-el.patch, NONE, 1.1 aplus-fsf-4.20-makefile.patch, 1.1, 1.2 aplus-fsf.spec, 1.1, 1.2
- 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-serv26187
Modified Files:
aplus-fsf-4.20-makefile.patch aplus-fsf.spec
Added Files:
aplus-fsf-4.20-atree.patch aplus-fsf-4.20-el.patch
Log Message:
Fix atree problem
aplus-fsf-4.20-atree.patch:
--- NEW FILE aplus-fsf-4.20-atree.patch ---
--- aplus-fsf-4.20/src/IPC/IPCInterface.C.org 2006-08-06 20:59:06.000000000 +0200
+++ aplus-fsf-4.20/src/IPC/IPCInterface.C 2006-08-06 20:59:40.000000000 +0200
@@ -592,9 +592,9 @@
if ((atree = getenv("ATREE")) == (char *)(0))
{
- atree = "/usr/local/a+";
+ atree = "/usr/lib/a+";
}
- ipcfile = bnstring(atree, "/lib/idap.+", (char *)(0));
+ ipcfile = bnstring(atree, "/idap.+", (char *)(0));
loadafile(ipcfile,0);
bfree(ipcfile);
}
--- aplus-fsf-4.20/src/cxs/S.c.org 2006-08-06 20:58:04.000000000 +0200
+++ aplus-fsf-4.20/src/cxs/S.c 2006-08-06 20:58:46.000000000 +0200
@@ -17,9 +17,9 @@
if ((atree = getenv("ATREE")) == (char *)(0))
{
- atree = "/usr/local/a+";
+ atree = "/usr/lib/a+";
}
- sfile = bnstring(atree, "/lib/s.+", (char *)(0));
+ sfile = bnstring(atree, "/s.+", (char *)(0));
loadafile(sfile,0);
bfree(sfile);
return;
aplus-fsf-4.20-el.patch:
--- NEW FILE aplus-fsf-4.20-el.patch ---
--- aplus-fsf-4.20/src/lisp.1/a.el.org 2006-08-06 20:38:11.000000000 +0200
+++ aplus-fsf-4.20/src/lisp.1/a.el 2006-08-06 20:41:01.000000000 +0200
@@ -26,7 +26,7 @@
(defvar a+-font "kaplscreen-bold" "Font used in A+ mode.")
-; (defvar apr-command "/usr/local/bin/apr" "Command to print A+ code")
+; (defvar apr-command "/usr/bin/apr" "Command to print A+ code")
; (defvar apr-command "/ms/dist/aurora/bin/apr" "Command to print A+ code")
(defvar old-lpr-command lpr-command)
@@ -411,7 +411,7 @@
(concat prompt "[" defval "]: "))) ""))
defval arg))
-(defvar a-prog "/usr/local/bin/a" "*Program to run for `a' command")
+(defvar a-prog "/usr/bin/a" "*Program to run for `a' command")
(defvar a-log "~/.emacs_a" "*Log file for `a' sessions")
(defvar a-tmp-dir "~" "Temp directory for A+ xemacs operations")
(defvar a-init-string "$echo `date` on `hostname`\n" "*Sent to `a' on startup")
@@ -435,7 +435,7 @@
(defun standard-a()
(interactive)
- (setq a-prog "/usr/local/bin/z")
+ (setq a-prog "/usr/bin/z")
(setq a-log "~/.emacs_a")
(setq a-tmp-dir "~")
(setq a-init-string "$echo `date` on `hostname`\n")
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aplus-fsf-4.20-makefile.patch 27 Jul 2006 15:19:48 -0000 1.1
+++ aplus-fsf-4.20-makefile.patch 8 Aug 2006 18:27:34 -0000 1.2
@@ -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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/IPC/Makefile.am 2006-08-08 17:46:29.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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/cxs/Makefile.am 2006-08-08 17:46:29.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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/cxb/Makefile.am 2006-08-08 17:46:29.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-07-23 20:33:11.000000000 +0200
++++ aplus-fsf-4.20/src/AplusGUI/Makefile.am 2006-08-08 17:46:29.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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/cxsys/Makefile.am 2006-08-08 17:46:29.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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/cxc/Makefile.am 2006-08-08 17:46:29.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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/esf/Makefile.am 2006-08-08 17:46:29.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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/a/Makefile.am 2006-08-08 17:46:29.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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/dap/Makefile.am 2006-08-08 17:46:29.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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/MSGUI/Makefile.am 2006-08-08 17:46:29.000000000 +0200
@@ -382,6 +382,12 @@
MSWidgetView.H\
MSWindow.H
@@ -161,7 +161,7 @@
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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/MSIPC/Makefile.am 2006-08-08 17:46:29.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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/MSTypes/Makefile.am 2006-08-08 17:46:29.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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/main/Makefile.am 2006-08-08 17:46:29.000000000 +0200
@@ -34,7 +34,7 @@
$(top_srcdir)/src/cxc/libcxc.la \
$(top_srcdir)/src/esf/libesf.la \
@@ -201,30 +201,41 @@
$(top_srcdir)/src/MSGUI/libMSGUI.la \
$(top_srcdir)/src/MSIPC/libMSIPC.la \
$(top_srcdir)/src/MSTypes/libMSTypes.la
+--- aplus-fsf-4.20/src/main/aplus_main.c.org 2006-08-08 17:49:04.000000000 +0200
++++ aplus-fsf-4.20/src/main/aplus_main.c 2006-08-08 17:54:09.000000000 +0200
+@@ -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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/fonts/TrueType/Makefile.am 2006-08-08 17:46:29.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
-TrueTypedir = $(prefix)/fonts/TrueType
-+TrueTypedir = @datadir@/X11/fonts/apl/TTF
++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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am 2006-08-08 17:46:29.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
-fonts_pcfdir = $(prefix)/fonts/X11/pcf
-+fonts_pcfdir = @datadir@/X11/fonts/apl/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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/fonts/X11/Makefile.am 2006-08-08 17:46:29.000000000 +0200
@@ -8,4 +8,4 @@
## ##
###############################################################################
@@ -232,7 +243,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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/app-defaults/Makefile.am 2006-08-08 17:46:29.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -243,7 +254,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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/lisp.1/Makefile.am 2006-08-08 17:46:30.000000000 +0200
@@ -8,10 +8,9 @@
## ##
###############################################################################
@@ -265,7 +276,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-07-23 19:44:47.000000000 +0200
++++ aplus-fsf-4.20/src/lisp.0/Makefile.in 2006-08-08 17:46:30.000000000 +0200
@@ -69,6 +69,7 @@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
@@ -292,7 +303,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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/src/Makefile.am 2006-08-08 17:46:30.000000000 +0200
@@ -9,24 +9,21 @@
###############################################################################
@@ -328,7 +339,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-07-23 19:44:41.000000000 +0200
++++ aplus-fsf-4.20/configure.in 2006-08-08 17:46:30.000000000 +0200
@@ -17,6 +17,9 @@
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aplus-fsf.spec 27 Jul 2006 15:19:48 -0000 1.1
+++ aplus-fsf.spec 8 Aug 2006 18:27:34 -0000 1.2
@@ -7,12 +7,13 @@
%define _lispdir %{_datadir}/xemacs/site-packages/lisp
%define _lispstart %{_lispdir}/site-start.d
%define _x11lib %{_libdir}
-%define _x11fonts %{_x11pref}/fonts
+%define _x11fonts %{_datadir}/fonts/apl/pcf
+%define _ttffonts %{_datadir}/fonts/apl/TrueType
%define _x11appdef %{_x11pref}/app-defaults
Name: %name
Version: 4.20.2
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPL
Summary: Advanced APL interpreter with s interface
@@ -24,6 +25,8 @@
Source1: aplus-fsf-4.20-elstart
Patch1: aplus-fsf-4.20-makefile.patch
Patch2: aplus-fsf-4.20-gcc41.patch
+Patch3: aplus-fsf-4.20-el.patch
+Patch4: aplus-fsf-4.20-atree.patch
BuildRequires: xorg-x11-proto-devel
BuildRequires: automake16 autoconf
@@ -94,6 +97,8 @@
%setup -q -n %{name}-%{ver}
%patch1 -p1 -b .org
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
# export CXXFLAGS=-O3 CFLAGS=-O3
@@ -125,22 +130,55 @@
cp -R src/scripts samples
+pushd $RPM_BUILD_ROOT/%{_x11fonts}/
+
+cp Kapl.alias fonts.alias
+
+rm -f {encodings,fonts}.dir
+touch {encodings,fonts}.dir
+chmod 0644 {encodings,fonts}.dir
+
+for fcver in $(seq 1 9); do
+ touch fonts.cache-$fcver
+ chmod 0644 fonts.cache-$fcver
+done
+
+
+popd
+
+pushd $RPM_BUILD_ROOT/%{_ttffonts}/
+
+touch fonts.{alias,scale}
+chmod 0644 fonts.{alias,scale}
+
+rm -f {encodings,fonts}.dir
+touch {encodings,fonts}.dir
+chmod 0644 {encodings,fonts}.dir
+
+for fcver in $(seq 1 9); do
+ touch fonts.cache-$fcver
+ chmod 0644 fonts.cache-$fcver
+done
+
+popd
+
%clean
rm -rf $RPM_BUILD_ROOT
%post -n fonts-x11-apl
- FONTDIR=%{_x11fonts}/apl/pcf
+ FONTDIR=%{_x11fonts}
mkfontdir $FONTDIR
+ fc-cache $FONTDIR
chkfontpath -qa $FONTDIR
%post -n fonts-truetype-apl
- FONTDIR=%{_x11fonts}/apl/TTF
+ FONTDIR=%{_ttffonts}
ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
mkfontdir $FONTDIR
- fc-cache $FONTDIR
chkfontpath -qa $FONTDIR
+ fc-cache $FONTDIR
%post -p /sbin/ldconfig
@@ -148,15 +186,16 @@
%postun -n fonts-x11-apl
- FONTDIR=%{_x11fonts}/apl/pcf
+ FONTDIR=%{_x11fonts}
if [ "$1" = "0" ]; then
mkfontdir $FONTDIR
+ fc-cache $FONTDIR:unscaled
chkfontpath -qr $FONTDIR
fi
%postun -n fonts-truetype-apl
- FONTDIR=%{_x11fonts}/apl/TTF
+ FONTDIR=%{_ttffonts}
if [ "$1" = "0" ]; then
ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
mkfontdir $FONTDIR
@@ -200,13 +239,26 @@
%files -n fonts-x11-apl
%defattr(-,root,root,-)
-%{_x11fonts}/apl/pcf/*
+%{_x11fonts}/
+%ghost %verify(not md5 size mtime) %{_ttffonts}/encodings.dir
+%ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.dir
+%ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.alias
+%ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.cache-*
%files -n fonts-truetype-apl
%defattr(-,root,root,-)
-%{_x11fonts}/apl/TTF/*
+%{_ttffonts}/
+%ghost %verify(not md5 size mtime) %{_ttffonts}/encodings.dir
+%ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.dir
+%ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.alias
+%ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.scale
+%ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.cache-*
%Changelog
+* Tue Aug 8 2006 Jochen Schmitt <Jochen herr-schmitt de> - 4.20.2-6
+- Fix fonts problems
+- Fix atree problems
+
* Sun Jul 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-5
- Add xterm as BR for app-defaults
- Solve the weak-ref problem
- Previous message (by thread): extras-repoclosure PackageOwners.py, 1.2, 1.3 PackageOwnersTests.py, 1.1, 1.2
- Next message (by thread): rpms/aplus-fsf/FC-5 aplus-fsf-4.20-atree.patch, NONE, 1.1 aplus-fsf-4.20-el.patch, NONE, 1.1 aplus-fsf-4.20-makefile.patch, 1.1, 1.2 aplus-fsf.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list