[xml-cppdom-checkins] SF.net SVN: xml-cppdom: [571] trunk/cppdom.spec

[<pat...@us...>]

Revision: 571
          http://svn.sourceforge.net/xml-cppdom/?rev=571&view=rev
Author:   patrickh
Date:     2006-11-09 14:55:46 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Get this working again given all the changes to how CppDOM is installed.

Modified Paths:
--------------
    trunk/cppdom.spec

Modified: trunk/cppdom.spec
===================================================================
--- trunk/cppdom.spec	2006-11-09 22:51:16 UTC (rev 570)
+++ trunk/cppdom.spec	2006-11-09 22:55:46 UTC (rev 571)
@@ -37,13 +37,20 @@
 rm -rf %{buildroot}
 %setup -q
 
+%ifarch x86_64
+%define arch x64
+%else
+%ifarch i386 i486 i586 i686
+%define arch ia32
+%endif
+%endif
+
 %build
-lib_subdir=`echo %{_libdir} | sed -e "s|%{_prefix}/\(.*\)|\1|"`
 CXXFLAGS="$RPM_OPT_FLAGS"
 LINKFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS
 export LINKFLAGS
-scons prefix=%{buildroot}%{_prefix} libdir=$lib_subdir optimize=yes build_test=no
+scons prefix=%{buildroot}%{_prefix} var_arch=%{arch} var_type=optimized build_test=no
 
 %install
 [ -z %{buildroot} ] || rm -rf %{buildroot}
@@ -53,7 +60,7 @@
 LINKFLAGS="$RPM_OPT_FLAGS" 
 export CXXFLAGS
 export LINKFLAGS
-scons prefix=%{buildroot}%{_prefix} libdir=$lib_subdir build_test=no install
+scons prefix=%{buildroot}%{_prefix} var_arch=%{arch} var_type=optimized build_test=no install
 sed -i -e 's|%{buildroot}||g' %{buildroot}%{_libdir}/flagpoll/*.fpc
 sed -i -e 's|%{buildroot}||g' %{buildroot}%{_bindir}/cppdom-config
 # Remove all stupid scons temp files
@@ -76,8 +83,11 @@
 %files devel
 %defattr(-, root, root)
 %{_bindir}/cppdom-config
-%{_includedir}/cppdom/*.h
-%{_includedir}/cppdom/ext/*.h
+%dir %{_includedir}/cppdom-%{version}/
+%dir %{_includedir}/cppdom-%{version}/cppdom/
+%{_includedir}/cppdom-%{version}/cppdom/*.h
+%dir %{_includedir}/cppdom-%{version}/cppdom/ext/
+%{_includedir}/cppdom-%{version}/cppdom/ext/*.h
 %{_libdir}/*.a
 %{_libdir}/flagpoll
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.