rpms/amaya/FC-3 amaya-9.1-64bits.patch,NONE,1.1 amaya.spec,1.4,1.5

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amaya/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv660/FC-3

Modified Files:
	amaya.spec 
Added Files:
	amaya-9.1-64bits.patch 
Log Message:
- add patch for pointer/int problem on x86_64

amaya-9.1-64bits.patch:

--- NEW FILE amaya-9.1-64bits.patch ---
--- .Amaya//thotlib/base/fileaccess.c.64bits	2005-06-12 11:27:39.000000000 +0200
+++ ./Amaya/thotlib/base/fileaccess.c	2005-06-12 11:29:27.000000000 +0200
@@ -684,7 +684,7 @@
        while (ptr != NULL);
 
        /* the length of the directory part */
-       i = ((int) (oldptr) - (int) (text)) / sizeof (char);
+       i = ((long) (oldptr) - (long) (text)) / sizeof (char);
        if (i > 1)
 	 {
 	   strncpy (aDirectory, text, i);


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-3/amaya.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amaya.spec	29 May 2005 13:45:17 -0000	1.4
+++ amaya.spec	12 Jun 2005 11:57:12 -0000	1.5
@@ -1,11 +1,14 @@
 Name:		amaya
 Version:	9.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
 Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.1.tgz
 Source1:	amaya.png
+Patch0:		amaya-9.1-configure.diff
+Patch1:		amaya-9.1-64bits.patch
+
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,28 +28,42 @@
 draft standards for HTML/XHTML.
 
 %prep
-%setup -q -n Amaya
+%setup -q -c
+%patch0 -p0
+%patch1 -p0
 
 %build
-mkdir -p gtk-build
-cd gtk-build
-#../configure --enable-bookmarks --enable-system-redland --prefix=$RPM_BUILD_ROOT%_libdir --exec-prefix=$RPM_BUILD_ROOT/%_prefix --libdir=%_libdir
+mkdir -p Amaya/gtk-build
+pushd Amaya/gtk-build >/dev/null
+
+export CXXFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS"
 ../configure --enable-bookmarks \
-             --prefix=$RPM_BUILD_ROOT%_libdir \
-             --exec-prefix=$RPM_BUILD_ROOT/%_prefix \
+             --prefix=%_libdir \
+	     --bindir=%_bindir \
+	     --exec_prefix=%_exec_prefix \
              --libdir=%_libdir \
              --with-gtk
 make
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%_datadir/pixmaps
-cd gtk-build
-make install
-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
+
+pushd Amaya/gtk-build >/dev/null
+make prefix=${RPM_BUILD_ROOT}%{_libdir} \
+ bindir=${RPM_BUILD_ROOT}%{_bindir} \
+ exec_prefix=${RPM_BUILD_ROOT}%{_exec_prefix} \
+ libdir=${RPM_BUILD_ROOT}%{_libdir} \
+ install
+
+# fix up symlinks
+pushd ${RPM_BUILD_ROOT}%{_bindir} >/dev/null
+rm -f amaya*
+ln -s %{_libdir}/Amaya-*/gtk/bin/amaya amaya-gtk
+ln -s amaya-gtk amaya
+popd >/dev/null
 
 # Menu entry
 cat << EOF > %{name}.desktop
@@ -67,14 +84,14 @@
        %{name}.desktop
 
 install -p -m 644 %SOURCE1 $RPM_BUILD_ROOT%_datadir/pixmaps/
-
+popd >/dev/null
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc README* amaya/COPYRIGHT*
+%doc Amaya/README* Amaya/amaya/COPYRIGHT*
 %_libdir/Amaya*
 %_bindir/%name
 %_bindir/%name-gtk
@@ -82,6 +99,15 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon May 30 2005 Ralf Corsepius <ralf[AT]links2linux.de>
+- Fixup symlinks.
+- Acknowledge RPM_OPT_FLAGS.
+- Remove -D__cplusplus from configure.
+- Cleanup installation dirs.
+
+* Mon May 30 2005 Ralf Corsepius <ralf[AT]links2linux.de>
+- Build inside of RPM_BUILD_DIR/%%name-%%version.
+
 * Sun May 08 2005 Aurelien Bompard <gauret[AT]free.fr> 9.1-1%{?dist}
 - version 9.1
 - use disttag