SPECS: amaya.spec - fixed gtk1 build - release 1.1, doesn't work o...

[hawk]

Author: hawk                         Date: Thu Apr 12 10:24:14 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed gtk1 build
- release 1.1, doesn't work out of the box, wrong paths in amaya-{wx,gtk} wrappers

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

---- Diffs:

================================================================
Index: SPECS/amaya.spec
diff -u SPECS/amaya.spec:1.25 SPECS/amaya.spec:1.26
--- SPECS/amaya.spec:1.25	Wed Apr 11 11:27:40 2007
+++ SPECS/amaya.spec	Thu Apr 12 12:24:08 2007
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Przeglądarka/edytor stron WWW z World Wide Web Consortium
 Name:		amaya
 Version:	9.54
-Release:	1
+Release:	1.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
@@ -82,8 +82,13 @@
 %{__make} -C Linux install \
 	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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,10 +105,17 @@
 %{_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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -111,6 +123,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2007/04/12 10:24:08  hawk
+- fixed gtk1 build
+- release 1.1, doesn't work out of the box, wrong paths in amaya-{wx,gtk} wrappers
+
 Revision 1.25  2007/04/11 09:27:40  qboosh
 - updated to 9.54
 - added opt,system-libwww patches, removed outdated install patch
================================================================

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