From: <pat...@us...> - 2006-11-09 22:35:34
|
Revision: 569 http://svn.sourceforge.net/xml-cppdom/?rev=569&view=rev Author: patrickh Date: 2006-11-09 14:35:27 -0800 (Thu, 09 Nov 2006) Log Message: ----------- Catch up with the current version. Modified Paths: -------------- trunk/cppdom.spec Modified: trunk/cppdom.spec =================================================================== --- trunk/cppdom.spec 2006-11-09 22:34:51 UTC (rev 568) +++ trunk/cppdom.spec 2006-11-09 22:35:27 UTC (rev 569) @@ -1,6 +1,6 @@ # Spec file for cppdom. %define name cppdom -%define version 0.7.0 +%define version 0.7.7 %define release 1 Name: %{name} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pat...@us...> - 2006-11-09 22:51:17
|
Revision: 570 http://svn.sourceforge.net/xml-cppdom/?rev=570&view=rev Author: patrickh Date: 2006-11-09 14:51:16 -0800 (Thu, 09 Nov 2006) Log Message: ----------- MF0_6 [rev 568]: Fixed bad paths in cppdom-config and in the .fpc file. The build directory no longer shows up when querying CppDOM flags. Revision Links: -------------- http://svn.sourceforge.net/xml-cppdom/?rev=568&view=rev Modified Paths: -------------- trunk/cppdom.spec Modified: trunk/cppdom.spec =================================================================== --- trunk/cppdom.spec 2006-11-09 22:35:27 UTC (rev 569) +++ trunk/cppdom.spec 2006-11-09 22:51:16 UTC (rev 570) @@ -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. |
From: <pat...@us...> - 2006-11-09 22:55:55
|
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. |
From: <pat...@us...> - 2006-11-09 22:56:33
|
Revision: 572 http://svn.sourceforge.net/xml-cppdom/?rev=572&view=rev Author: patrickh Date: 2006-11-09 14:56:31 -0800 (Thu, 09 Nov 2006) Log Message: ----------- Add a change log entry for the last revision. Modified Paths: -------------- trunk/cppdom.spec Modified: trunk/cppdom.spec =================================================================== --- trunk/cppdom.spec 2006-11-09 22:55:46 UTC (rev 571) +++ trunk/cppdom.spec 2006-11-09 22:56:31 UTC (rev 572) @@ -93,6 +93,9 @@ %changelog * Thu Nov 09 2006 Patrick Hartling +- Updated for the new world order + +* Thu Nov 09 2006 Patrick Hartling - Fixed bad paths in the .fpc file and in cppdom-config * Wed Apr 12 2006 Patrick Hartling This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pat...@us...> - 2007-06-26 14:11:52
|
Revision: 598 http://svn.sourceforge.net/xml-cppdom/?rev=598&view=rev Author: patrickh Date: 2007-06-26 07:11:54 -0700 (Tue, 26 Jun 2007) Log Message: ----------- Added flagpoll >= 0.8.1 as a requirement for cppdom-devel. Removed "Obsoletes" and "Conflicts" directives since multiple CppDOM versions can now be installed in parallel. Modified Paths: -------------- trunk/cppdom.spec Modified: trunk/cppdom.spec =================================================================== --- trunk/cppdom.spec 2007-06-26 14:01:24 UTC (rev 597) +++ trunk/cppdom.spec 2007-06-26 14:11:54 UTC (rev 598) @@ -1,7 +1,7 @@ # Spec file for cppdom. %define name cppdom %define version 0.7.7 -%define release 1 +%define release 2 Name: %{name} Summary: A C++ based XML loader and writer with an internal DOM representation. @@ -15,7 +15,6 @@ BuildPrereq: scons >= 0.96.1 Vendor: xml-cppdom Project Provides: cppdom = %{version}-%{release} -Obsoletes: cppdom < %{version}-%{release} %description CppDOM is a C++ based XML loader and writer with an internal DOM @@ -28,7 +27,7 @@ Group: Development/C++ Requires: cppdom = %{version}-%{release} Provides: cppdom-devel = %{version}-%{release} -Conflicts: cppdom-devel < %{version}-%{release} +Requires: flagpoll >= 0.8.1 %description devel The header files and libraries needed for developing programs using CppDOM. @@ -92,16 +91,21 @@ %{_libdir}/flagpoll %changelog -* Thu Nov 09 2006 Patrick Hartling +* Tue Jun 26 2007 Patrick Hartling <pa...@in...> 0.7.7-2 +- Added flagpoll as a requirement for cppdom-devel +- Removed Conflicts directives since this can be installed in parallel with + other CppDOM releases. + +* Thu Nov 09 2006 Patrick Hartling <pa...@in...> - Updated for the new world order -* Thu Nov 09 2006 Patrick Hartling +* Thu Nov 09 2006 Patrick Hartling <pa...@in...> - Fixed bad paths in the .fpc file and in cppdom-config -* Wed Apr 12 2006 Patrick Hartling +* Wed Apr 12 2006 Patrick Hartling <pa...@in...> - Updated to handle multi-architecture installations. -* Mon Jun 06 2005 Aron Bierbaum +* Mon Jun 06 2005 Aron Bierbaum <ar...@in...> - Total rewrite * Thu Mar 13 2003 Allen Bierbaum This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pat...@us...> - 2007-06-26 15:31:05
|
Revision: 601 http://svn.sourceforge.net/xml-cppdom/?rev=601&view=rev Author: patrickh Date: 2007-06-26 08:31:01 -0700 (Tue, 26 Jun 2007) Log Message: ----------- Allow the Linux distribution name to factor into the release identifier. Modified Paths: -------------- trunk/cppdom.spec Modified: trunk/cppdom.spec =================================================================== --- trunk/cppdom.spec 2007-06-26 15:23:34 UTC (rev 600) +++ trunk/cppdom.spec 2007-06-26 15:31:01 UTC (rev 601) @@ -6,7 +6,7 @@ Name: %{name} Summary: A C++ based XML loader and writer with an internal DOM representation. Version: %{version} -Release: %{release} +Release: %{release}%{?dist} Source: %{name}-%{version}.tar.gz URL: http://www.sf.net/projects/xml-cppdom/ Group: Development/Libraries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pat...@us...> - 2007-06-26 16:16:17
|
Revision: 602 http://svn.sourceforge.net/xml-cppdom/?rev=602&view=rev Author: patrickh Date: 2007-06-26 09:15:29 -0700 (Tue, 26 Jun 2007) Log Message: ----------- Include the rendered API documentation in the new cppdom-doc RPM. Modified Paths: -------------- trunk/cppdom.spec Modified: trunk/cppdom.spec =================================================================== --- trunk/cppdom.spec 2007-06-26 15:31:01 UTC (rev 601) +++ trunk/cppdom.spec 2007-06-26 16:15:29 UTC (rev 602) @@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot License: LGPL BuildPrereq: scons >= 0.96.1 +BuildPrereq: doxygen Vendor: xml-cppdom Project Provides: cppdom = %{version}-%{release} @@ -32,6 +33,13 @@ %description devel The header files and libraries needed for developing programs using CppDOM. +%package doc +Summary: CppDOM documentation +Group: Development/C++ + +%description doc +CppDOM API documentation in HTML form. + %prep rm -rf %{buildroot} %setup -q @@ -50,6 +58,8 @@ export CXXFLAGS export LINKFLAGS scons prefix=%{buildroot}%{_prefix} var_arch=%{arch} var_type=optimized build_test=no +cd doc && doxygen cppdom.doxy +cd .. %install [ -z %{buildroot} ] || rm -rf %{buildroot} @@ -60,10 +70,15 @@ export CXXFLAGS export LINKFLAGS scons prefix=%{buildroot}%{_prefix} var_arch=%{arch} var_type=optimized build_test=no install +mkdir -p %{buildroot}%{_docdir}/cppdom-%{version} +mv doc/html %{buildroot}%{_docdir}/cppdom-%{version} 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 {} \; +for f in README AUTHORS ChangeLog COPYING ; do + cp $f %{buildroot}%{_docdir}/cppdom-%{version} +done %clean [ -z %{buildroot} ] || rm -rf %{buildroot} @@ -77,7 +92,11 @@ %files %defattr(-, root, root) %{_libdir}/*.so -%doc README AUTHORS ChangeLog COPYING +%dir %{_docdir}/cppdom-%{version}/ +%doc %{_docdir}/cppdom-%{version}/README +%doc %{_docdir}/cppdom-%{version}/AUTHORS +%doc %{_docdir}/cppdom-%{version}/ChangeLog +%doc %{_docdir}/cppdom-%{version}/COPYING %files devel %defattr(-, root, root) @@ -90,9 +109,14 @@ %{_libdir}/*.a %{_libdir}/flagpoll +%files doc +%dir %{_docdir}/cppdom-%{version}/ +%doc %{_docdir}/cppdom-%{version}/html + %changelog * Tue Jun 26 2007 Patrick Hartling <pa...@in...> 0.7.8-1 - Updated to version 0.7.8. +- Include rendered API documentation in the new cppdom-doc package. * Tue Jun 26 2007 Patrick Hartling <pa...@in...> 0.7.7-2 - Added flagpoll as a requirement for cppdom-devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pat...@us...> - 2007-06-27 15:29:49
|
Revision: 606 http://svn.sourceforge.net/xml-cppdom/?rev=606&view=rev Author: patrickh Date: 2007-06-27 08:29:51 -0700 (Wed, 27 Jun 2007) Log Message: ----------- Package cppdom-config separately so that its presence does not interfere with having multiple cppdom-devel packages installed in parallel. Modified Paths: -------------- trunk/cppdom.spec Modified: trunk/cppdom.spec =================================================================== --- trunk/cppdom.spec 2007-06-26 18:17:23 UTC (rev 605) +++ trunk/cppdom.spec 2007-06-27 15:29:51 UTC (rev 606) @@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot License: LGPL BuildPrereq: scons >= 0.96.1 -BuildPrereq: doxygen Vendor: xml-cppdom Project Provides: cppdom = %{version}-%{release} @@ -33,9 +32,23 @@ %description devel The header files and libraries needed for developing programs using CppDOM. +%package config +Summary: The cppdom-config script that calls flagpoll +Group: Development/C++ +Requires: cppdom-devel +Requires: flagpoll >= 0.8.1 +Requires: python + +%description config +The cppdom-config Python script that provides backwards compability for older +packages not using Flagpoll for getting compiler options necessary for +building against CppDOM. + %package doc Summary: CppDOM documentation Group: Development/C++ +BuildPrereq: doxygen +BuildPrereq: graphviz %description doc CppDOM API documentation in HTML form. @@ -109,7 +122,12 @@ %{_libdir}/*.a %{_libdir}/flagpoll +%files config +%defattr(-, root, root) +%{_bindir}/cppdom-config + %files doc +%defattr(-, root, root) %dir %{_docdir}/cppdom-%{version}/ %doc %{_docdir}/cppdom-%{version}/html @@ -117,6 +135,8 @@ * Tue Jun 26 2007 Patrick Hartling <pa...@in...> 0.7.8-1 - Updated to version 0.7.8. - Include rendered API documentation in the new cppdom-doc package. +- Package cppdom-config separately so that multiple versions of the cppdom + package can be installed in parallel. * Tue Jun 26 2007 Patrick Hartling <pa...@in...> 0.7.7-2 - Added flagpoll as a requirement for cppdom-devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pat...@us...> - 2007-06-27 21:05:11
|
Revision: 609 http://svn.sourceforge.net/xml-cppdom/?rev=609&view=rev Author: patrickh Date: 2007-06-27 14:05:13 -0700 (Wed, 27 Jun 2007) Log Message: ----------- cppdom-config is not supposed to be part of cppdom-devel. Modified Paths: -------------- trunk/cppdom.spec Modified: trunk/cppdom.spec =================================================================== --- trunk/cppdom.spec 2007-06-27 16:43:00 UTC (rev 608) +++ trunk/cppdom.spec 2007-06-27 21:05:13 UTC (rev 609) @@ -1,7 +1,7 @@ # Spec file for cppdom. %define name cppdom %define version 0.7.8 -%define release 1 +%define release 2 Name: %{name} Summary: A C++ based XML loader and writer with an internal DOM representation. @@ -113,7 +113,6 @@ %files devel %defattr(-, root, root) -%{_bindir}/cppdom-config %dir %{_includedir}/cppdom-%{version}/ %dir %{_includedir}/cppdom-%{version}/cppdom/ %{_includedir}/cppdom-%{version}/cppdom/*.h @@ -132,6 +131,9 @@ %doc %{_docdir}/cppdom-%{version}/html %changelog +* Wed Jun 27 2007 Patrick Hartling <pa...@in...> 0.7.8-2 +- Removed cppdom-config from the cppdom-devel package. + * Tue Jun 26 2007 Patrick Hartling <pa...@in...> 0.7.8-1 - Updated to version 0.7.8. - Include rendered API documentation in the new cppdom-doc package. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |