[eclipse] Fix bogus dates and SWT description.

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Jun 4 18:39:04 UTC 2013


commit ce171a574ee1f5fc2c178a82dad81c1307e4874a
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jun 4 21:32:37 2013 +0300

    Fix bogus dates and SWT description.
    
    Remove swt jar from plugins as it may break reconcilation.

 eclipse.spec |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index e4611d2..148c8fc 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -52,7 +52,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        0.58.git7bf397%{?dist}
+Release:        0.59.git7bf397%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -199,7 +199,7 @@ everything in between.
 
 %package     swt
 Version:        %{eclipse_version}
-Summary:        SWT Library for GTK+-2.0
+Summary:        SWT Library for GTK+
 Group:          Development/Tools
 # %%{_libdir}/java directory owned by jpackage-utils
 Requires:       java >= 1:1.7.0
@@ -210,7 +210,7 @@ Requires:       webkitgtk
 Requires:       webkitgtk3
 
 %description swt
-SWT Library for GTK+-2.0.
+SWT Library for GTK+.
 
 %package      equinox-osgi
 Version:        %{eclipse_version}
@@ -638,10 +638,9 @@ SWT_JAR=`ls | grep swt.gtk`
 #it's a dir now
 cd ${SWT_JAR}
 #zip the contents
-zip -r "../${SWT_JAR}.jar" *
+zip -r "../../swt.jar" *
 popd
-    ln -s  %{_libdir}/%{pkg_name}/plugins/"${SWT_JAR}.jar" swt.jar
-    ln -s  %{_libdir}/%{pkg_name}/plugins/"${SWT_JAR}.jar" swt-gtk.jar
+    ln -s  swt.jar swt-gtk.jar
 	mkdir -p ../../lib/java
 	ln -s  %{_libdir}/%{pkg_name}/swt.jar ../../lib/java/swt.jar
 popd
@@ -1009,6 +1008,12 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Tue Jun 4 2013 Alexander Kurtakov <akurtako at redhat.com> 1:4.3.0-0.59.git7bf397
+- Fix bogus dates and SWT description.
+
+* Tue Jun 4 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.59.git7bf397
+- Remove swt jar from plugins as it may break reconcilation.
+
 * Thu May 30 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.58.git7bf397
 - Update to daily build.
 
@@ -1381,7 +1386,7 @@ fi
 - Created OSGI subpackage.
 - Removed the necessity to delete ~/.eclipse after some updates.
 
-* Fri Jun 18 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:4.2.0-0.24.I201205031800
+* Mon Jun 18 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:4.2.0-0.24.I201205031800
 - Remove empty reconciler script.
 
 * Fri Jun 15 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-0.23.I201205031800
@@ -1554,15 +1559,15 @@ fi
 * Thu Jan 19 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.1-15
 - Add BuildRequires:  ORBit2-devel
 
-* Tue Jan 19 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.1-15
+* Thu Jan 19 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.1-15
 - Use rpm-state/eclipse for run-reconciler file instead of /var/run.
 - Delete eclipse-tmpfiles.conf.
 
-* Mon Jan 19 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.1-14
+* Thu Jan 19 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:3.7.1-14
 - Remove _eclipse_pkg macro.
 - Use mktemp for creating a backup directory in eclipse-reconciler.sh
 
-* Fri Jan 16 2012 Alexander Kurtakov <akurtako at redhat.com> - 1:3.7.1-13
+* Mon Jan 16 2012 Alexander Kurtakov <akurtako at redhat.com> - 1:3.7.1-13
 - Fix o.e.osgi.services pom to remove fake parent.
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.7.1-12
@@ -1601,7 +1606,7 @@ fi
 * Mon Nov 21 2011 Roland Grunberg <rgrunber at redhat.com> 1:3.7.1-4
 - Bump release to match f16 branch.
 
-* Tue Nov 16 2011 Roland Grunberg <rgrunber at redhat.com> 1:3.7.1-2
+* Wed Nov 16 2011 Roland Grunberg <rgrunber at redhat.com> 1:3.7.1-2
 - Upload new source fixing RHBZ #753090.
 
 * Tue Nov 08 2011 Roland Grunberg <rgrunber at redhat.com> 1:3.7.1-1


More information about the scm-commits mailing list