rpms/amaya/devel .cvsignore, 1.2, 1.3 amaya.spec, 1.6, 1.7 sources, 1.2, 1.3

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amaya/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22246/devel

Modified Files:
	.cvsignore amaya.spec sources 
Log Message:
- update to 9.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:02:16 -0000	1.2
+++ .cvsignore	29 May 2005 13:45:17 -0000	1.3
@@ -1 +1 @@
-amaya-src-8.5.tgz
+amaya-fullsrc-9.1.tgz


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amaya.spec	23 May 2005 00:23:33 -0000	1.6
+++ amaya.spec	29 May 2005 13:45:17 -0000	1.7
@@ -1,18 +1,22 @@
 Name:		amaya
-Version:	8.5
-Release: 4
+Version:	9.1
+Release:	1%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
-Source0:	http://www.w3.org/Amaya/Distribution/amaya-src-8.5.tgz
+Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.1.tgz
 Source1:	amaya.png
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libungif-devel libjpeg-devel libpng-devel zlib-devel
-BuildRequires:	gtk+-devel perl bison flex imlib-devel
-BuildRequires:	XFree86-devel freetype-devel >= 2.0
-BuildRequires:	desktop-file-utils
+#BuildRequires:	libjpeg-devel libpng-devel zlib-devel
+#BuildRequires:	gtk+-devel perl bison flex imlib-devel
+BuildRequires:	xorg-x11-devel, freetype-devel >= 2.0
+BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
+BuildRequires:  libpng-devel
+# TODO: make it link with the system's libwww. Didn't manage to build with it
+# yet. Patches accepted.
+#BuildRequires:	w3c-libwww-devel
 
 %description
 Amaya is a WYSIWYG browser/web authoring tool from the W3C.
@@ -30,7 +34,8 @@
 ../configure --enable-bookmarks \
              --prefix=$RPM_BUILD_ROOT%_libdir \
              --exec-prefix=$RPM_BUILD_ROOT/%_prefix \
-             --libdir=%_libdir
+             --libdir=%_libdir \
+             --with-gtk
 make
 
 %install
@@ -38,8 +43,10 @@
 mkdir -p $RPM_BUILD_ROOT%_datadir/pixmaps
 cd gtk-build
 make install
-rm -f $RPM_BUILD_ROOT%_bindir/%name
-ln -s %{_libdir}/Amaya/applis/bin/amaya $RPM_BUILD_ROOT%_bindir/amaya
+rm -f $RPM_BUILD_ROOT%{_bindir}/amaya*
+mv $RPM_BUILD_ROOT%{_libdir}/Amaya-* $RPM_BUILD_ROOT%{_libdir}/Amaya
+ln -s %{_libdir}/Amaya/gtk/bin/amaya $RPM_BUILD_ROOT%{_bindir}/amaya-gtk
+ln -s amaya-gtk $RPM_BUILD_ROOT%{_bindir}/amaya
 
 # Menu entry
 cat << EOF > %{name}.desktop
@@ -68,14 +75,17 @@
 %files
 %defattr(-,root,root)
 %doc README* amaya/COPYRIGHT*
-%_libdir/Amaya
+%_libdir/Amaya*
 %_bindir/%name
+%_bindir/%name-gtk
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
 
 %changelog
-* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 8.5-4
-- rebuild on all arches
+* Sun May 08 2005 Aurelien Bompard <gauret[AT]free.fr> 9.1-1%{?dist}
+- version 9.1
+- use disttag
+- use fullsrc dist
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:02:16 -0000	1.2
+++ sources	29 May 2005 13:45:17 -0000	1.3
@@ -1 +1 @@
-0ee123988b2e09fe60f9120df8dc9012  amaya-src-8.5.tgz
+453fc74b79acb013e64a380865970773  amaya-fullsrc-9.1.tgz