[eclipse-jbosstools/f19: 34/36] Merge branch 'master' of fedpkg eclipse-jbosstools

[Gerard Ryan]

commit 058f7bd07d7e784aff7a3d2c11f331784dfc59cd
Merge: 1e00dab ed0ea1a
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Sun Aug 18 12:26:15 2013 +0100

    Merge branch 'master' of fedpkg eclipse-jbosstools
    
    Conflicts:
    	eclipse-jbosstools.spec

 eclipse-jbosstools.spec |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --cc eclipse-jbosstools.spec
index e9aa618,c4cd738..678888a
--- a/eclipse-jbosstools.spec
+++ b/eclipse-jbosstools.spec
@@@ -632,18 -623,17 +632,24 @@@ popd
  %{_mavenpomdir}/JPP-%{name}-runtime.pom
  %{_mavendepmapfragdir}/%{name}-runtime
  
 +#files openshift
 +#{eclipse_dropins}/%{name}-openshift
 +#{_mavenpomdir}/JPP-%{name}-openshift.pom
 +#{_mavendepmapfragdir}/%{name}-openshift
  
  %changelog
- * Tue Jul 23 2013 Gerard Ryan <galileo at fedoraproject.org> - 4.1.0-1
++* Sun Aug 18 2013 Gerard Ryan <galileo at fedoraproject.org> - 4.1.0-1
 +- Update to latest upstream version 4.1.0 on f19+
 +
- * Sun Jan 20 2013 Gerard Ryan <galileo at fedoraproject.org> - 4.0.0-2
- - Add openshift subpackage.
- - Tweak source tarball and its creation script.
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Wed Feb 06 2013 Java SIG <java-devel at lists.fedoraproject.org> - 4.0.0-2
+ - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+ - Replace maven BuildRequires with maven-local
  
  * Tue Oct 16 2012 Gerard Ryan <galileo at fedoraproject.org> - 4.0.0-1
  - Update to upstream 4.0.0.Final