[gnu-smalltalk/el6: 19/20] Merge branch 'master' into el6

[Jochen Schmitt]

commit e7043d6d18b3f0fe9f3763f8b5d351d0c67344ee
Merge: 8fdf27f 60a72df
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Tue Jun 21 18:07:33 2011 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	gnu-smalltalk.spec

 gnu-smalltalk.desktop   |   10 +
 gnu-smalltalk.spec      |  182 ++-
 gnu-smalltalk.svg       |  592 +++++++
 gst-3.1-am.patch        |   12 -
 gst-3.1-tst.patch       |   12 -
 gst-3.2.3-ltdl.patch    |   12 +
 gst-3.2.4-am.patch      |   12 +
 gst-retcode-tests.patch | 4088 -----------------------------------------------
 sources                 |    2 +-
 9 files changed, 760 insertions(+), 4162 deletions(-)
---
diff --cc gnu-smalltalk.spec
index dd1f12a,d70b60c..b3054d7
--- a/gnu-smalltalk.spec
+++ b/gnu-smalltalk.spec
@@@ -180,11 -222,52 +222,53 @@@ f
  %{_includedir}/gst.h   
  %{_includedir}/gstpub.h 
  
- %files emacs
+ %files -n emacs-gnu-smalltalk
+ %defattr(-,root,root,-)
+ %{_emacs_sitelispdir}/gnu-smalltalk/*.elc
+ %{_emacs_sitestartdir}/*.elc
+ 
+ %files -n emacs-gnu-smalltalk-el
  %defattr(-,root,root,-)
- %{_datadir}/emacs/site-lisp/*
+ %{_emacs_sitelispdir}/gnu-smalltalk/*.el
+ %{_emacs_sitestartdir}/*.el
  
  %changelog
+ * Wed Mar 23 2011 Jochen Schmitt <Jochen herr-schmitt de> 3.2.4-1
+ - New upstream release
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Sat Dec 18 2010 Jochen Schmitt <JOchen herr-schmitt de> 3.2.3-1
+ - New upstream release
+ 
+ * Sun Nov 28 2010 Rex Dieter <rdieter at fedoraproject.org> 3.2.2-2 
+ - rebuild (libsigsegv)
+ 
+ * Sun Aug  1 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.2.2-1
+ - New upstream release
+ 
+ * Fri Jun 25 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.2-6
+ - gnu-smalltalk seems to be smp compilant now
+ 
+ * Thu Jun 24 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.2-5
+ - Reorganisation of the gnu-smalltalk emacs packages
+ 
+ * Thu Jun 24 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.2-4
+ - Add desktop file for gst-browser
+ 
+ * Wed Jun 23 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.2-3
+ - Put emacs files in a subdirectory
+ - Using standard emacs rpm macros
+ - Reformatting SPEC file
+ 
+ * Wed Jun 23 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.2-2
+ - Rebuild
+ 
+ * Sun May  2 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.2-1
+ - New upstream release
+ 
++>>>>>>> master
  * Thu Mar 11 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.1-8
  - Remove embedded ltdl (#563974, CVE-2009-3736)
  - Rebuild agains new gdbm (so namber was bumped)