[flexdock: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/flexdock

[Clément David]

commit 8d3a98eb385a7ccd1fdcc36ee0e310ef36b38318
Merge: fa02412 eee58d0
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date:   Mon Aug 12 11:59:02 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/flexdock
    
    Conflicts:
    	flexdock.spec

 flexdock.spec |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)
---
diff --cc flexdock.spec
index 67a4873,91a9022..a4064f4
--- a/flexdock.spec
+++ b/flexdock.spec
@@@ -1,27 -1,27 +1,27 @@@
- Name:           flexdock
+ Name:		    flexdock
 -Version:	    1.2.3
 -Release:	    2%{?dist}
 +Version:        1.2.4
- Release:        1%{?dist}
- Summary:        Docking framework for Java Swing GUI apps
++Release:	    1%{?dist}
+ Summary:	    Docking framework for Java Swing GUI apps
  
- Group:          Development/Libraries
+ Group:		    Development/Libraries
  
  #Licence is MIT on their website
- License:        MIT 
- URL:            http://forge.scilab.org/index.php/p/flexdock/
+ License:	    MIT 
+ URL:		    http://forge.scilab.org/index.php/p/flexdock/
  
- Source0:        http://forge.scilab.org/index.php/p/flexdock/downloads/get/%{name}-%{version}.tar.gz
+ Source0:	    http://forge.scilab.org/index.php/p/flexdock/downloads/get/%{name}-%{version}.tar.gz
  
  #Removes the java media framework from the demos to satisfy reqs
- Patch1:         flexdock-0001-nojmf.patch
+ Patch1:		    flexdock-0001-nojmf.patch
  #Modifies the build process  -- fedora specific
- Patch2:         flexdock-0002-fedora-build.patch
+ Patch2:		    flexdock-0002-fedora-build.patch
  
- BuildRequires:  java-devel
- BuildRequires:  ant
- BuildRequires:  jpackage-utils
- BuildRequires:  jgoodies-common
- BuildRequires:  jgoodies-looks
- BuildRequires:  skinlf
+ BuildRequires:	java-devel
+ BuildRequires:	ant
+ BuildRequires:	jpackage-utils
+ BuildRequires:	jgoodies-common
+ BuildRequires:	jgoodies-looks
+ BuildRequires:	skinlf
  
  Requires:       java
  Requires:       jpackage-utils
@@@ -70,9 -70,9 +70,12 @@@ install -pm644 build/%{name}-%{version}
  %{_javadir}/*
  
  %changelog
 +* Mon Aug 12 2013 Clément David <c.david86 at gmail.com> - 1.2.4-1
 +- Update version to 1.2.4
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Mon Feb 25 2013 Clément David <c.david86 at gmail.com> - 1.2.3-1
  - Update version