Hello community, here is the log from the commit of package jedit for openSUSE:Factory checked in at 2013-03-12 06:56:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jedit (Old) and /work/SRC/openSUSE:Factory/.jedit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jedit", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/jedit/jedit.changes 2012-06-29 15:20:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jedit.new/jedit.changes 2013-03-12 06:56:14.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Mar 7 00:04:49 UTC 2013 - [email protected] + +- updated build to use openSUSE-packaged dependencies + +------------------------------------------------------------------- +Thu Jan 17 20:28:53 UTC 2013 - [email protected] + +- update to 5.0.0 +- fixed java version incompatability with openSUSE 12.1 +- many bug fixes, API changes, editing and UI updates +- added missing documentation +- full changelog here: www.jedit.org/CHANGES50.txt + +------------------------------------------------------------------- Old: ---- 00build.xml.patch jedit4.5.1source.tar.bz2 New: ---- QuickNotepad-5.0.tgz build-support-r22713.tar.gz jedit5.0.0source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jedit.spec ++++++ --- /var/tmp/diff_new_pack.bGyfbh/_old 2013-03-12 06:56:15.000000000 +0100 +++ /var/tmp/diff_new_pack.bGyfbh/_new 2013-03-12 06:56:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package jedit # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,32 +20,38 @@ %define section free Name: jedit -Version: 4.5.1 +Version: 5.0.0 Release: 0 Summary: Programmer's Text Editor Written in Java License: GPL-2.0+ Group: Productivity/Editors/Other Url: http://www.jedit.org/ # SourceURL: http://download.sourceforge.net/jedit/jedit%{version}source.tar.bz2 -Source0: jedit%{version}source.tar.bz2 +Source0: jedit5.0.0source.tar.bz2 Source1: %{name}-16.png Source2: %{name}-32.png Source3: %{name}-48.png Source4: %{name}.desktop Source5: %{name}.in -Patch0: 00build.xml.patch +Source6: http://prdownloads.sourceforge.net/jedit-plugins/QuickNotepad-5.0.tgz +#svn co https://jedit.svn.sourceforge.net/svnroot/jedit/build-support/trunk build-support +Source7: build-support-r22713.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: ant -BuildRequires: ant-contrib -BuildRequires: ant-nodeps -BuildRequires: bsh2 +BuildRequires: ant >= 1.8.2 +BuildRequires: ant-apache-bsf +BuildRequires: ant-junit BuildRequires: desktop-file-utils +BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: hicolor-icon-theme -BuildRequires: ivy BuildRequires: java-devel >= 1.6.0 +BuildRequires: ant-contrib +BuildRequires: apache-ivy +BuildRequires: bsh +BuildRequires: jsr-305 + %description jEdit is a cross-platform programmer's text editor written in Java. Some of jEdit's features include: @@ -66,38 +72,79 @@ * Every other feature, both basic and advanced, that you would expect to find in a text editor. +%package javadoc +PreReq: coreutils +Summary: Programmer's text editor written in Java (Documentation) +Group: Productivity/Editors/Other + +%description javadoc +Javadoc for jedit. + %prep -%setup -q -D -n jEdit +%setup -q -D -n jEdit -a 6 -a 7 -# Patch the buildfile -%patch0 -p0 +find . -name '*jar' -delete %build -mkdir -p lib/ivy; ln -sf $(build-classpath ivy) lib/ivy/ivy-2.2.0.jar -mkdir -p lib/ant-contrib; ln -sf $(build-classpath ant-contrib) lib/ant-contrib/ -mkdir -p lib/scripting; ln -sf $(build-classpath bsh2/bsh) lib/scripting/ -mkdir -p lib/scripting; ln -sf $(build-classpath bsh2/bsh-engine) lib/scripting/ +DOCBOOK=%{_datadir}/xml/docbook/stylesheet/nwalsh/current + +# Specify some properties +cat <<EOF > build.properties +xsltproc.executable=%{_bindir}/xsltproc +docbook.xsl=${DOCBOOK} +docbook.catalog=${DOCBOOK}/catalog.xml +build.support=$(pwd)/build-support/ +EOF + +# link dependencies +mkdir -p lib/ivy +ln -sf $(build-classpath ivy) lib/ivy/ivy-2.2.0.jar +mkdir -p lib/scripting +ln -sf $(build-classpath bsh) lib/scripting/bsh.jar +mkdir -p lib/compile +ln -sf $(build-classpath jsr-305) lib/compile/jsr305.jar +mkdir -p lib/ant-contrib +ln -sf $(build-classpath ant) lib/ant-contrib/ant.jar +ln -sf $(build-classpath ant-contrib) lib/ant-contrib/ant-contrib.jar + +# we have to break a dependency where build target expects plugins are in place, +# where they are built separatelly and need jEdit.jar for a build mkdir -p lib/default-plugins/ +touch lib/default-plugins/HACK # Run the build -ant \ - build +# XXX: there's NPE on build-docs, but who care about html docs those times, right? +%ant -Divy.done=true \ + build docs-javadoc + +# plugins-build hardcodes the jedit.jar path - so to make it happy +ln -s build/jedit.jar + +pushd QuickNotepad +%ant +popd +mv QuickNotepad.jar build/jars +rm build/jars/HACK %install # dirs %__install -d -m 0755 %{buildroot}%{_bindir} -%__install -d -m 0755 %{buildroot}%{_javadir} %__install -d -m 0755 %{buildroot}%{_datadir}/%{name} %__install -d -m 0755 %{buildroot}%{_datadir}/applications +%__install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} %__install -d -m 0755 %{buildroot}%{_mandir}/man1/ -# jar +%__install -d -m 0755 %{buildroot}%{_javadir} %__install build/%{name}.jar %{buildroot}%{_datadir}/%{name}/%{name}.jar -ln -sf %{_datadir}/%{name}/%{name}.jar %{buildroot}/%{_javadir}/ +# link /usr/share/jedit/jedit.jar to /usr/share/java +(cd %{buildroot}%{_javadir} && %__ln_s %{_datadir}/%{name}/%{name}.jar %{name}.jar) # Install the /usr/share/jedit subdirectories -%__cp -ar build/{jars,macros,modes,properties,startup} %{buildroot}%{_datadir}/%{name} +%__cp -ar build/{doc,jars,keymaps,macros,modes,properties,startup} %{buildroot}%{_datadir}/%{name} + +# Symlink the javadoc into /usr/share/jedit +(cd %{buildroot}%{_datadir}/%{name}/doc && %__ln_s %{_javadocdir}/%{name} api) # Man page %__install -m 0644 package-files/linux/%{name}.1 %{buildroot}%{_mandir}/man1/ @@ -111,7 +158,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} # Launcher script -%__cat %{SOURCE5} | sed 's|@@DATADIR@@|%{_datadir}/%{name}|g' > %{name} +%__cat %{SOURCE5} | sed 's|@data|%{_datadir}/%{name}|g' > %{name} %__install %{name} %{buildroot}%{_bindir} %fdupes -s %{buildroot} @@ -128,11 +175,16 @@ %files %defattr(0644,root,root,0755) %attr(0755,root,root) %{_bindir}/%{name} -%doc doc/* -%{_javadir}/* +%{_javadir}/%{name}.jar %{_datadir}/%{name}/ -%{_datadir}/applications/* +%{_datadir}/applications/ %{_mandir}/man1/%{name}.1* %{_datadir}/icons/hicolor/ +%exclude %{_datadir}/%{name}/doc/api + +%files javadoc +%defattr(0644,root,root,0755) +%doc %{_javadocdir}/%{name} +%{_datadir}/%{name}/doc/api %changelog ++++++ jedit.in ++++++ --- /var/tmp/diff_new_pack.bGyfbh/_old 2013-03-12 06:56:15.000000000 +0100 +++ /var/tmp/diff_new_pack.bGyfbh/_new 2013-03-12 06:56:15.000000000 +0100 @@ -1,16 +1,21 @@ #!/bin/sh # -# jEdit start script -# JPackage Project <http://www.jpackage.org/> +# Runs jEdit +# +# You can specify which Java installation to use through the JAVA_HOME +# environment variable. Otherwise, this will look for Java in the +# system PATH. +# +# You can set a global value for JAVA_HOME in /etc/environment. -# Source functions library -if [ -f /usr/share/java-utils/java-functions ] ; then - . /usr/share/java-utils/java-functions +if [ -z "$JAVA_HOME" ]; then + JAVA=`which java 2>/dev/null` + if [ -z "$JAVA" ]; then + echo "Failed to find the java virtual machine! Bailing..." + exit 1 + fi else - echo "Can't find functions library, aborting" - exit 1 + JAVA="$JAVA_HOME/bin/java" fi -set_javacmd - -exec "${JAVACMD}" -jar @@DATADIR@@/jedit.jar "$@" +exec "$JAVA" -jar @data/jedit.jar -reuseview "$@" ++++++ jedit4.5.1source.tar.bz2 -> jedit5.0.0source.tar.bz2 ++++++ ++++ 54101 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
