rpms/aplus-fsf/devel aplus-fsf-aplterm, NONE, 1.1 aplus-fsf-xterm-apl, NONE, 1.1 aplus-fsf.spec, 1.42, 1.43 aplus-fsf.wrapper, 1.1, 1.2

Jochen Schmitt s4504kr at fedoraproject.org
Thu Jul 30 14:41:52 UTC 2009 

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1911

Modified Files:
	aplus-fsf.spec aplus-fsf.wrapper 
Added Files:
	aplus-fsf-aplterm aplus-fsf-xterm-apl 
Log Message:
Fix some issue reported in #510885


--- NEW FILE aplus-fsf-aplterm ---
export LANG="C"; xterm -class 'XTerm-apl' $@


--- NEW FILE aplus-fsf-xterm-apl ---
! contributed by Josef Sachs

XTerm-apl*fontMenu.Label:  VT Fonts
XTerm-apl*fontMenu*fontdefault*Label:	Default
XTerm-apl*fontMenu*font1*Label:	Unreadable
XTerm-apl*VT100*font1:		nil2
XTerm-apl*fontMenu*font2*Label:	Tiny
XTerm-apl*VT100*font2:		5x8
XTerm-apl*fontMenu*font3*Label:	Small
XTerm-apl*fontMenu*font4*Label:	Medium
XTerm-apl*VT100*font4:		Kapl
XTerm-apl*fontMenu*font5*Label:	Large
XTerm-apl*VT100*font5:		Kapl
XTerm-apl*fontMenu*font6*Label:	Huge
XTerm-apl*VT100*font6:		Kapl
XTerm-apl*fontMenu*fontescape*Label:	Escape Sequence
XTerm-apl*fontMenu*fontsel*Label:		Selection

