rpms/aplus-fsf/devel aplus-fsf-4.22.4-makefile.patch, 1.1, 1.2 aplus-fsf.spec, 1.28, 1.29
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Jan 7 18:38:48 UTC 2009
- Previous message (by thread): rpms/scidavis/F-9 scidavis-0.1.3-sip.patch, NONE, 1.1 scidavis.spec, 1.3, 1.4
- Next message (by thread): rpms/condor/F-9 DetectGCC.patch, NONE, 1.1 condor.spec, 1.14, 1.15 DetectGCC430.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: s4504kr
Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24067
Modified Files:
aplus-fsf-4.22.4-makefile.patch aplus-fsf.spec
Log Message:
reorg of the apl fonts
aplus-fsf-4.22.4-makefile.patch:
Index: aplus-fsf-4.22.4-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf-4.22.4-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aplus-fsf-4.22.4-makefile.patch 17 Nov 2008 19:53:38 -0000 1.1
+++ aplus-fsf-4.22.4-makefile.patch 7 Jan 2009 18:38:17 -0000 1.2
@@ -1,6 +1,6 @@
diff -up aplus-fsf-4.22/configure.in.org aplus-fsf-4.22/configure.in
--- aplus-fsf-4.22/configure.in.org 2008-04-08 21:24:30.000000000 +0200
-+++ aplus-fsf-4.22/configure.in 2008-11-17 20:28:05.000000000 +0100
++++ aplus-fsf-4.22/configure.in 2009-01-07 18:30:28.000000000 +0100
@@ -14,9 +14,13 @@ dnl Checks for programs.
AC_PROG_CC
AC_PROG_CXX
@@ -40,7 +40,7 @@
X_LIBS=""
diff -up aplus-fsf-4.22/src/acore/Makefile.am.org aplus-fsf-4.22/src/acore/Makefile.am
--- aplus-fsf-4.22/src/acore/Makefile.am.org 2008-04-08 21:29:45.000000000 +0200
-+++ aplus-fsf-4.22/src/acore/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/acore/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -52,7 +52,7 @@
adap.+ \
diff -up aplus-fsf-4.22/src/a/Makefile.am.org aplus-fsf-4.22/src/a/Makefile.am
--- aplus-fsf-4.22/src/a/Makefile.am.org 2008-04-08 21:27:15.000000000 +0200
-+++ aplus-fsf-4.22/src/a/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/a/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -50,7 +50,7 @@ liba_la_SOURCES = \
x.h
@@ -64,7 +64,7 @@
diff -up aplus-fsf-4.22/src/AplusGUI/Makefile.am.org aplus-fsf-4.22/src/AplusGUI/Makefile.am
--- aplus-fsf-4.22/src/AplusGUI/Makefile.am.org 2001-01-30 21:48:35.000000000 +0100
-+++ aplus-fsf-4.22/src/AplusGUI/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/AplusGUI/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -125,5 +125,7 @@ libAplusGUI_la_SOURCES= \
EnumTables.H\
Macros.H
@@ -75,7 +75,7 @@
diff -up aplus-fsf-4.22/src/app-defaults/Makefile.am.org aplus-fsf-4.22/src/app-defaults/Makefile.am
--- aplus-fsf-4.22/src/app-defaults/Makefile.am.org 2001-01-22 21:35:46.000000000 +0100
-+++ aplus-fsf-4.22/src/app-defaults/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/app-defaults/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -87,7 +87,7 @@
diff -up aplus-fsf-4.22/src/autils/Makefile.am.org aplus-fsf-4.22/src/autils/Makefile.am
--- aplus-fsf-4.22/src/autils/Makefile.am.org 2008-04-08 22:07:32.000000000 +0200
-+++ aplus-fsf-4.22/src/autils/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/autils/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -99,7 +99,7 @@
README \
diff -up aplus-fsf-4.22/src/cxb/Makefile.am.org aplus-fsf-4.22/src/cxb/Makefile.am
--- aplus-fsf-4.22/src/cxb/Makefile.am.org 2001-01-19 22:28:09.000000000 +0100
-+++ aplus-fsf-4.22/src/cxb/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/cxb/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -13,5 +13,7 @@ lib_LTLIBRARIES = libcxb.la
libcxb_la_SOURCES = \
binary.c
@@ -110,7 +110,7 @@
diff -up aplus-fsf-4.22/src/cxc/Makefile.am.org aplus-fsf-4.22/src/cxc/Makefile.am
--- aplus-fsf-4.22/src/cxc/Makefile.am.org 2001-01-19 22:28:18.000000000 +0100
-+++ aplus-fsf-4.22/src/cxc/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/cxc/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -15,5 +15,7 @@ libcxc_la_SOURCES = \
cform.c \
cxc.h
@@ -121,7 +121,7 @@
diff -up aplus-fsf-4.22/src/cxs/Makefile.am.org aplus-fsf-4.22/src/cxs/Makefile.am
--- aplus-fsf-4.22/src/cxs/Makefile.am.org 2008-04-08 21:26:32.000000000 +0200
-+++ aplus-fsf-4.22/src/cxs/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/cxs/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -12,6 +12,8 @@ lib_LTLIBRARIES = libcxs.la
libcxs_la_SOURCES = S.c
@@ -133,7 +133,7 @@
sdir = $(libdir)
diff -up aplus-fsf-4.22/src/cxsys/Makefile.am.org aplus-fsf-4.22/src/cxsys/Makefile.am
--- aplus-fsf-4.22/src/cxsys/Makefile.am.org 2001-01-19 22:28:29.000000000 +0100
-+++ aplus-fsf-4.22/src/cxsys/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/cxsys/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -20,5 +20,7 @@ libcxsys_la_SOURCES = \
impexp.c \
impexp.h
@@ -144,7 +144,7 @@
diff -up aplus-fsf-4.22/src/esf/Makefile.am.org aplus-fsf-4.22/src/esf/Makefile.am
--- aplus-fsf-4.22/src/esf/Makefile.am.org 2001-01-19 22:28:59.000000000 +0100
-+++ aplus-fsf-4.22/src/esf/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/esf/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -24,5 +24,7 @@ libesf_la_SOURCES = \
kcheck.c \
dyld2.c
@@ -153,21 +153,30 @@
+
INCLUDES = -I..
+diff -up aplus-fsf-4.22/src/fonts/Makefile.am.org aplus-fsf-4.22/src/fonts/Makefile.am
+--- aplus-fsf-4.22/src/fonts/Makefile.am.org 2009-01-07 18:31:27.000000000 +0100
++++ aplus-fsf-4.22/src/fonts/Makefile.am 2009-01-07 18:31:38.000000000 +0100
+@@ -8,4 +8,4 @@
+ ## ##
+ ###############################################################################
+
+-SUBDIRS = TrueType X11
++SUBDIRS = TrueType
diff -up aplus-fsf-4.22/src/fonts/TrueType/Makefile.am.org aplus-fsf-4.22/src/fonts/TrueType/Makefile.am
--- aplus-fsf-4.22/src/fonts/TrueType/Makefile.am.org 2001-01-19 22:10:06.000000000 +0100
-+++ aplus-fsf-4.22/src/fonts/TrueType/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/fonts/TrueType/Makefile.am 2009-01-07 18:32:20.000000000 +0100
@@ -8,7 +8,7 @@
## ##
###############################################################################
-TrueTypedir = $(prefix)/fonts/TrueType
-+TrueTypedir = @datadir@/fonts/apl/TrueType
++TrueTypedir = @datadir@/fonts/aplus-fsf
TrueType_DATA = KAPL.TTF
diff -up aplus-fsf-4.22/src/fonts/X11/Makefile.am.org aplus-fsf-4.22/src/fonts/X11/Makefile.am
--- aplus-fsf-4.22/src/fonts/X11/Makefile.am.org 2001-01-19 22:10:32.000000000 +0100
-+++ aplus-fsf-4.22/src/fonts/X11/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/fonts/X11/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -8,4 +8,4 @@
## ##
###############################################################################
@@ -176,7 +185,7 @@
+SUBDIRS = pcf
diff -up aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am.org aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am
--- aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am.org 2001-01-19 22:11:24.000000000 +0100
-+++ aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -188,7 +197,7 @@
Kapl.alias \
diff -up aplus-fsf-4.22/src/html/Makefile.am.org aplus-fsf-4.22/src/html/Makefile.am
--- aplus-fsf-4.22/src/html/Makefile.am.org 2001-10-06 23:49:48.000000000 +0200
-+++ aplus-fsf-4.22/src/html/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/html/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -10,7 +10,7 @@
SUBDIRS = tutorials
@@ -208,7 +217,7 @@
+ ln -s refman.html $(DESTDIR)/@docdir@/html/index.html
diff -up aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am.org aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am
--- aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am.org 2001-01-19 18:57:30.000000000 +0100
-+++ aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -220,7 +229,7 @@
graph_tutorial.html
diff -up aplus-fsf-4.22/src/html/tutorials/Makefile.am.org aplus-fsf-4.22/src/html/tutorials/Makefile.am
--- aplus-fsf-4.22/src/html/tutorials/Makefile.am.org 2001-01-19 18:58:36.000000000 +0100
-+++ aplus-fsf-4.22/src/html/tutorials/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/html/tutorials/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -10,7 +10,7 @@
SUBDIRS = graphs s.tutorials
@@ -232,7 +241,7 @@
Assignment.html \
diff -up aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am.org aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am
--- aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am.org 2001-01-19 18:56:56.000000000 +0100
-+++ aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -244,7 +253,7 @@
buttons.html \
diff -up aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am.org aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am
--- aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am.org 2002-01-24 21:33:42.000000000 +0100
-+++ aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -10,7 +10,7 @@
SUBDIRS = files
@@ -256,7 +265,7 @@
README \
diff -up aplus-fsf-4.22/src/IPC/Makefile.am.org aplus-fsf-4.22/src/IPC/Makefile.am
--- aplus-fsf-4.22/src/IPC/Makefile.am.org 2008-04-08 21:25:50.000000000 +0200
-+++ aplus-fsf-4.22/src/IPC/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/IPC/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -52,6 +52,8 @@ libIPC_la_SOURCES = \
pString_Connection.H\
pString_Listener.H
@@ -268,7 +277,7 @@
idapdir = $(libdir)
diff -up aplus-fsf-4.22/src/lisp.0/Makefile.in.org aplus-fsf-4.22/src/lisp.0/Makefile.in
--- aplus-fsf-4.22/src/lisp.0/Makefile.in.org 2008-04-08 22:15:29.000000000 +0200
-+++ aplus-fsf-4.22/src/lisp.0/Makefile.in 2008-09-09 16:38:05.000000000 +0200
++++ aplus-fsf-4.22/src/lisp.0/Makefile.in 2009-01-07 18:30:28.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -722,7 +731,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -up aplus-fsf-4.22/src/lisp.1/Makefile.am.org aplus-fsf-4.22/src/lisp.1/Makefile.am
--- aplus-fsf-4.22/src/lisp.1/Makefile.am.org 2001-03-09 23:38:09.000000000 +0100
-+++ aplus-fsf-4.22/src/lisp.1/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/lisp.1/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -8,10 +8,9 @@
## ##
###############################################################################
@@ -745,7 +754,7 @@
aplus.el \
diff -up aplus-fsf-4.22/src/main/aplus_main.c.org aplus-fsf-4.22/src/main/aplus_main.c
--- aplus-fsf-4.22/src/main/aplus_main.c.org 2008-04-08 21:16:29.000000000 +0200
-+++ aplus-fsf-4.22/src/main/aplus_main.c 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/main/aplus_main.c 2009-01-07 18:30:28.000000000 +0100
@@ -64,7 +64,7 @@ static C *_releaseCode = RELEASE_CODE;
static C *_whoseTree = "";
static C *_banner = BANNER;
@@ -757,7 +766,7 @@
static I _enable_coredump;
diff -up aplus-fsf-4.22/src/main/Makefile.am.org aplus-fsf-4.22/src/main/Makefile.am
--- aplus-fsf-4.22/src/main/Makefile.am.org 2005-08-29 03:32:27.000000000 +0200
-+++ aplus-fsf-4.22/src/main/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/main/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -21,7 +21,7 @@ aplus_SOURCES = \
matherr.c \
version.h
@@ -769,7 +778,7 @@
diff -up aplus-fsf-4.22/src/Makefile.am.org aplus-fsf-4.22/src/Makefile.am
--- aplus-fsf-4.22/src/Makefile.am.org 2008-04-08 20:58:18.000000000 +0200
-+++ aplus-fsf-4.22/src/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -9,18 +9,18 @@
###############################################################################
@@ -799,7 +808,7 @@
contrib \
diff -up aplus-fsf-4.22/src/MSGUI/Makefile.am.org aplus-fsf-4.22/src/MSGUI/Makefile.am
--- aplus-fsf-4.22/src/MSGUI/Makefile.am.org 2001-01-30 21:49:25.000000000 +0100
-+++ aplus-fsf-4.22/src/MSGUI/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/MSGUI/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -382,6 +382,8 @@ libMSGUI_la_SOURCES = \
MSWidgetView.H\
MSWindow.H
@@ -811,7 +820,7 @@
MSCompositeTextInlines.C\
diff -up aplus-fsf-4.22/src/MSIPC/Makefile.am.org aplus-fsf-4.22/src/MSIPC/Makefile.am
--- aplus-fsf-4.22/src/MSIPC/Makefile.am.org 2001-01-19 21:44:13.000000000 +0100
-+++ aplus-fsf-4.22/src/MSIPC/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/MSIPC/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -52,6 +52,8 @@ libMSIPC_la_SOURCES = \
MSTimer.H\
MSTv.H
@@ -823,7 +832,7 @@
INCLUDES = -I..
diff -up aplus-fsf-4.22/src/MSTypes/Makefile.am.org aplus-fsf-4.22/src/MSTypes/Makefile.am
--- aplus-fsf-4.22/src/MSTypes/Makefile.am.org 2001-01-19 21:46:18.000000000 +0100
-+++ aplus-fsf-4.22/src/MSTypes/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/MSTypes/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -298,8 +298,7 @@ EXTRA_DIST = \
MSTypeMatrix.C\
MSTypeVector.C
@@ -836,7 +845,7 @@
diff -up aplus-fsf-4.22/src/tutorials/graphs/Makefile.am.org aplus-fsf-4.22/src/tutorials/graphs/Makefile.am
--- aplus-fsf-4.22/src/tutorials/graphs/Makefile.am.org 2001-01-23 15:12:00.000000000 +0100
-+++ aplus-fsf-4.22/src/tutorials/graphs/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/tutorials/graphs/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -8,7 +8,7 @@
## ##
###############################################################################
@@ -848,7 +857,7 @@
graph_data.m \
diff -up aplus-fsf-4.22/src/tutorials/Makefile.am.org aplus-fsf-4.22/src/tutorials/Makefile.am
--- aplus-fsf-4.22/src/tutorials/Makefile.am.org 2008-04-01 22:02:51.000000000 +0200
-+++ aplus-fsf-4.22/src/tutorials/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/tutorials/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -10,7 +10,7 @@
SUBDIRS = graphs s.tutorials
@@ -860,7 +869,7 @@
Assignment \
diff -up aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am.org aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am
--- aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am.org 2001-01-23 15:13:08.000000000 +0100
-+++ aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am 2008-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am 2009-01-07 18:30:28.000000000 +0100
@@ -8,7 +8,7 @@
## ##
###############################################################################
Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- aplus-fsf.spec 17 Nov 2008 19:53:38 -0000 1.28
+++ aplus-fsf.spec 7 Jan 2009 18:38:18 -0000 1.29
@@ -1,3 +1,5 @@
+%define fontname aplus-fsf
+
%define catalogue %{_sysconfdir}/X11/fontpath.d/
%define name aplus-fsf
%define ver 4.22
@@ -8,14 +10,11 @@
%define _lispdir %{_datadir}/xemacs/site-packages/lisp
%define _lispstart %{_lispdir}/site-start.d
%define _x11lib %{_libdir}
-%define _fonts %{_datadir}/fonts
-%define _x11fonts %{_fonts}/apl/pcf
-%define _ttffonts %{_fonts}/apl/TrueType
%define _x11appdef %{_x11pref}/app-defaults
Name: %name
Version: 4.22.4
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
Summary: Advanced APL interpreter with s interface
@@ -32,12 +31,14 @@
BuildRequires: libtool
BuildRequires: xorg-x11-proto-devel
+BuildRequires: libX11-devel
BuildRequires: xorg-x11-font-utils
BuildRequires: automake autoconf
+BuildRequires: fontpackages-devel
Requires: xterm
-Requires: fonts-apl
+Requires: apl-fonts
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -50,28 +51,13 @@
communication, calls to user C subroutines, and many other features.
Execution is by a very efficient interpreter.
-%package -n fonts-x11-apl
-Summary: X11 Fonts for the Advanced APL Interpreter
-Group: User Interface/X
-Provides: fonts-apl
-Requires(post): fontconfig
-Requires(postun): fontconfig
-%description -n fonts-x11-apl
-The A+ programming language development environment requires these
-APL fonts to properly display A+ code in XTerm or XEmacs.
-
-This packages contains the fonts in the PCF format.
-
-They are not required to run a A+ program.
-
-%package -n fonts-truetype-apl
+%package fonts
Summary: TrueType fonts for the Advanced APL Interpreter
Group: User Interface/X
-Provides: fonts-apl
-Requires(post): fontconfig
-Requires(postun): fontconfig
+Provides: apl-fonts
+Requires: fontpackages-filesystem
-%description -n fonts-truetype-apl
+%description fonts
The A+ programming language development environment requires these
APL fonts to properly display A+ code in XTerm or XEmacs.
@@ -137,63 +123,22 @@
mv $RPM_BUILD_ROOT/%{_includedir}/a $RPM_BUILD_ROOT/%{_includedir}/a+
-install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/fonts/conf.d
-install -d $RPM_BUILD_ROOT/%{catalogue}
-
# Install a+ wrapper
mv $RPM_BUILD_ROOT/%{_bindir}/a+ $RPM_BUILD_ROOT/%{_bindir}/a+.bin
cp -p %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/a+
-# Installation X11-Fonts
-
-ln -sf %{_x11fonts} $RPM_BUILD_ROOT/%{catalogue}/apl-x11
-
-mv $RPM_BUILD_ROOT/%{_x11fonts}/Kapl.alias \
- $RPM_BUILD_ROOT/%{_x11fonts}/fonts.alias
-mkfontdir $RPM_BUILD_ROOT/%{_x11fonts}
-mkfontscale $RPM_BUILD_ROOT/%{_x11fonts}
-
rm -rf $RPM_BUILD_ROOT/%{_prefix}/lisp*
rm -rf $RPM_BUILD_ROOT/%{_prefix}/contrib
-# Installation Truetyp-Fonts
-
-ln -sf %{_ttffonts} $RPM_BUILD_ROOT/%{catalogue}/apl-truetype
-
-mkfontdir $RPM_BUILD_ROOT/%{_ttffonts}
-mkfontscale $RPM_BUILD_ROOT/%{_ttffonts}
-
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n fonts-x11-apl
-
- FONTDIR=%{_x11fonts}
- fc-cache $FONTDIR
-
-%post -n fonts-truetype-apl
-
- FONTDIR=%{_ttffonts}
- fc-cache $FONTDIR
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%postun -n fonts-x11-apl
-
- FONTDIR=%{_x11fonts}
- if [ "$1" = "0" ]; then
- fc-cache $FONTDIR:unscaled
- fi
-
-%postun -n fonts-truetype-apl
-
- FONTDIR=%{_ttffonts}
- if [ "$1" = "0" ]; then
- fc-cache $FONTDIR
- fi
+%_font_pkg -n fonts *.TTF
%files
%defattr(-,root,root,-)
@@ -201,9 +146,7 @@
%attr(0755,root,root) %{_bindir}/a+.bin
%{_libdir}/aplus-fsf/
%{_prefix}/lib/a+/
-%dir %{_x11appdef}
%{_x11appdef}/XTerm-apl
-%dir %{_fonts}/apl
%{_sysconfdir}/ld.so.conf.d/aplus-fsf-%{_arch}.conf
%{_datadir}/aplus-fsf/
@@ -220,27 +163,10 @@
%{_lispdir}/aplus-fsf
%{_lispstart}/aplus-fsf-init.el
-%files -n fonts-x11-apl
-%defattr(-,root,root,-)
-%dir %{_x11fonts}
-%{_x11fonts}/K*
-# %verify(not md5 size mtime) %{_x11fonts}/encodings.dir
-%verify(not md5 size mtime) %{_x11fonts}/fonts.scale
-%verify(not md5 size mtime) %{_x11fonts}/fonts.dir
-%verify(not md5 size mtime) %{_x11fonts}/fonts.alias
-%{catalogue}/apl-x11
-
-%files -n fonts-truetype-apl
-%defattr(-,root,root,-)
-%dir %{_ttffonts}
-%{_ttffonts}/K*
-# %verify(not md5 size mtime) %{_ttffonts}/encodings.dir
-%verify(not md5 size mtime) %{_ttffonts}/fonts.dir
-# %verify(not md5 size mtime) %{_ttffonts}/fonts.alias
-%verify(not md5 size mtime) %{_ttffonts}/fonts.scale
-%{catalogue}/apl-truetype
-
%Changelog
+* Wed Jan 7 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-6
+- Reorganization of apl fonts
+
* Mon Nov 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-5
- Try to fix build issue agains libtools-2
- Previous message (by thread): rpms/scidavis/F-9 scidavis-0.1.3-sip.patch, NONE, 1.1 scidavis.spec, 1.3, 1.4
- Next message (by thread): rpms/condor/F-9 DetectGCC.patch, NONE, 1.1 condor.spec, 1.14, 1.15 DetectGCC430.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list