xml-cppdom-checkins

[xml-cppdom-checkins] SF.net SVN: xml-cppdom: [562] branches/0.6/cppdom.spec

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

Revision: 562
          http://svn.sourceforge.net/xml-cppdom/?rev=562&view=rev
Author:   patrickh
Date:     2006-11-08 06:39:57 -0800 (Wed, 08 Nov 2006)

Log Message:
-----------
Incorporate the Linux distribution name into the release version
(optionally).

Modified Paths:
--------------
    branches/0.6/cppdom.spec

Modified: branches/0.6/cppdom.spec
===================================================================
--- branches/0.6/cppdom.spec	2006-11-07 23:32:35 UTC (rev 561)
+++ branches/0.6/cppdom.spec	2006-11-08 14:39:57 UTC (rev 562)
@@ -1,7 +1,7 @@
 # Spec file for cppdom.
 %define name    cppdom
 %define version 0.6.5
-%define release 1
+%define release 1%{?dist}
 
 Name: %{name}
 Summary: A C++ based XML loader and writer with an internal DOM representation.


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

[xml-cppdom-checkins] SF.net SVN: xml-cppdom: [567] branches/0.6/cppdom.spec

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

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

Log Message:
-----------
Fixed bad paths in cppdom-config and in the .fpc file. The build directory
no longer shows up when querying CppDOM flags.

Modified Paths:
--------------
    branches/0.6/cppdom.spec

Modified: branches/0.6/cppdom.spec
===================================================================
--- branches/0.6/cppdom.spec	2006-11-09 14:44:17 UTC (rev 566)
+++ branches/0.6/cppdom.spec	2006-11-09 22:33:48 UTC (rev 567)
@@ -43,7 +43,7 @@
 LINKFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS
 export LINKFLAGS
-scons prefix=%{buildroot}/usr libdir=$lib_subdir optimize=yes build_test=no
+scons prefix=%{buildroot}%{_prefix} libdir=$lib_subdir optimize=yes build_test=no
 
 %install
 [ -z %{buildroot} ] || rm -rf %{buildroot}
@@ -54,6 +54,8 @@
 export CXXFLAGS
 export LINKFLAGS
 scons prefix=%{buildroot}%{_prefix} libdir=$lib_subdir 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
 find %{buildroot}%{_prefix} -name .sconsign -exec rm {} \;
 
@@ -77,8 +79,12 @@
 %{_includedir}/cppdom/*.h
 %{_includedir}/cppdom/ext/*.h
 %{_libdir}/*.a
+%{_libdir}/flagpoll
 
 %changelog
+* Thu Nov 09 2006 Patrick Hartling
+- Fixed bad paths in the .fpc file and in cppdom-config
+
 * Wed Apr 12 2006 Patrick Hartling
 - Updated to handle multi-architecture installations.
 


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