Hello community, here is the log from the commit of package jedit for openSUSE:Factory checked in at 2012-06-18 14:51:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jedit (Old) and /work/SRC/openSUSE:Factory/.jedit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jedit", Maintainer is "bnc-team-j...@forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/jedit/jedit.changes 2012-04-18 12:34:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jedit.new/jedit.changes 2012-06-18 14:51:54.000000000 +0200 @@ -1,0 +2,21 @@ +Sun Jun 17 08:00:29 UTC 2012 - factory-maintai...@kulow.org + +- adding deps.sh as source + +------------------------------------------------------------------- +Wed Feb 29 23:13:28 UTC 2012 - ad...@damienradtke.org + +- Update to 4.5.0 + * Performance improvements. + * Elastic tabstop option now available. + * Lots of old deprecated API's were removed. + * Choose color ordering for subpixel antialising. + * Desktop system tray icon added. + * It is now possible to change look & feel without restarting jEdit. + * It is now possible to specify a FILE_NAME_GLOB for an edit mode + based on the full path. + * File System Browser can now open files in desktop, using filename + associations to launch another program. + * Plugin Manager enhancements, filter field, bugs fixed. + +------------------------------------------------------------------- Old: ---- 00bsh-jedit.patch 01bsh-jedit-asm.patch 02build.xml.patch jedit-download-ivy.patch jedit-installer.patch jedit4.4.2source.tar.bz2 New: ---- 00build.xml.patch deps.sh jedit.desktop jedit.in jedit4.5.0source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jedit.spec ++++++ --- /var/tmp/diff_new_pack.2WDvae/_old 2012-06-18 14:51:58.000000000 +0200 +++ /var/tmp/diff_new_pack.2WDvae/_new 2012-06-18 14:51:58.000000000 +0200 @@ -14,91 +14,57 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild # icecream 0 + %define section free Name: jedit -Version: 4.4.2 -Release: 1 +Version: 4.5.0 +Release: 0 Summary: Programmer's Text Editor Written in Java -Url: http://www.jedit.org/ License: GPL-2.0+ Group: Productivity/Editors/Other -Source0: http://download.sourceforge.net/jedit/jedit%{version}source.tar.bz2 +Url: http://www.jedit.org/ +# SourceURL: http://download.sourceforge.net/jedit/jedit%{version}source.tar.bz2 +Source0: jedit%{version}source.tar.bz2 Source1: %{name}-16.png Source2: %{name}-32.png Source3: %{name}-48.png -Patch0: %{name}-installer.patch -#PATCH-FIX-OPENSUSE: bnc#629375 -#use patches from debian, because they document the changes between original -#bsh and the jedit's version -Patch1: 00bsh-jedit.patch -Patch2: 01bsh-jedit-asm.patch -Patch3: 02build.xml.patch -Patch4: jedit-download-ivy.patch +Source4: %{name}.desktop +Source5: %{name}.in +Source100: deps.sh +Patch0: 00build.xml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: java-devel -BuildRequires: aelfred BuildRequires: ant BuildRequires: ant-nodeps -BuildRequires: apache-ivy -BuildRequires: bsh2-src +BuildRequires: desktop-file-utils BuildRequires: docbook-xsl-stylesheets -BuildRequires: gnu-regexp -BuildRequires: iso_ent -BuildRequires: libxslt -BuildRequires: openjade -BuildRequires: xml-commons-apis -BuildRequires: fop BuildRequires: fdupes -Requires: aelfred -Requires: asm -Requires: gnu-regexp -Requires: jpackage-utils >= 1.5 -Obsoletes: %{name}-rhmenu < %{version} -Obsoletes: antlr-jedit < %{version} -Provides: %{name}-rhmenu = %{version} -Provides: antlr-jedit = %{version} +BuildRequires: java-1_6_0-openjdk-devel %description jEdit is a cross-platform programmer's text editor written in Java. - Some of jEdit's features include: -* Built-in macro language (BeanShell) - +* Built-in macro language (BeanShell). * Extensible plug-in architecture with more than 80 plug-ins - available - + available. * Plug-ins can be downloaded and installed from within jEdit using - the plug-in manager feature - -* Syntax highlighting for more than 80 languages - + the plug-in manager feature. +* Syntax highlighting for more than 80 languages. * Supports a large number of character encodings including UTF8 and - Unicode - -* Autoindenting of source code - -* Folding (indent and marker based) - -* Word wrap - -* Unlimited undo and redo - -* Highly configurable and customizable - + Unicode. +* Auto-indenting of source code. +* Folding (indent and marker based). +* Word wrap. +* Unlimited undo and redo. +* Highly configurable and customizable. * Every other feature, both basic and advanced, that you would expect -to find in a text editor - - +to find in a text editor. %package javadoc -License: GPL-2.0+ PreReq: coreutils Summary: Programmer's text editor written in Java (Documentation) Group: Productivity/Editors/Other @@ -106,132 +72,79 @@ %description javadoc Javadoc for jedit. - - %prep %setup -q -D -n jEdit -# the similar apporach to Debian's package -# unpack bsh and then patch it -(%{__mkdir} bsh; cd bsh; %{__tar} -xf %{_usrsrc}/bsh2-src/bsh2.tar.bz2 ) -# this will fail on each rebuild of bsh2, so do it by sed -# % {__sed} -i 's/\(.*\)String VERSION = "2.0.0.b5.*/\1String VERSION = "2.0.0.b4-jedit";/' bsh/src/bsh/Interpreter.java -%patch0 -p1 -b.installer -%patch1 -p1 -b .bsh -%patch2 -p1 -b .bsh-asm -%patch3 -p1 -b .bsh-build.xml -(cd ../build-support -%patch4 -p1 -) -# remove all included external sources -%__rm -rf com -# remove all binary libs -find . -name "*.jar" -exec rm -f {} \; -mkdir -p ${HOME}/.ant/lib && ln -s %{_javadir}/ivy.jar +# Patch the buildfile +%patch0 -p0 %build -export CLASSPATH=$(build-classpath aelfred asm gnu.regexp) -# compress jedit.jar -%__perl -p -i -e 's|compress="false"|compress="true"|' build.xml -%__perl -p -i -e 's|app.version=.*|app.version=%{version}-%{release}|' installer/install.props -DOCBOOK_XSL=`rpm -ql docbook-xsl-stylesheets | %__grep /html/chunk.xsl \ -| %__sed 's|/html/chunk.xsl||'` -STYLESHEET_VERSION=`rpm -q --qf '%%{version}' docbook-xsl-stylesheets` -if [ -z $DOCBOOK_XSL ]; then - echo "Unable to find docbook xsl directory" - exit 1 -fi -if [ -z "$SGML_CATALOG_FILES" -a -e %{_sysconfdir}/sgml/catalog ] ; then - export SGML_CATALOG_FILES=%{_sysconfdir}/sgml/catalog -fi + +# Specify some properties cat <<EOF > build.properties xsltproc.executable=%{_bindir}/xsltproc -docbook.xsl=%{_datadir}/xml/docbook/stylesheet/nwalsh/$STYLESHEET_VERSION/ -docbook.catalog=%{_datadir}/xml/docbook/stylesheet/nwalsh/$STYLESHEET_VERSION/catalog.xml +docbook.xsl=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/ +docbook.catalog=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/catalog.xml EOF + +# Run the build %ant \ - build docs-html -# Build QuickNotepad.jar -(cd jars/QuickNotepad && ant -v -d ) - -# FIXME: crosslink with gnu.regexp and bsh2 when they have non-versioned dirs -export LC_ALL=en_US.UTF-8 -%ant -Djava.javadoc=%{_javadocdir}/java \ - -Daelfred.javadoc=%{_javadocdir}/aelfred \ - -Dasm.javadoc=%{_javadocdir}/asm \ - -Dbsh2.javadoc=%{_javadocdir}/bsh2 \ - -Dgnu.regexp.javadoc=%{_javadocdir}/bsh2 \ - docs-javadoc + build docs-html docs-javadoc %install # dirs -%{__install} -d -m 0755 %{buildroot}%{_bindir} -%{__install} -d -m 0755 %{buildroot}/%{_datadir}/%{name} -%{__install} -d -m 0755 %{buildroot}/%{_javadocdir}/%{name} -%{__install} -d -m 0755 %{buildroot}/%{_mandir}/man1/ - -# jar -%{__install} -d -m 0755 %{buildroot}%{_javadir} -%{__cp} -a build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done) || true -(cd %{buildroot}%{_datadir}/%{name} && %{__ln_s} %{_javadir}/%{name}.jar %{name}.jar) || true - -# the rest files -%{__cp} -pr build/{doc,macros,modes,properties,startup} %{buildroot}/%{_datadir}/%{name} -# XXX: Can this be made relative? +%__install -d -m 0755 %{buildroot}%{_bindir} +%__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/ + +# Copy the jar to /usr/share/java (w/ version number) and then symlink to it from /usr/share/jedit +%__install -d -m 0755 %{buildroot}%{_javadir} +%__install build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_datadir}/%{name} && %__ln_s %{_javadir}/%{name}-%{version}.jar %{name}.jar) || true + +# Install the /usr/share/jedit subdirectories +%__cp -ar build/{doc,jars,macros,modes,properties,startup} %{buildroot}%{_datadir}/%{name} + +# Symlink the javadoc into /usr/share/jedit (cd %{buildroot}%{_datadir}/%{name}/doc && %__ln_s %{_javadocdir}/%{name} api) -%{__install} -m 0644 package-files/linux/%{name}.1 %{buildroot}/%{_mandir}/man1/ +# Man page +%__install -m 0644 package-files/linux/%{name}.1 %{buildroot}%{_mandir}/man1/ -# script -%__cat > %{buildroot}%{_bindir}/%{name} << EOF -#!/bin/sh -# -# jedit script -# JPackage Project <http://www.jpackage.org/> -# Source functions library -. %{_datadir}/java-utils/java-functions -# Source system prefs -if [ -f %{_sysconfdir}/%{name}.conf ] ; then - . %{_sysconfdir}/%{name}.conf -fi -# Source user prefs -if [ -f \$HOME/.%{name}rc ] ; then - . \$HOME/.%{name}rc -fi -# Configuration -MAIN_CLASS="org.gjt.sp.jedit.jEdit" -BASE_FLAGS="-Dbsh.jedit=true -Djedit.home=%{_datadir}/%{name} -mx32m" -BASE_JARS="aelfred asm bsh2/bsh-classgen bsh2/bsh-commands bsh2/bsh-core bsh2/bsh-reflect bsh2/bsh-util gnu.regexp %{name}" -#BASE_JARS="aelfred gnu.regexp %{name}" -# Set parameters -set_jvm -set_classpath \$BASE_JARS -set_flags \$BASE_FLAGS -# Let's start -run "\$@" -EOF -# icons -%__install -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png -%__install -D -m 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png +# Icons %__install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png +%__install -D -m 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png +%__install -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png + +# Desktop file +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} + +# Launcher script +%__cat %{SOURCE5} | sed 's|@data|%{_datadir}/%{name}|g' > %{name} +%__install %{name} %{buildroot}%{_bindir} %fdupes -s %{buildroot} %clean -%{__rm} -rf %{buildroot} +%__rm -rf %{buildroot} + +%post +%desktop_database_post + +%postun +%desktop_database_postun %files %defattr(0644,root,root,0755) %attr(0755,root,root) %{_bindir}/%{name} %{_javadir}/* -%{_datadir}/%{name} +%{_datadir}/%{name}/ +%{_datadir}/applications/ %{_mandir}/man1/%{name}.1* %{_datadir}/icons/hicolor/ %exclude %{_datadir}/%{name}/doc/api -#%files manual -#%defattr(0644,root,root,0755) -#%doc doc/users-guide/* %files javadoc %defattr(0644,root,root,0755) ++++++ 02build.xml.patch -> 00build.xml.patch ++++++ --- /work/SRC/openSUSE:Factory/jedit/02build.xml.patch 2012-04-18 12:34:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jedit.new/00build.xml.patch 2012-06-18 14:51:54.000000000 +0200 @@ -1,19 +1,42 @@ -Description: Some bsh directories and files have been removed by jedit. - In Debian bsh, they exist and this patch excludes them from build process. -Author: Gabriele Giacone <1o5g4...@gmail.com> - -Index: jEdit/build.xml +Index: build.xml =================================================================== ---- jEdit.orig/build.xml 2011-10-13 23:00:16.000000000 +0200 -+++ jEdit/build.xml 2012-01-04 11:33:09.842505840 +0100 -@@ -144,6 +144,10 @@ - includeAntRuntime="false"> - <include name="org/**"/> - <include name="com/**"/> -+ <exclude name="org/gjt/sp/jedit/bsh/servlet/*"/> -+ <exclude name="org/gjt/sp/jedit/bsh/util/*"/> -+ <exclude name="org/gjt/sp/jedit/bsh/util/**/*"/> -+ <exclude name="org/gjt/sp/jedit/bsh/Console.java"/> - <compilerarg line="${config.build.compilerarg}"/> - </javac> +--- build.xml (revision 21227) ++++ build.xml (working copy) +@@ -109,6 +109,13 @@ + </not> + </condition> + </fail> ++ <fail message="Dependencies not found. Please run deps.sh and try again."> ++ <condition> ++ <not> ++ <available file="lib" type="dir" /> ++ </not> ++ </condition> ++ </fail> + <property name="init.done" + value="true"/> </target> +@@ -145,6 +152,7 @@ + description="retrieve the dependencies" + depends="init,init-ivy" + unless="ivy.done"> ++ <!-- + <ivy:retrieve sync="true"/> + <ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]" + organisation="org.apache.ivy" +@@ -154,6 +162,7 @@ + inline="true"/> + <property name="ivy.done" + value="true"/> ++ --> + </target> + + <target name="setup" +@@ -696,6 +705,7 @@ + author="true" + splitindex="true" + locale="en" ++ encoding="UTF-8" + windowtitle="jEdit API" + doctitle="jEdit API" + failonerror="true" ++++++ deps.sh ++++++ #!/bin/sh # Fetches dependencies manually. # Given a jEdit source tarball, this script downloads its dependencies # and adds them to the archive. if [[ -z "$1" ]]; then echo "usage: deps.sh <source>" exit 1 fi echo "Extracting $1..." tar -xf "$1" cd jEdit/ echo "Fetching dependencies..." ant -q retrieve if [[ ! $? -eq 0 ]]; then exit 1 fi echo "Re-creating archive..." cd ../ rm -f "$1" tar -cf "$1" jEdit/ rm -rf jEdit/ echo "Done." ++++++ jedit-16.png ++++++ Files /var/tmp/diff_new_pack.2WDvae/_old and /var/tmp/diff_new_pack.2WDvae/_new differ ++++++ jedit-32.png ++++++ Files /var/tmp/diff_new_pack.2WDvae/_old and /var/tmp/diff_new_pack.2WDvae/_new differ ++++++ jedit-48.png ++++++ Files /var/tmp/diff_new_pack.2WDvae/_old and /var/tmp/diff_new_pack.2WDvae/_new differ ++++++ jedit.desktop ++++++ [Desktop Entry] Name=jEdit GenericName=Programmer's Text Editor GenericName[ca]=Editor de text per a programadors GenericName[cs]=Textový editor pro programátory GenericName[de]=Texteditor für Programmierer GenericName[es]=Editor de textos para programadores Comment=Edit text files Comment[ca]=Editeu fitxers de text Comment[cs]=Edituje textové soubory Comment[de]=Editiere Textdateien Comment[es]=Modifique archivos de texto Exec=jedit %U Icon=jedit Terminal=false Type=Application Categories=Utility;TextEditor; StartupNotify=true MimeType=text/plain; ++++++ jedit.in ++++++ #!/bin/sh # # 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. 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 JAVA="$JAVA_HOME/bin/java" fi exec "$JAVA" -jar @data/jedit.jar -reuseview "$@" ++++++ jedit4.4.2source.tar.bz2 -> jedit4.5.0source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/jedit/jedit4.4.2source.tar.bz2 /work/SRC/openSUSE:Factory/.jedit.new/jedit4.5.0source.tar.bz2 differ: char 1, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
