rpms/aplus-fsf/devel aplus-fsf-4.20-el.patch, 1.1, 1.2 aplus-fsf.spec, 1.3, 1.4 needs.rebuild, 1.1, NONE
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Mon Sep 4 18:13:31 UTC 2006
Author: s4504kr
Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14058
Modified Files:
aplus-fsf-4.20-el.patch aplus-fsf.spec
Removed Files:
needs.rebuild
Log Message:
Rebuilt for FC-6
aplus-fsf-4.20-el.patch:
Index: aplus-fsf-4.20-el.patch
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf-4.20-el.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aplus-fsf-4.20-el.patch 8 Aug 2006 18:27:34 -0000 1.1
+++ aplus-fsf-4.20-el.patch 4 Sep 2006 18:13:31 -0000 1.2
@@ -1,5 +1,5 @@
---- 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
+--- aplus-fsf-4.20/src/lisp.1/a.el.org 2001-03-09 22:20:08.000000000 +0100
++++ aplus-fsf-4.20/src/lisp.1/a.el 2006-08-13 20:10:08.000000000 +0200
@@ -26,7 +26,7 @@
(defvar a+-font "kaplscreen-bold" "Font used in A+ mode.")
@@ -14,7 +14,7 @@
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-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")
@@ -23,7 +23,96 @@
(defun standard-a()
(interactive)
- (setq a-prog "/usr/local/bin/z")
-+ (setq a-prog "/usr/bin/z")
++ (setq a-prog "/usr/bin/a+")
(setq a-log "~/.emacs_a")
(setq a-tmp-dir "~")
(setq a-init-string "$echo `date` on `hostname`\n")
+@@ -874,7 +874,7 @@
+
+
+ (defvar a-prog-default "a+")
+-(defvar a-path-default "/usr/local/lib/aplus-")
++(defvar a-path-default "/usr/lib/a+")
+
+ ;(cond ((string-equal (getenv "SYS_FIRIS") "FID")
+ ; (defvar a-path-default "/usr/local/a+_")
+@@ -905,28 +905,28 @@
+ (cond
+ ; a+_1a 1a
+ ((string-match "^\\(a\\+_\\)?\\([0-9]+a\\)$" arg)
+- (build-prog-name a-path-default "/bin/a+" arg 2))
++ (build-prog-name a-path-default "/usr/bin/a+" arg 2))
+ ; a+_1b1 1b1
+ ((string-match "^\\(a\\+_\\)?\\([0-9]+b[0-9]+\\)$" arg)
+- (build-prog-name a-path-default "/bin/a+" arg 2))
++ (build-prog-name a-path-default "/usr/bin/a+" arg 2))
+ ; a+_1.01 1.01
+ ((string-match "^\\(a\\+_\\)?\\([0-9]+\\.[0-9]+\\)$" arg)
+- (build-prog-name a-path-default "/bin/a+" arg 2))
++ (build-prog-name a-path-default "/usr/bin/a+" arg 2))
+ ; a aX a_82 aX_82 a_latest aX_latest
+ ((string-match "^a\\(X\\)?\\(_[0-9a-zA-Z]+\\)?$" arg)
+ (progn
+ (setq a-plus nil)
+ (concat
+- "/usr/local/bin/a"
++ "/usr/bin/a"
+ (if (match-beginning 1) "X")
+ (if (match-beginning 2)
+ (substring arg (match-beginning 2) (match-end 2))))))
+ ; a+_m1.maus m1.maus
+ ((string-match "^\\(a\\+_\\)?m\\([0-9]+\\)\\.\\([a-z]+\\)$" arg)
+ (build-prog-name
+- "/u/src/usr/local/a+_"
++ "/usr/bin/a+_"
+ (concat "/" (substring arg (match-beginning 3) (match-end 3))
+- "/" (getenv "ID_EXEC") "/bin/a+")
++ "/" (getenv "ID_EXEC") "/usr/bin/a+")
+ arg 2))
+ ; a+_m1 m1
+ ((string-match "^\\(a\\+_\\)?m\\([0-9]+\\)$" arg)
+@@ -943,7 +943,7 @@
+ (concat "/u/aplus/" (getenv "ID_EXEC") "/bin/a+"))
+ ; a+ a+_1
+ ((string-match "^a\\+\\(_[0-9]+\\)?$" arg)
+- (concat "/usr/local/a+"
++ (concat "/usr/lib/a+"
+ (if (match-beginning 1)
+ (substring arg (match-beginning 1) (match-end 1)))
+ "/bin/a+"))
+@@ -951,12 +951,12 @@
+ ((string-match "^\\([0-9]+\\)$" arg)
+ (concat a-path-default arg "/bin/a+"))
+ ; ont
+- ((string-match "^ont$" arg) "/usr/local/a+_ont/bin/a+")
++ ((string-match "^ont$" arg) "/usr/bin/a+")
+ ; default
+- ((string-match "^default$" arg) "/ms/dist/aplus/bin/a+")
++ ((string-match "^default$" arg) "/usr/bin/a+")
+ ; x.latest
+ ((string-match "^\\([0-9]+.latest\\)$" arg)
+- (concat a-path-default arg "/bin/a+"))
++ (concat a-path-default arg "/usr/bin/a+"))
+ ; anything else
+ (t arg )))
+ "\""))))
+--- aplus-fsf-4.20/src/lisp.1/aplus.el.org 2005-08-29 04:22:56.000000000 +0200
++++ aplus-fsf-4.20/src/lisp.1/aplus.el 2006-08-13 20:04:41.000000000 +0200
+@@ -32,7 +32,7 @@
+ (if aplus-set-load-path
+ (setq load-path
+ (append
+- '("/usr/local/aplus-fsf-4.20/lisp.1") load-path
++ '("/usr/share/xemacs/site-packages/lisp/aplus-fsf/") load-path
+ )
+ ))
+ ;;
+@@ -47,7 +47,7 @@
+ (require 'a-font)
+ (require 'keyb)
+ (require 'a)
+-(setq a-prog "/usr/local/bin/a+")
++(setq a-prog "/usr/bin/a+")
+ (setq a-plus t)
+
+ (cond ((file-readable-p "~/.custom/a-options.el")
Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aplus-fsf.spec 9 Aug 2006 15:00:15 -0000 1.3
+++ aplus-fsf.spec 4 Sep 2006 18:13:31 -0000 1.4
@@ -7,13 +7,14 @@
%define _lispdir %{_datadir}/xemacs/site-packages/lisp
%define _lispstart %{_lispdir}/site-start.d
%define _x11lib %{_libdir}
-%define _x11fonts %{_datadir}/fonts/apl/pcf
-%define _ttffonts %{_datadir}/fonts/apl/TrueType
+%define _fonts %{_datadir}/fonts
+%define _x11fonts %{_fonts}/apl/pcf
+%define _ttffonts %{_fonts}/apl/TrueType
%define _x11appdef %{_x11pref}/app-defaults
Name: %name
Version: 4.20.2
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPL
Summary: Advanced APL interpreter with s interface
@@ -210,6 +211,7 @@
%{_libdir}/a+
%dir %{_x11appdef}
%{_x11appdef}/XTerm-apl
+%{_fonts}/
%doc samples
%doc ANNOUNCE AUTHORS ChangeLog LICENSE README
@@ -240,10 +242,10 @@
%files -n fonts-x11-apl
%defattr(-,root,root,-)
%{_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-*
+%ghost %verify(not md5 size mtime) %{_x11fonts}/encodings.dir
+%ghost %verify(not md5 size mtime) %{_x11fonts}/fonts.dir
+%ghost %verify(not md5 size mtime) %{_x11fonts}/fonts.alias
+%ghost %verify(not md5 size mtime) %{_x11fonts}/fonts.cache-*
%files -n fonts-truetype-apl
%defattr(-,root,root,-)
@@ -255,6 +257,9 @@
%ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.cache-*
%Changelog
+* Mon Sep 4 2006 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-10
+- Fix apl font problem
+
* Wed Aug 9 2006 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-9
- Rebuilt to sync Release-Tag with FC-4
--- needs.rebuild DELETED ---
More information about the scm-commits
mailing list