rpms/amaya/FC-4 .cvsignore, 1.3, 1.4 amaya.spec, 1.14, 1.15 sources, 1.3, 1.4

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amaya/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7916/FC-4

Modified Files:
	.cvsignore amaya.spec sources 
Log Message:
upgrade to 9.5 to fix vulnerability


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:45:17 -0000	1.3
+++ .cvsignore	14 Apr 2006 06:41:05 -0000	1.4
@@ -1 +1 @@
-amaya-fullsrc-9.1.tgz
+amaya-fullsrc-9.5.tgz


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- amaya.spec	12 Jun 2005 11:58:52 -0000	1.14
+++ amaya.spec	14 Apr 2006 06:41:05 -0000	1.15
@@ -1,26 +1,27 @@
 Name:		amaya
-Version:	9.1
-Release:	3%{?dist}
+Version:	9.4
+Release:	1%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
-Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.1.tgz
+Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.5.tgz
 Source1:	amaya.png
-Patch0:		amaya-9.1-configure.diff
-Patch1:		amaya-9.1-64bits.patch
 
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #BuildRequires:	libjpeg-devel libpng-devel zlib-devel
 #BuildRequires:	gtk+-devel perl bison flex imlib-devel
-BuildRequires:	xorg-x11-devel, freetype-devel >= 2.0
+BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
-BuildRequires:  libpng-devel
+BuildRequires:  libpng-devel, libXt-devel
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
 
+# Does not build on x86_64, see bug #182512
+ExcludeArch: x86_64
+
 %description
 Amaya is a WYSIWYG browser/web authoring tool from the W3C.
 
@@ -29,8 +30,6 @@
 
 %prep
 %setup -q -c
-%patch0 -p0
-%patch1 -p0
 
 %build
 mkdir -p Amaya/gtk-build
@@ -40,10 +39,13 @@
 export CFLAGS="$RPM_OPT_FLAGS"
 ../configure --enable-bookmarks \
              --prefix=%_libdir \
-	     --bindir=%_bindir \
-	     --exec_prefix=%_exec_prefix \
+             --bindir=%_bindir \
+             --exec_prefix=%_exec_prefix \
              --libdir=%_libdir \
+             --disable-annot \
              --with-gtk
+             
+# annotations cause build to fail
 make
 popd
 
@@ -61,7 +63,8 @@
 # fix up symlinks
 pushd ${RPM_BUILD_ROOT}%{_bindir} >/dev/null
 rm -f amaya*
-ln -s %{_libdir}/Amaya-*/gtk/bin/amaya amaya-gtk
+amayadir=`ls -d ${RPM_BUILD_ROOT}%{_libdir}/Amaya-*`
+ln -s %{_libdir}/`basename $amayadir`/gtk/bin/amaya amaya-gtk
 ln -s amaya-gtk amaya
 popd >/dev/null
 
@@ -99,6 +102,36 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
+- upgrade to 9.5 to fix vulnerability
+
+* Sun Mar 12 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-12
+- fix symlink (bug #184503)
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-11
+- give up on x86_64 and excludearch it
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-10
+- next try at the x86_64 patch
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-9
+- update x86_64 patch again
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-8
+- update x86_64 patch
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-7
+- fix dependency on modular X11 again
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-6
+- fix dependency on modular X11
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-5
+- rebuild for FC5
+
+* Sun Jun 12 2005 Aurelien Bompard <gauret[AT]free.fr> 9.1-4
+- patch one more file
+
 * Sun Jun 12 2005 Aurelien Bompard <gauret[AT]free.fr> 9.1-3
 - add patch for pointer/int problem on x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:45:17 -0000	1.3
+++ sources	14 Apr 2006 06:41:05 -0000	1.4
@@ -1 +1 @@
-453fc74b79acb013e64a380865970773  amaya-fullsrc-9.1.tgz
+7b80b2fdda491a7f693b72606137f955  amaya-fullsrc-9.5.tgz