Merge branch 'master' into ebdropins

Conflicts:
	eclipse.spec
This commit is contained in:
Andrew Overholt 2010-08-18 15:00:06 -04:00
commit 666f0b79cf
2 changed files with 2 additions and 4 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ eclipse-build-0_5_0RC0.tar.gz
eclipse-build-0.5.0.tar.bz2 eclipse-build-0.5.0.tar.bz2
eclipse-3.6.0-src.tar.bz2 eclipse-3.6.0-src.tar.bz2
eclipse-build-0.6.1RC0.tar.bz2 eclipse-build-0.6.1RC0.tar.bz2
eclipse-build-0_6_1_RC2.tar.bz2

View File

@ -27,7 +27,7 @@ Epoch: 1
Summary: An open, extensible IDE Summary: An open, extensible IDE
Name: eclipse Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro} Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 7%{?dist} Release: 6%{?dist}
License: EPL License: EPL
Group: Text Editors/Integrated Development Environments (IDE) Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/ URL: http://www.eclipse.org/
@ -583,9 +583,6 @@ fi
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog %changelog
* Wed Aug 18 2010 Andrew Overholt <overholt@redhat.com> 1:3.6.0-7
- Use my local copies of the dependencies.
* Tue Aug 17 2010 Andrew Overholt <overholt@redhat.com> 1:3.6.0-6 * Tue Aug 17 2010 Andrew Overholt <overholt@redhat.com> 1:3.6.0-6
- Update to eclipse-build 0.6.1RC2. - Update to eclipse-build 0.6.1RC2.
- List a few files that were missing but should be installed. - List a few files that were missing but should be installed.