yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2731
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Sat 2011-02-12 17:52:43 +0100
message:
  1. Updated installation instructions
  2. Updated spec-file for RPM-packaging
modified:
  doc/sphinx/installation.rst
  scripts/RPM_packaging/yade.spec


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'doc/sphinx/installation.rst'
--- doc/sphinx/installation.rst	2011-01-24 09:01:38 +0000
+++ doc/sphinx/installation.rst	2011-02-12 16:52:43 +0000
@@ -62,7 +62,7 @@
 	python-matplotlib libsqlite3-dev python-numeric python-tk gnuplot doxygen \
 	libgts-dev python-pygraphviz libvtk5-dev python-scientific bzr libeigen2-dev \
 	binutils-gold python-xlib python-qt4 pyqt4-dev-tools \
-	libqglviewer-qt4-dev python-imaging libjs-jquery
+	libqglviewer-qt4-dev python-imaging libjs-jquery python-sphinx
 
 command line (cut&paste to the terminal under root privileges) for Fedora (not good tested yet!)::
 
@@ -71,7 +71,7 @@
 	log4cxx log4cxx-devel python-devel boost-python ipython python-matplotlib \
 	sqlite-devel python-numeric ScientificPython-tk gnuplot doxygen gts-devel \
 	graphviz-python vtk-devel ScientificPython bzr eigen2-devel libQGLViewer-devel \
-	loki-lib-devel python-xlib PyQt4 PyQt4-devel python-imaging 
+	loki-lib-devel python-xlib PyQt4 PyQt4-devel python-imaging python-sphinx python-bibtex
 
 
 Compilation

=== modified file 'scripts/RPM_packaging/yade.spec'
--- scripts/RPM_packaging/yade.spec	2010-12-08 13:40:48 +0000
+++ scripts/RPM_packaging/yade.spec	2011-02-12 16:52:43 +0000
@@ -1,16 +1,16 @@
 Name:           yade-0.60
-Version:        1.0  
+Version:        0.60  
 Release:        1%{?dist}
 Summary:        Platform for discrete element modeling
 
 Group:          Applications/Engineering
 License:        GPLv2
 URL:            https://launchpad.net/yade
-Source0:        http://launchpad.net/yade/trunk/0.60/+download/yade-0.60.tar.bz2
+Source0:        http://launchpad.net/yade/trunk/0.60/+download/yade-0.60.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  scons, freeglut-devel, boost-devel >= 1.35, boost-date-time >= 1.35, boost-filesystem >= 1.35, boost-thread >= 1.35, boost-regex >= 1.35, fakeroot, gcc, gcc-c++ > 4.0, boost-iostreams >= 1.35, log4cxx, log4cxx-devel, python-devel, boost-python >= 1.35, ipython, python-matplotlib, sqlite-devel, python-numeric, graphviz-python, vtk-devel, ScientificPython, bzr, eigen2-devel, libQGLViewer-devel, loki-lib-devel, python-xlib, PyQt4, PyQt4-devel, ScientificPython-tk, gnuplot, doxygen, gts-devel
-Requires:       ScientificPython, python-numeric, ipython, python-matplotlib, ScientificPython-tk, PyQt4, python-xlib, gnuplot
+Requires:       ScientificPython, python-numeric, ipython, ScientificPython-tk, PyQt4, gnuplot
 
 %description 
 Platform for discrete element modeling.
@@ -26,23 +26,25 @@
 
 %prep
 %setup -q
-
-
+ 
 %build
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
-scons profile=rpm PREFIX=$RPM_BUILD_ROOT/usr buildPrefix=buildRPM version=%{version} brief=0 chunkSize=5 jobs=1 features=vtk,gts,opengl,openmp,qt4 optimize=1 debug=0 
+rm -f scons.profile-rpm
+rm -rf %{buildroot}/*
+scons profile=rpm PREFIX=%{buildroot}/usr buildPrefix=%{_builddir} brief=0 chunkSize=5 jobs=1 features=vtk,gts,opengl,openmp,qt4 optimize=1 debug=0 variant=''
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+rm -rf %{_builddir}/*
 
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_libdir}/*
+%{_libdir}/%{name}/*
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %changelog