up to 11.4.4; gtk1 dropped, only wxwidgets now

diff --git a/amaya.spec b/amaya.spec
index f461fe20188d6c113ec7964e1de110346fe37651..ae665271d28fdca21b3188d57b3a5c1854e9b688 100644 (file)
--- a/amaya.spec
+++ b/amaya.spec
@@ -1,43 +1,33 @@
-#
-# 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:       9.54
-Release:       1.1
+Version:       11.4.4
+Release:       0.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: b8fa2655e026091835a9bb7c59e3db83
+Source0:       ftp://ftp.w3.org/pub/amaya/%{name}-sources-%{version}.tgz
+# Source0-md5: e8072c7b1d06b983951c56e9f51fbacf
 Patch0:                %{name}-opt.patch
-Patch1:                %{name}-system-libwww.patch
 URL:           http://www.w3.org/Amaya/
 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
 BuildRequires: libraptor
 BuildRequires: libraptor-devel
 BuildRequires: libtool >= 2:1.4d-3
-%if %{with gtk1}
-BuildRequires: gtk+-devel
-BuildRequires: imlib-devel
-%else
+BuildRequires: redland-devel >= 0.9.16
+BuildRequires: w3c-libwww-devel >= 5.4.0-8
+BuildRequires: zlib-devel
 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
+# ../.././thotlib/base/batchmessage.c:29:25: error: format not a string literal and no format arguments [-Werror=format-security]
+# ../.././thotlib/base/batchmessage.c:37:25: error: format not a string literal and no format arguments [-Werror=format-security]
+%define                filterout_cxx   -Werror=format-security
 
 %description
 Amaya is a complete web browsing and authoring environment and comes
@@ -52,71 +42,63 @@ najbardziej popularnych komercyjnych przeglądarkach. Z takim
 interfejsem użytkownicy nie muszą wiedzieć co to jest HTML czy CSS.
 
 %prep
-%setup -q -n Amaya
+%setup -q -n Amaya%{version}
+install -d sys-libs
+mv Mesa freetype libwww redland wxWidgets sys-libs
+cd Amaya
 %patch0 -p1
 
-# AC_SUBST_FILE doesn't work with CR+LF
-dos2unix amaya/Makefile.in
-
-%patch1 -p1
-
 %build
-export LDFLAGS="-lraptor"
+cd Amaya
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
-mkdir Linux
+install -d Linux
 cd Linux
 ../%configure \
        WXCONFIG=/usr/bin/wx-gtk2-unicode-config \
-       --enable-system-redland \
+       --prefix=%{_libdir} \
+       --enable-system-libwww \
        --enable-system-wx \
-       --without-graphiclibs \
        --with-dav \
-       %{?with_gtk1:--with-gtk} \
-       %{!?with_gtk1:--with-wx --with-gl}
+       --with-gl
 
-%{__make}
+%{__make} -j1 \
+       AMAYA_LIBWWW_SRC= \
+       AMAYA_LIBWWW_INCLUDES="$(libwww-config --cflags)" \
+       AMAYA_LIBWWW_LIBS="$(libwww-config --libs)" \
+       IMGLIBS="-lpng -ljpeg" \
+       EXPAT_LIBRARIES="-lpng -ljpeg"
+
+#  EXPAT_LIBRARIES/IMGLIBS is fake, just convient place to add LIBS
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_prefix}}
-
-%{__make} -C Linux install \
+%{__make} -C Amaya/Linux install \
+       AMAYA_LIBWWW_SRC= \
        DESTDIR=$RPM_BUILD_ROOT
 
-%if  %{with gtk1}
-rm -f $RPM_BUILD_ROOT%{_bindir}/amaya-gtk
-ln -sf %{_prefix}/Amaya-%{version}/gtk/bin/amaya $RPM_BUILD_ROOT%{_bindir}/amaya
-%else
-rm -f $RPM_BUILD_ROOT%{_bindir}/amaya-wx
-ln -sf %{_prefix}/Amaya-%{version}/wx/bin/amaya $RPM_BUILD_ROOT%{_bindir}/amaya
-%endif
+ln -sf %{_libdir}/Amaya/wx/bin/amaya $RPM_BUILD_ROOT%{_bindir}/amaya
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc amaya/COPYRIGHT README README.amaya README.gl README.wx
-%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
-%if  %{with gtk1}
-%dir %{_prefix}/Amaya*/gtk
-%dir %{_prefix}/Amaya*/gtk/bin
-%attr(755,root,root) %{_prefix}/Amaya*/gtk/bin/amaya
-%attr(755,root,root) %{_prefix}/Amaya*/gtk/bin/print
-%else
-%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
-%endif
+%doc Amaya/{amaya/COPYRIGHT,README,README.wx}
+%attr(755,root,root) %{_bindir}/amaya
+%dir %{_libdir}/Amaya
+%{_libdir}/Amaya/amaya
+%{_libdir}/Amaya/annotlib
+%{_libdir}/Amaya/config
+%{_libdir}/Amaya/dicopar
+%{_libdir}/Amaya/doc
+%{_libdir}/Amaya/fonts
+%{_libdir}/Amaya/resources
+%dir %{_libdir}/Amaya/wx
+%dir %{_libdir}/Amaya/wx/bin
+%attr(755,root,root) %{_libdir}/Amaya/wx/bin/amaya
+%attr(755,root,root) %{_libdir}/Amaya/wx/bin/amaya_bin
+%attr(755,root,root) %{_libdir}/Amaya/wx/bin/print