Hello community, here is the log from the commit of package jedit checked in at Fri Aug 8 02:08:42 CEST 2008. -------- --- jedit/jedit.changes 2008-01-29 11:58:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/jedit/jedit.changes 2008-08-07 15:28:03.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Aug 7 15:25:44 CEST 2008 - mvyskocil@suse.cz + +- fixed a name clash under java6 +- fix some rpmlint warnings: + - bzipped source tarball + - fix duplicates using fdupes + - add a provides jedit-rhmenu antlr-jedit +- quiet option to setup macro + +------------------------------------------------------------------- Old: ---- jedit42source.tar.gz minmem New: ---- jedit-4.2-name-clash.patch jedit42source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jedit.spec ++++++ --- /var/tmp/diff_new_pack.B29317/_old 2008-08-08 02:06:06.000000000 +0200 +++ /var/tmp/diff_new_pack.B29317/_new 2008-08-08 02:06:06.000000000 +0200 @@ -2,17 +2,26 @@ # spec file for package jedit (Version 4.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild # icecream 0 + Name: jedit BuildRequires: aelfred aelfred-javadoc ant asm-javadoc bsh2 bsh2-classgen bsh2-javadoc docbook-xsl-stylesheets gnu-regexp gnu-regexp-javadoc iso_ent java2-devel-packages libxslt openjade xml-commons-apis xorg-x11 xorg-x11-devel +BuildRequires: fdupes %define name jedit %define Name jEdit %define major 4 @@ -30,11 +39,11 @@ %define Summary Open Source programmer's text editor %define section free Version: 4.2 -Release: 196 +Release: 282 Summary: Programmer's Text Editor Written in Java License: GPL v2 or later Group: Productivity/Editors/Other -Source0: http://download.sourceforge.net/jedit/jedit42source.tar.gz +Source0: http://download.sourceforge.net/jedit/jedit42source.tar.bz2 Source1: %{name}-16.png Source2: %{name}-32.png Source3: %{name}-48.png @@ -43,6 +52,7 @@ Patch1: %{name}-man.patch Patch2: %{name}-crosslink.patch Patch3: %{name}-java14compat.patch +Patch4: %{name}-%{version}-name-clash.patch Url: http://www.jedit.org/ Requires: aelfred Requires: asm @@ -53,6 +63,8 @@ BuildArch: noarch Obsoletes: %{name}-rhmenu Obsoletes: antlr-jedit +Provides: %{name}-rhmenu +Provides: antlr-jedit BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -89,6 +101,7 @@ %package javadoc +License: GPL v2 or later PreReq: coreutils Summary: Programmer's text editor written in Java (Documentation) Group: Productivity/Editors/Other @@ -100,11 +113,12 @@ %prep #%setup -q -n jEdit -%setup -D -b 4 -n jEdit +%setup -q -D -b 4 -n jEdit %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 +%patch4 -b .sav4 # remove all included external sources %__rm -rf bsh %__rm -rf com @@ -199,6 +213,7 @@ %__ln_s %{_javadir}/%{name}.jar %{name}.jar) # installing TextTools plugin mv ../TextTools.jar $RPM_BUILD_ROOT/usr/share/jedit/jars/ +%fdupes -s ${RPM_BUILD_ROOT} %clean rm -rf $RPM_BUILD_ROOT @@ -226,6 +241,13 @@ %{_datadir}/%{name}/doc/api %changelog +* Thu Aug 07 2008 mvyskocil@suse.cz +- fixed a name clash under java6 +- fix some rpmlint warnings: + - bzipped source tarball + - fix duplicates using fdupes + - add a provides jedit-rhmenu antlr-jedit +- quiet option to setup macro * Tue Jan 29 2008 mmaher@suse.de - added TextTools Plugin (#276446) The TextTools plugin provides a set of plugin actions for ++++++ jedit-4.2-name-clash.patch ++++++ --- org/gjt/sp/jedit/GUIUtilities.java +++ org/gjt/sp/jedit/GUIUtilities.java @@ -1516,7 +1516,7 @@ //{{{ showSplashScreen() method static void showSplashScreen() { - splash = new SplashScreen(); + splash = new org.gjt.sp.jedit.gui.SplashScreen(); } //}}} //{{{ advanceSplashProgress() method @@ -1529,7 +1529,7 @@ //}}} //{{{ Private members - private static SplashScreen splash; + private static org.gjt.sp.jedit.gui.SplashScreen splash; private static Hashtable icons; private static String iconPath = "jeditresource:/org/gjt/sp/jedit/icons/"; private static String defaultIconPath = "jeditresource:/org/gjt/sp/jedit/icons/"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org