rpms/aplus-fsf/devel .cvsignore, 1.2, 1.3 aplus-fsf.spec, 1.19, 1.20 sources, 1.2, 1.3 aplus-fsf-4.20-makefile.patch, 1.6, NONE

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21814

Modified Files:
	.cvsignore aplus-fsf.spec sources 
Removed Files:
	aplus-fsf-4.20-makefile.patch 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jul 2006 15:19:48 -0000	1.2
+++ .cvsignore	7 Apr 2008 16:57:26 -0000	1.3
@@ -1 +1 @@
-aplus-fsf-4.20-2.tar.gz
+aplus-fsf-4.22-1.tar.gz


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- aplus-fsf.spec	31 Mar 2008 17:34:27 -0000	1.19
+++ aplus-fsf.spec	7 Apr 2008 16:57:26 -0000	1.20
@@ -1,7 +1,7 @@
 %define catalogue /etc/X11/fontpath.d/
 %define name aplus-fsf
-%define ver 4.20
-%define rel 2
+%define ver 4.22
+%define rel 1
 
 %define _x11pref %{_datadir}/X11
 %define _x11bindir %{_bindir}
@@ -14,8 +14,8 @@
 %define _x11appdef %{_x11pref}/app-defaults
 
 Name: %name
-Version: 4.20.2
-Release: 25%{?dist}
+Version: 4.22.1
+Release: 1%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -25,8 +25,7 @@
 
 Source: http://www.aplusdev.org/Download/%name-%ver-%rel.tar.gz
 Source1: aplus-fsf-4.20-elstart
-Patch1: aplus-fsf-4.20-makefile.patch
-Patch2: aplus-fsf-4.20-gcc41.patch
+Patch1: aplus-fsf-4.22-makefile.patch
 Patch3: aplus-fsf-4.20-el.patch
 Patch4: aplus-fsf-4.20-atree.patch
 
@@ -39,8 +38,6 @@
 Requires: fonts-apl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExcludeArch: x86_64
-
 %description
 A+ is a Morgan Stanley array programming environment that includes 
 a rich set of functions and operators, handling of files as ordinary 
@@ -101,7 +98,6 @@
 %prep
 %setup -q -n %{name}-%{ver}
 %patch1 -p1 -b .org
-%patch2 -p1 
 %patch3 -p1
 %patch4 -p1
 
@@ -109,8 +105,10 @@
 # export CXXFLAGS=-O3 CFLAGS=-O3
 export CFLAGS=$RPM_OPT_FLAGS 
 export CXXLFAGS=$RPM_OPT_FLAGS
-autoreconf
-%configure --prefix=/usr
+aclocal
+automake
+autoconf
+%configure --prefix=/usr --docdir=%{_datadir}/doc/%{name}-%{version}
 make %{?_smp_mflags} LIBTOOL="/usr/bin/libtool"
 
 %install
@@ -231,6 +229,7 @@
 %{_x11appdef}/XTerm-apl
 %{_fonts}/
 %{_sysconfdir}/ld.so.conf.d/aplus-fsf-%{_arch}.conf
+%{_datadir}/aplus-fsf/
 
 %doc samples
 %doc ANNOUNCE AUTHORS ChangeLog LICENSE README
@@ -266,14 +265,11 @@
 %{catalogue}/apl-truetype
 
 %Changelog
-* Mon Mar 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-25
-- Disable x86_64 architecture (#435074)
+* Sun Apr  6 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.1-1
+- New upstream release (#435074)
 
-* Sun Feb 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-24
-- Rebuild for gcc-4.3
-
-* Wed Jan 23 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-23
-- Rebuild
+* Mon Mar 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-24
+- Disable x86_64 architecture (#435074)
 
 * Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-22
 - Changing license tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jul 2006 15:19:48 -0000	1.2
+++ sources	7 Apr 2008 16:57:26 -0000	1.3
@@ -1 +1 @@
-2366264664c0b352b907b411af48e5aa  aplus-fsf-4.20-2.tar.gz
+af7d3f8a4643c41efa5d50b76507dc3c  aplus-fsf-4.22-1.tar.gz


--- aplus-fsf-4.20-makefile.patch DELETED ---