SPECS: amaya.spec - updated to 9.54 - added opt, system-libwww patc...

[qboosh]

Author: qboosh                       Date: Wed Apr 11 09:27:45 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 9.54
- added opt,system-libwww patches, removed outdated install patch
- use wxGTK2 by default (instead of GTK+ 1.x)

---- Files affected:
SPECS:
   amaya.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/amaya.spec
diff -u SPECS/amaya.spec:1.24 SPECS/amaya.spec:1.25
--- SPECS/amaya.spec:1.24	Mon Feb 12 22:23:46 2007
+++ SPECS/amaya.spec	Wed Apr 11 11:27:40 2007
@@ -1,79 +1,89 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	gtk1	# GTK+ 1.x instead of WX
+#
 Summary:	Web Browser/Editor from the World Wide Web Consortium
 Summary(pl.UTF-8):	Przeglądarka/edytor stron WWW z World Wide Web Consortium
 Name:		amaya
-Version:	8.6
+Version:	9.54
 Release:	1
 License:	Copyright 1995-2002 (MIT) (INRIA), (L)GPL compatible
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.w3.org/pub/amaya/%{name}-src-%{version}.tgz
-# Source0-md5:	a70d4fcb5c3f8d81eff78522dc7f8b01
-#Source1:	ftp://ftp.w3.org/pub/amaya/Dutch.tgz
-#Source2:	ftp://ftp.w3.org/pub/amaya/Spanish.tgz
-#Source3:	ftp://ftp.w3.org/pub/amaya/Italian.tgz
-#Source4:	ftp://ftp.w3.org/pub/amaya/Swedish.tgz
-#Source5:	ftp://ftp.w3.org/pub/amaya/German.tgz
-Patch0:		%{name}-install.patch
+# Source0-md5:	b8fa2655e026091835a9bb7c59e3db83
+Patch0:		%{name}-opt.patch
+Patch1:		%{name}-system-libwww.patch
 URL:		http://www.w3.org/Amaya/
-BuildRequires:	autoconf
+BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
+BuildRequires:	dos2unix
 BuildRequires:	expat-devel
+BuildRequires:	libjpeg-devel >= 6b
+BuildRequires:	libpng-devel >= 1.0
+BuildRequires:	redland-devel >= 0.9.16
+BuildRequires:	w3c-libwww-devel >= 5.4.0-8
+BuildRequires:	zlib-devel
+%if %{with gtk1}
 BuildRequires:	gtk+-devel
 BuildRequires:	imlib-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	libpng-devel
-BuildRequires:	zlib-devel
+%else
+BuildRequires:	wxGTK2-unicode-devel
+BuildRequires:	wxGTK2-unicode-gl-devel
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_prefix		/usr/%{_lib}
+%define		_bindir		/usr/bin
+
 %description
 Amaya is a complete web browsing and authoring environment and comes
 equipped with a WYSIWYG style of interface, similar to that of the
 most popular commercial browsers. With such an interface, users do not
 need to know the HTML or CSS languages.
 
-Authors:
---------- Irene.Vatton at w3.org, Jose.Kahan at w3.org,
-  Vincent.Quint at w3.org, Laurent.Carcone at w3.org
-
 %description -l pl.UTF-8
 Amaya jest kompletną przeglądarką WWW i środowiskiem tworzenia stron
 WWW, wyposażona jest w interfejs WYSIWYG podobny do stosowanego w
 najbardziej popularnych komercyjnych przeglądarkach. Z takim
 interfejsem użytkownicy nie muszą wiedzieć co to jest HTML czy CSS.
 
-Autorzy:
---------- Irene.Vatton at w3.org, Jose.Kahan at w3.org,
-  Vincent.Quint at w3.org, Laurent.Carcone at w3.org
-
 %prep
 %setup -q -n Amaya
 %patch0 -p1
 
+# AC_SUBST_FILE doesn't work with CR+LF
+dos2unix amaya/Makefile.in
+
+%patch1 -p1
+
 %build
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
-cp -f /usr/share/automake/{config.,missing}* .
 mkdir Linux
 cd Linux
 ../%configure \
-	--prefix=%{_prefix} \
-	--datadir=%{_libdir} \
-	--without-graphic-libs \
+	WXCONFIG=/usr/bin/wx-gtk2-unicode-config \
+	--enable-system-redland \
+	--enable-system-wx \
+	--without-graphiclibs \
 	--with-dav \
-	--with-gtk \
-	--with-x
+	%{?with_gtk1:--with-gtk} \
+	%{!?with_gtk1:--with-wx --with-gl}
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}}
-cd Linux
-%{__make} install \
-	prefix=$RPM_BUILD_ROOT%{_libdir} \
-	datadir=$RPM_BUILD_ROOT%{_libdir}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_prefix}}
 
-ln -sf %{_libdir}/Amaya/applis/bin/amaya $RPM_BUILD_ROOT%{_bindir}/amaya
+%{__make} -C Linux install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{_bindir}/amaya-wx
+ln -sf %{_prefix}/Amaya-%{version}/wx/bin/amaya $RPM_BUILD_ROOT%{_bindir}/amaya
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,14 +91,19 @@
 %files
 %defattr(644,root,root,755)
 %doc amaya/COPYRIGHT README README.amaya README.gl README.wx
-%attr(755,root,root) %{_bindir}/amaya
-%dir %{_libdir}/Amaya
-%{_libdir}/Amaya/amaya
-%{_libdir}/Amaya/annotlib
-%{_libdir}/Amaya/[cdf]*
-%dir %{_libdir}/Amaya/applis
-%dir %{_libdir}/Amaya/applis/bin
-%attr(755,root,root) %{_libdir}/Amaya/applis/bin/*
+%attr(755,root,root) %{_bindir}/amaya*
+%dir %{_prefix}/Amaya*
+%{_prefix}/Amaya*/amaya
+%{_prefix}/Amaya*/annotlib
+%{_prefix}/Amaya*/config
+%{_prefix}/Amaya*/dicopar
+%{_prefix}/Amaya*/doc
+%{_prefix}/Amaya*/fonts
+%{_prefix}/Amaya*/resources
+%dir %{_prefix}/Amaya*/wx
+%dir %{_prefix}/Amaya*/wx/bin
+%attr(755,root,root) %{_prefix}/Amaya*/wx/bin/amaya
+%attr(755,root,root) %{_prefix}/Amaya*/wx/bin/print
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -96,6 +111,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2007/04/11 09:27:40  qboosh
+- updated to 9.54
+- added opt,system-libwww patches, removed outdated install patch
+- use wxGTK2 by default (instead of GTK+ 1.x)
+
 Revision 1.24  2007/02/12 21:23:46  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/amaya.spec?r1=1.24&r2=1.25&f=u