rpms/amaya/FC-3 .cvsignore, 1.3, 1.4 amaya.spec, 1.6, 1.7 branch, 1.1, 1.2 sources, 1.3, 1.4
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Thu Jun 29 13:39:31 UTC 2006
Author: ausil
Update of /cvs/extras/rpms/amaya/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4725
Modified Files:
.cvsignore amaya.spec branch sources
Log Message:
update FC-3 branch to FC-4 branch for security Issue
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-3/.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 29 Jun 2006 13:39:31 -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-3/amaya.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amaya.spec 12 Jun 2005 11:58:51 -0000 1.6
+++ amaya.spec 29 Jun 2006 13:39:31 -0000 1.7
@@ -1,26 +1,30 @@
Name: amaya
-Version: 9.1
-Release: 3%{?dist}
+Version: 9.5
+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
+%if "%fedora" >= "5"
+BuildRequires: libXt-devel
+%else
+BuildRequires: xorg-x11-devel
+%endif
# 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 +33,6 @@
%prep
%setup -q -c
-%patch0 -p0
-%patch1 -p0
%build
mkdir -p Amaya/gtk-build
@@ -40,10 +42,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 +66,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 +105,45 @@
%{_datadir}/pixmaps/*
%changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-4
+- fix buildreqs
+
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
+- drop conditional build
+
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
+- fix build on FC-4
+
+* 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: branch
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-3/branch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- branch 25 Feb 2005 22:07:10 -0000 1.1
+++ branch 29 Jun 2006 13:39:31 -0000 1.2
@@ -1 +1 @@
-FC-3
+FC-4
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-3/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 29 Jun 2006 13:39:31 -0000 1.4
@@ -1 +1 @@
-453fc74b79acb013e64a380865970773 amaya-fullsrc-9.1.tgz
+7b80b2fdda491a7f693b72606137f955 amaya-fullsrc-9.5.tgz
More information about the fedora-extras-commits
mailing list