From: <den...@us...> - 2009-03-25 23:27:08
|
Revision: 192 http://rmol.svn.sourceforge.net/rmol/?rev=192&view=rev Author: denis_arnaud Date: 2009-03-25 23:26:57 +0000 (Wed, 25 Mar 2009) Log Message: ----------- [Packaging] Fixed the RPM specification file according to https://bugzilla.redhat.com/show_bug.cgi?id=489233 Modified Paths: -------------- trunk/rmol/rmol/command/FileMgr.cpp trunk/rmol/rmol/service/RMOL_Service.cpp trunk/rmol/rmol.spec.in Modified: trunk/rmol/rmol/command/FileMgr.cpp =================================================================== --- trunk/rmol/rmol/command/FileMgr.cpp 2009-03-25 17:56:05 UTC (rev 191) +++ trunk/rmol/rmol/command/FileMgr.cpp 2009-03-25 23:26:57 UTC (rev 192) @@ -80,8 +80,8 @@ << "\"" << std::endl; } else { if (i == 2) { - const Demand& aDemand = - FacDemand::instance().create (aDistribParams, aYieldRange); + //const Demand& aDemand = + // FacDemand::instance().create (aDistribParams, aYieldRange); Bucket& aBucket = FacBucket::instance().create (aYieldRange); FacBucketHolder::instance().addBucket (ioBucketHolder, aBucket); } Modified: trunk/rmol/rmol/service/RMOL_Service.cpp =================================================================== --- trunk/rmol/rmol/service/RMOL_Service.cpp 2009-03-25 17:56:05 UTC (rev 191) +++ trunk/rmol/rmol/service/RMOL_Service.cpp 2009-03-25 23:26:57 UTC (rev 192) @@ -154,10 +154,10 @@ // std::cout << "Bid-Price Vector (BPV): "; unsigned int size = lBidPriceVector.size(); - for (unsigned int i = 0; i < size; ++i) { - const double bidPrice = lBidPriceVector.at(i); + // for (unsigned int i = 0; i < size; ++i) { + // const double bidPrice = lBidPriceVector.at(i); // std::cout << std::fixed << std::setprecision (2) << bidPrice << " "; - } + // } // std::cout << std::endl; } Modified: trunk/rmol/rmol.spec.in =================================================================== --- trunk/rmol/rmol.spec.in 2009-03-25 17:56:05 UTC (rev 191) +++ trunk/rmol/rmol.spec.in 2009-03-25 23:26:57 UTC (rev 192) @@ -70,7 +70,6 @@ %configure --disable-static make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -79,9 +78,9 @@ rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la -chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico +# chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico rm -rf %{mydocs} && mkdir -p %{mydocs} -mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/* %{mydocs} +mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs} %clean rm -rf $RPM_BUILD_ROOT @@ -107,9 +106,7 @@ %files devel %defattr(-,root,root,-) -%dir %{_includedir}/%{name} -%{_includedir}/%{name}/@PACKAGE_NAME@_Service.hpp -%{_includedir}/%{name}/@PACKAGE_NAME@_Types.hpp +%{_includedir}/%{name} %{_bindir}/%{name}-config %{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/%{name}.pc @@ -119,11 +116,12 @@ %files doc %defattr(-,root,root,-) -%doc %{mydocs}/* -%doc AUTHORS ChangeLog COPYING NEWS README doc/html +%doc %{mydocs}/html +%doc AUTHORS ChangeLog COPYING NEWS README + %changelog -* Sun Mar 8 2009 Denis Arnaud <den...@m4...> 0.19.0-1 +* Sun Mar 25 2009 Denis Arnaud <den...@m4...> 0.19.0-1 - RPM release for Fedora 10 * Wed Mar 4 2009 Denis Arnaud <den...@m4...> 0.18.0-1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |