[repsnapper/f18: 8/8] Merge branch 'master' into f18

[Miro Hrončok]

commit 9bcd5108e225636c5da03e48f18e5b772cf72897
Merge: 482886a 0f0a5fe
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Tue Aug 27 21:27:09 2013 +0200

    Merge branch 'master' into f18
    
    Conflicts:
    	repsnapper.spec

 .gitignore                       |    1 +
 repsnapper-lmfit50.patch         |   19 +++++++++++++++++++
 repsnapper-use-system-libs.patch |    2 +-
 repsnapper.spec                  |   23 +++++++++++++++++++----
 sources                          |    2 +-
 5 files changed, 41 insertions(+), 6 deletions(-)
---
diff --cc repsnapper.spec
index b992fe0,78b704c..a87d350
--- a/repsnapper.spec
+++ b/repsnapper.spec
@@@ -22,7 -22,7 +22,8 @@@ URL:            https://github.com/tims
  Source0:        https://github.com/timschmidt/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
  Source1:        %{name}-softsurfer-copyright-email.txt
  Patch0:         %{name}-use-system-libs.patch
- Patch1:         %{name}-old-clipper.patch
+ Patch1:         %{name}-lmfit50.patch
++Patch2:         %{name}-old-clipper.patch
  BuildRequires:  amftools-devel
  BuildRequires:  cairomm-devel
  BuildRequires:  desktop-file-utils
@@@ -53,6 -53,6 +54,7 @@@ cp %SOURCE1 
  
  %patch0 -p1
  %patch1 -p1
++%patch2 -p1
  rm -rf libraries/{clipper,vmmlib,amf,lmfit,poly2tri}
  
  # Remove license information of bundled libs