XTerm-apl*VT100.Translations: #override \
        @Num_Lock<Key>KP_0: string(0)\n\
        @Num_Lock<Key>KP_1: string(1)\n\
        @Num_Lock<Key>KP_2: string(2)\n\
        @Num_Lock<Key>KP_3: string(3)\n\
        @Num_Lock<Key>KP_4: string(4)\n\
        @Num_Lock<Key>KP_5: string(5)\n\
        @Num_Lock<Key>KP_6: string(6)\n\
        @Num_Lock<Key>KP_7: string(7)\n\
        @Num_Lock<Key>KP_8: string(8)\n\
        @Num_Lock<Key>KP_9: string(9)\n\
        @Num_Lock<Key>KP_Add: string(+)\n\
        @Num_Lock<Key>KP_Decimal: string(.)\n\
        @Num_Lock<Key>KP_Divide: string(/)\n\
        @Num_Lock<Key>KP_Enter: string(\015)\n\
        @Num_Lock<Key>KP_Equal: string(=)\n\
        @Num_Lock<Key>KP_Multiply: string(*)\n\
        @Num_Lock<Key>KP_Subtract: string(-)\n\
        <Key>KP_Add: string(+)\n\
        <Key>KP_Divide: string(/)\n\
        <Key>KP_Enter: string(\015)\n\
        <Key>KP_Equal: string(=)\n\
        <Key>KP_Multiply: string(*)\n\
        <Key>KP_Subtract: string(-)\n\
        <Key>Prior:scroll-back(1,page)\n\
        <Key>Next:scroll-forw(1,page)\n\
        <Key>F16: start-extend() select-end(PRIMARY, CUT_BUFFER0, CLIPBOARD) \n\
        <Key>F18: insert-selection(PRIMARY, CLIPBOARD) \n\
        <Key>F27: scroll-back(10000,page) \n\
        <Key>R13: scroll-forw(10000,page) \n\
        <Key>Home: scroll-back(10000,page) \n\
        <Key>End: scroll-forw(10000,page) \n\
	:Mod1<Key>a:		string(Á) \n\
	:Mod1<Key>b:		string(Â) \n\
	:Mod1<Key>c:		string(Ã) \n\
	:Mod1<Key>d:		string(Ä) \n\
	:Mod1<Key>e:		string(Å) \n\
	:Mod1<Key>f:		string(_) \n\
	:Mod1<Key>g:		string(Ç) \n\
	:Mod1<Key>h:		string(È) \n\
	:Mod1<Key>i:		string(É) \n\
	:Mod1<Key>j:		string(Ê) \n\
	:Mod1<Key>k:		string(') \n\
	:Mod1<Key>l:		string(Ì) \n\
	:Mod1<Key>m:		string(|) \n\
	:Mod1<Key>n:		string(Î) \n\
	:Mod1<Key>o:		string(Ï) \n\
	:Mod1<Key>p:		string(*) \n\
	:Mod1<Key>q:		string(?) \n\
	:Mod1<Key>r:		string(Ò) \n\
	:Mod1<Key>s:		string(Ó) \n\
	:Mod1<Key>t:		string(~) \n\
	:Mod1<Key>u:		string(Õ) \n\
	:Mod1<Key>v:		string(Ö) \n\
	:Mod1<Key>w:		string(×) \n\
	:Mod1<Key>x:		string(Ø) \n\
	:Mod1<Key>y:		string(Ù) \n\
	:Mod1<Key>z:		string(Ú) \n\
	:Mod1<Key>1:		string(¡) \n\
	:Mod1<Key>2:		string(¢) \n\
	:Mod1<Key>3:		string(<) \n\
	:Mod1<Key>4:		string(¤) \n\
	:Mod1<Key>5:		string(=) \n\
	:Mod1<Key>6:		string(¦) \n\
	:Mod1<Key>7:		string(>) \n\
	:Mod1<Key>8:		string(¨) \n\
	:Mod1<Key>9:		string(©) \n\
	:Mod1<Key>0:		string(^) \n\
	:Mod1<Key>-:		string(«) \n\
	:Mod1<Key>=:		string(ß) \n\
	:Mod1<Key>backslash:	string(Ü) \n\
	:Mod1<Key>quoteleft:	string(þ) \n\
Shift	 Mod1<Key>comma:	string(<) \n\
	:Mod1<Key>comma:	string(¬) \n\
	:Mod1<Key>space:	string(" ") \n\
	:Mod1<Key>~:		string(~) \n\
	:Mod1<Key>?:		string(?) \n\
	:Mod1<Key>[:		string(û) \n\
	:Mod1<Key>]:		string(ý) \n\
	:Mod1<Key>;:		string(Û) \n\
	:Mod1<Key>':		string(Ý) \n\
	:Mod1<Key>.:		string(Ü) \n\
	:Mod1<Key>/:		string(¯) \n\
	:Mod1<Key>!:		string(à) \n\
	:Mod1<Key>@:		string(æ) \n\
	:Mod1<Key>#:		string(ç) \n\
	:Mod1<Key>$:		string(è) \n\
	:Mod1<Key>%:		string(÷) \n\
	:Mod1<Key>^:		string(ô) \n\
	:Mod1<Key>&:		string(á) \n\
	:Mod1<Key>*:		string(ð) \n\
	:Mod1<Key>(:		string(¹) \n\
	:Mod1<Key>):		string(°) \n\
	:Mod1<Key>_:		string(!) \n\
	:Mod1 <Key>+:		string(­) \n\
	:Mod1 <Key>|:		string(ü) \n\
	Shift Mod1<Key>w:	string(W) \n\
	Shift Mod1<Key>r:	string(R) \n\
	Shift Mod1<Key>t:	string(T) \n\
	Shift Mod1<Key>u:	string(U) \n\
	Shift Mod1<Key>a:	string(A) \n\
	Shift Mod1<Key>d:	string(D) \n\
	Shift Mod1<Key>k:	string(K) \n\
	Shift Mod1<Key>x:	string(X) \n\
	Shift Mod1<Key>v:	string(V) \n\
	Shift Mod1<Key>o:	string(ï) \n\
	Shift Mod1<Key>j:	string(ê) \n\
	Shift Mod1<Key>f:	string(½) \n\
	Shift Mod1<Key>e:	string(å) \n\
	Shift Mod1<Key>i:	string(é) \n\
	:Mod1 <Key>{:		string(Ý) \n\
	:Mod1 <Key>}:		string(Û) \n\
	Shift Mod1<Key>s:	string(¾) \n\
	Shift Mod1<Key>g:	string(ç) \n\
	Shift Mod1<Key>h:	string(è) \n\
	Shift Mod1<Key>l:	string(ì) \n\
	:Mod1 <Key>colon:	string(¼) \n\
	:Mod1 <Key>quotedbl:	string(») \n\
	Shift Mod1<Key>c:	string(ã) \n\
	Shift Mod1<Key>b:	string(â) \n\
	Shift Mod1<Key>n:	string(î) \n\
	Shift Mod1<Key>m:	string(Í) \n\
	:Mod1 <Key>>:		string(®) \n\
	Shift Mod1<Key>p:	string(³) \n\
	Shift Mod1<Key>y:	string(´) \n\
	Shift Mod1<Key>z:	string(ú) \n\
	Shift Mod1<Key>q:	string(¿)

XTerm-apl*sunFunctionKeys:	True
XTerm-apl*VT100.faceName:	Kapl
XTerm-apl*charClass:            33:48,37:48,43:48,45-47:48,64:48,126:48
XTerm-apl*VT100.curses:		True
XTerm-apl.VT100.loginShell:	True
XTerm-apl*VT100.internalBorder:	4
XTerm-apl*VT100*jumpScroll:	True
XTerm-apl*VT100*multiScroll:	True
XTerm-apl*VT100*saveLines:	2000
XTerm-apl*VT100*scrollBar:	True
XTerm-apl*VT100*scrollKey:	True
XTerm-apl*VT100.reverseWrap:	True


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- aplus-fsf.spec	24 Jul 2009 16:57:59 -0000	1.42
+++ aplus-fsf.spec	30 Jul 2009 14:41:52 -0000	1.43
@@ -1,3 +1,4 @@
+
 %define catalogue %{_sysconfdir}/X11/fontpath.d/
 %define name aplus-fsf
 %define ver 4.22
@@ -18,9 +19,11 @@
 %define _x11lib %{_libdir}
 %define _x11appdef %{_x11pref}/app-defaults
 
+%define elcc xemacs -batch -q -no-site-file -no-init-file -f batch-byte-compile
+
 Name: %name
 Version: 4.22.4
-Release: 15%{?dist}
+Release: 17%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -31,10 +34,15 @@ Group: Development/Languages
 Source: http://www.aplusdev.org/Download/%name-%ver-%rel.tar.gz
 Source1: aplus-fsf-4.20-elstart
 Source2: aplus-fsf.wrapper
+Source3: aplus-fsf-aplterm
+Source4: aplus-fsf-xterm-apl
+Source5: aplus-fsf-readme
+
 Patch1: aplus-fsf-4.22.4-makefile.patch
 Patch3: aplus-fsf-4.20-el.patch
 Patch4: aplus-fsf-4.22.3-atree.patch
 Patch5:	aplus-fsf-4.22-gcc44.patch
+Patch6: aplus-fsf-4.22-xemacs.patch
 
 BuildRequires: libtool
 BuildRequires: xorg-x11-proto-devel
@@ -42,7 +50,7 @@ BuildRequires: libX11-devel
 BuildRequires: xorg-x11-font-utils
 BuildRequires: automake autoconf
 BuildRequires: fontpackages-devel
-BuildRequires: xemacs, xemacs-devel
+BuildRequires: xemacs, xemacs-devel, xemacs-packages-extra
 
 Requires: xterm
 
@@ -63,10 +71,12 @@ Execution is by a very efficient interpr
 Summary: TrueType fonts for the Advanced APL Interpreter
 Group: User Interface/X
 Provides: apl-fonts
+provides: aplus-fsf-fonts
 Provides: fonts-x11-apl = %{version}-%{release}
 Provides: fonts-truetype-apl = %{version}-%{release}
 Obsoletes: fonts-x11-apl < 4.22.4-6
 Obsoletes: fonts-truetype-apl < 4.22.4-6
+Obsoletes: aplus-fsf-fonts < 4.22.4-6
 
 Requires: fontpackages-filesystem
 
@@ -83,7 +93,7 @@ They are not required to run a A+ progra
 %package -n xemacs-%{name}
 Summary: XEmacs lisp for A+ development
 Group: Applications/Editors
-Requires: xemacs, aplus-fsf
+Requires: xemacs, xemacs-packages-extra, aplus-fsf
 BuildArch: noarch
 %description -n xemacs-%{name}
 This package contains the XEmacs lisp required for the development
@@ -91,6 +101,15 @@ of A+ programs. It does the key bindings
 and bind some function keys. The complete A+ development is provided
 by the aplus-fsf package.
 
+%package -n xemacs-%{name}-el
+Summary: Sources of the XEmacs lisp modules for A+ development
+Group: Applications/Editors
+Requires: xemacs-%{name}-el = %{version}-%{release}
+BuildArch: noarch
+%description -n xemacs-%{name}-el
+This package contains the source file of the XEmacs lisp modules
+required for the development of A+ Programms.
+
 %package devel 
 Summary: Header files from the A+ environment
 Group: Development/Libraries
@@ -104,6 +123,7 @@ This package contains the header file fr
 %patch3 -p1
 %patch4 -p1 
 %patch5 -p1 -b .gcc44
+%patch6 -p1
 
 %build
 # export CXXFLAGS=-O3 CFLAGS=-O3
@@ -148,6 +168,17 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT/%{_bind
 rm -rf $RPM_BUILD_ROOT/%{_prefix}/lisp*
 rm -rf $RPM_BUILD_ROOT/%{_prefix}/contrib
 
+pushd $RPM_BUILD_ROOT/%{xemacs_lispdir}/aplus-fsf
+for i in *.el; do
+  %{elcc} $i
+done
+popd
+
+install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_bindir}/xterm-apl
+install %{SOURCE4} ${RPM_BUILD_ROOT}/%{_x11appdef}/XTerm-apl
+
+cp %{SOURCE5} README.Fedora
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -173,13 +204,14 @@ fi
 %defattr(-,root,root,-)
 %attr(0755,root,root) %{_bindir}/a+
 %attr(0755,root,root) %{_bindir}/a+.bin
+%{_bindir}/xterm-apl
 %{_libdir}/aplus-fsf/
 %{_prefix}/lib/a+/
 %{_x11appdef}/XTerm-apl
 %{_sysconfdir}/ld.so.conf.d/aplus-fsf-%{_arch}.conf
 %{_datadir}/aplus-fsf/
 
-%doc ANNOUNCE AUTHORS ChangeLog LICENSE README
+%doc ANNOUNCE AUTHORS ChangeLog LICENSE README README.Fedora
 
 %files devel
 %defattr(-,root,root,-)
@@ -189,11 +221,21 @@ fi
 
 %files -n xemacs-%{name}
 %defattr(-,root,root,-)
-%{xemacs_lispdir}/aplus-fsf/*.el
+%{xemacs_lispdir}/aplus-fsf/*.elc
 %{xemacs_startdir}/aplus-fsf-init.el
+%dir %{xemacs_lispdir}/aplus-fsf/
+
+%files -n xemacs-%{name}-el
+%defattr(-,root,root,-)
+%{xemacs_lispdir}/aplus-fsf/*.el
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.22.4-15
+* Thu Jul 30 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-17
+- Fix XEmacs compiling issue by adding xemacs-packages-extra as new req.
+- Add Script to start XTerm with XTerm-apl resources
+- Modify a+ wrapper to get Backspace to work
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.22.4-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Mar 10 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-15


Index: aplus-fsf.wrapper
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- aplus-fsf.wrapper	9 Sep 2008 14:43:59 -0000	1.1
+++ aplus-fsf.wrapper	30 Jul 2009 14:41:52 -0000	1.2
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-export LC_ALL=POXIS; /usr/bin/a+.bin
+stty erase ^H
+
+export LC_ALL="C"; /usr/bin/a+.bin

More information about the fedora-extras-commits mailing list