yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2735
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Mon 2011-02-14 08:41:53 +0100
message:
  1. Fixed Tutorial link in documentation (taken from https://www.yade-dem.org/sphinx/tutorial.html)
  2. Some small fixes in documentation
  3. Changes in spec-file for RPM-packaging
added:
  doc/sphinx/tutorial.rst
modified:
  doc/sphinx/prog.rst
  doc/sphinx/templates/index.html
  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/prog.rst'
--- doc/sphinx/prog.rst	2010-12-20 22:35:16 +0000
+++ doc/sphinx/prog.rst	2011-02-14 07:41:53 +0000
@@ -64,11 +64,11 @@
 boost
 	`boost <http://www.boost.org>`__ is a large collection of peer-reviewed c++ libraries. Yade currently uses thread, date_time, filesystem, iostreams, regex, serialization, program_options, foreach, python; typically the whole boost bundle will be installed. If you need functionality from other modules, you can make presence of that module mandatory. Only be careful about relying on very new features; due to range of systems yade is or might be used on, it is better to be moderately conservative (read: roughly 3 years backwards compatibility).
 python
-	`python <http://www.python.org`__ is the scripting language used by yade. Besides [boost::python]_, yade further requires
+	`python <http://www.python.org>`__ is the scripting language used by yade. Besides [boost::python]_, yade further requires
 
 	* `ipython <http://www.ipython.org>`__ (terminal interaction)
 	* `matplotlib <http://matplotlib.sf.net>`__ (plotting)
-	* `numpy <http://www.numpy.org`__ (matlab-like numerical functionality and accessing numpy arrays from ``c``/``c++`` efficiently)
+	* `numpy <http://www.numpy.org>`__ (matlab-like numerical functionality and accessing numpy arrays from ``c``/``c++`` efficiently)
 
 .. _optional-libraries:
 Optional libraries (features)

=== modified file 'doc/sphinx/templates/index.html'
--- doc/sphinx/templates/index.html	2011-02-12 17:55:03 +0000
+++ doc/sphinx/templates/index.html	2011-02-14 07:41:53 +0000
@@ -5,7 +5,7 @@
   <p>
 	Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method. The computation parts are written in c++ using flexible object model, allowing independent implementation of new alogrithms and interfaces. Python is used for rapid and concise scene construction, simulation control, postprocessing and debugging.
   <p>
-   Yade is located at <a href="https://www.yade-dem.org";>www.yade-dem.org</a>, which contains <a href="https://www.yade-dem.org/sphinx/";>this documentation</a> and <a href="https://www.yade-dem.org/wiki/";>wiki</a>. Development is kindly hosted at <a href="http://www.launchpad.net/yade";>launchpad</a>; it is used for <a href="http://code.launchpad.net/yade";>source code</a>, <a href="http://bugs.launchpad.net/yade";>bug tracking</a>, <a href="http://blueprints.launchpad.net/yade";>planning</a>, <a href="https://launchpad.net/~yade-users/+archive/ppa";>package downloads</a> and more.
+   Yade is located at <a href="https://www.yade-dem.org";>www.yade-dem.org</a>, which contains <a href="https://www.yade-dem.org/doc/";>this documentation</a> and <a href="https://www.yade-dem.org/wiki/";>wiki</a>. Development is kindly hosted at <a href="http://www.launchpad.net/yade";>launchpad</a>; it is used for <a href="http://code.launchpad.net/yade";>source code</a>, <a href="http://bugs.launchpad.net/yade";>bug tracking</a>, <a href="http://blueprints.launchpad.net/yade";>planning</a>, <a href="https://launchpad.net/~yade-users/+archive/ppa";>package downloads</a> and more.
   </p>
   <p>
    Please make sure you read the <a href="{{ pathto("citing") }}">"Acknowledging Yade"</a> section if you plan to cite Yade in publications.

=== added file 'doc/sphinx/tutorial.rst'
--- doc/sphinx/tutorial.rst	1970-01-01 00:00:00 +0000
+++ doc/sphinx/tutorial.rst	2011-02-14 07:41:53 +0000
@@ -0,0 +1,24 @@
+
+Tutorial
+=============
+
+This tutorial originated as handout for a course held at `Technische Universität Dresden <http://www.tu-dresden.de/>`_ / `Fakultät Bauingenieurwesen <http://www.tu-dresden.de/biw/>`_ / `Institut für Geotechnik <http://www.tu-dresden.de/biw/geotechnik/>`_ in Jaunary 2011. The focus was to give quick and rather practical introduction to people without prior modeling experience, but with knowledge of mechanics. Some computer literacy was assumed, though basics are reviewed in the :doc:`Hands-on section <tutorial-hands-on>`.
+
+The course did not in reality follow this document, but was based on interactive writing and commenting simple :doc:`Examples <tutorial-examples>`, which were mostly suggested by participants; many thanks to them for their ideas and suggestions.
+
+A few minor bugs were discovered during the course. They were all fixed in rev. 2640 of Yade which is therefore the minimum recommended version to run the examples (notably, 0.60 will not work).
+
+.. toctree::
+  :maxdepth: 2
+  
+  tutorial-introduction.rst
+  
+  tutorial-hands-on.rst
+  
+  tutorial-data-mining.rst
+  
+  tutorial-geo.rst
+  
+  tutorial-advanced.rst
+  
+  tutorial-examples.rst

=== modified file 'scripts/RPM_packaging/yade.spec'
--- scripts/RPM_packaging/yade.spec	2011-02-12 16:52:43 +0000
+++ scripts/RPM_packaging/yade.spec	2011-02-14 07:41:53 +0000
@@ -7,6 +7,7 @@
 License:        GPLv2
 URL:            https://launchpad.net/yade
 Source0:        http://launchpad.net/yade/trunk/0.60/+download/yade-0.60.1.tar.bz2
+patch0:         exclude-rpath-patch-060
 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
@@ -26,13 +27,21 @@
 
 %prep
 %setup -q
+%patch0
  
 %build
 
 %install
 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=''
+scons profile=rpm PREFIX=%{buildroot}-dbg/usr runtimePREFIX=/usr buildPrefix=rpm brief=0 chunkSize=5 jobs=1 features=vtk,gts,opengl,openmp,qt4 optimize=1 debug=0 variant=''
+
+scons profile=rpm PREFIX=%{buildroot}/usr brief=0 chunkSize=5 jobs=1 features=vtk,gts,opengl,openmp,qt4 optimize=1 debug=0 variant=''
+
+rm %{buildroot}/usr/lib/%{name}/lib/lib_gts__python-module.so
+cp %{buildroot}/usr/lib/%{name}/py/gts/_gts.so %{buildroot}/usr/lib/%{name}/lib/lib_gts__python-module.so
+
+
 
 %clean
 rm -rf %{buildroot}
@@ -44,7 +53,5 @@
 %{_bindir}/*
 %{_libdir}/%{name}/*
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 %changelog