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

[Ralf Corsépius (corsepiu)]

Author: corsepiu

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

Modified Files:
	amaya.spec 
Log Message:
Build inside of RPM_BUILD_DIR/%%name-%%version.


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- amaya.spec	29 May 2005 13:45:17 -0000	1.7
+++ amaya.spec	30 May 2005 06:57:19 -0000	1.8
@@ -25,11 +25,12 @@
 draft standards for HTML/XHTML.
 
 %prep
-%setup -q -n Amaya
+%setup -q -c -T -n %{name}-%{version} -a 0
 
 %build
-mkdir -p gtk-build
-cd gtk-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
 ../configure --enable-bookmarks \
              --prefix=$RPM_BUILD_ROOT%_libdir \
@@ -37,11 +38,13 @@
              --libdir=%_libdir \
              --with-gtk
 make
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%_datadir/pixmaps
-cd gtk-build
+
+pushd Amaya/gtk-build >/dev/null
 make install
 rm -f $RPM_BUILD_ROOT%{_bindir}/amaya*
 mv $RPM_BUILD_ROOT%{_libdir}/Amaya-* $RPM_BUILD_ROOT%{_libdir}/Amaya
@@ -67,14 +70,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 +85,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* 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