rpms/amaya/devel amaya.spec,1.8,1.9

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/extras/rpms/amaya/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17192

Modified Files:
	amaya.spec 
Log Message:
- Acknowledge RPM_OPT_FLAGS.
- Remove -D__cplusplus from configure.
- Cleanup installation dirs.


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- amaya.spec	30 May 2005 06:57:19 -0000	1.8
+++ amaya.spec	30 May 2005 10:14:41 -0000	1.9
@@ -6,6 +6,8 @@
 Group:		Applications/Internet
 Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.1.tgz
 Source1:	amaya.png
+Patch0:		amaya-9.1-configure.diff
+
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,15 +28,18 @@
 
 %prep
 %setup -q -c -T -n %{name}-%{version} -a 0
+%patch0 -p0
 
 %build
 mkdir -p Amaya/gtk-build
 pushd Amaya/gtk-build >/dev/null
 
-#../configure --enable-bookmarks --enable-system-redland --prefix=$RPM_BUILD_ROOT%_libdir --exec-prefix=$RPM_BUILD_ROOT/%_prefix --libdir=%_libdir
+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
@@ -45,9 +50,14 @@
 mkdir -p $RPM_BUILD_ROOT%_datadir/pixmaps
 
 pushd Amaya/gtk-build >/dev/null
-make install
+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
 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
 
@@ -86,6 +96,11 @@
 
 %changelog
 * Mon May 30 2005 Ralf Corsepius <ralf[AT]links2linux.de>
+- 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}