From: juandon <witekfl@pld-linux.org>
Date: Fri, 3 Jan 2003 19:11:42 +0000 (+0000)
Subject: - Release 0.9
X-Git-Tag: auto/ac/amaya-8_2-1~20
X-Git-Url: http://git.pld-linux.org/?p=packages%2Famaya.git;a=commitdiff_plain;h=e2ca440efc8898f80eef14f9ca9201ec88cfa6a9

- Release 0.9
- build without OpenGL
- add intall patch
- FIXME: /usr/X11R6/Amaya/applis/bin/* should be attr(755,root,root)

Changed files:
    amaya.spec -> 1.2
---

diff --git a/amaya.spec b/amaya.spec
index 625712e..0b5abdd 100644
--- a/amaya.spec
+++ b/amaya.spec
@@ -2,7 +2,7 @@ Summary:	Web Browser/Editor from the World Wide Web Consortium
 Summary(pl):	Przegl±darka/edytor stron www z World Wide Web Consortium
 Name:		amaya
 Version:	7.1
-Release:	0.1
+Release:	0.9
 License:	Copyright 1995-2002 (MIT) (INRIA), (L)GPL compatible
 Group:		X11/Applications/Networking
 URL:		http://www.w3.org/Amaya/
@@ -12,10 +12,11 @@ Source0:	ftp://ftp.w3.org/pub/amaya/%{name}-src-%{version}.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}-ac-gtkglarea.patch
+Patch0:		%{name}-ac-gtkglarea.patch
+Patch1:		%{name}-install.patch
 BuildRequires:	autoconf
 BuildRequires:	expat-devel
-BuildRequires:	gtkglarea-devel
+BuildRequires:	gtk+-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	zlib-devel
@@ -49,6 +50,7 @@ Autorzy:
 %prep
 %setup -q -n Amaya
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__autoconf}
@@ -56,22 +58,25 @@ cp -f /usr/share/automake/{config.,missing}* .
 mkdir Linux
 cd Linux
 ../%configure \
+	--prefix=$RPM_BUILD_ROOT%{_prefix} \
 	--without-graphic-libs \
 	--with-dav \
-	--with-gl \
 	--with-x
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_prefix}/bin
 cd Linux
 %{__make} install
+ln -sf %{_prefix}/Amaya/applis/bin/%{name} $RPM_BUILD_ROOT%{_prefix}/bin/%{name} 
 
 %files
 %defattr(644,root,root,755)
-%doc COPYRIGHT README.amaya
+%doc amaya/COPYRIGHT README README.amaya README.gl
 %attr(755,root,root) %{_bindir}/amaya
-%{_datadir}/Amaya
+%dir %{_prefix}/Amaya
+%{_prefix}/Amaya
 
 %clean
 rm -rf $RPM_BUILD_ROOT