Hello community,
here is the log from the commit of package jedit for openSUSE:12.2 checked in at 2012-06-29 15:20:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/jedit (Old)
and /work/SRC/openSUSE:12.2/.jedit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jedit", Maintainer is "bnc-team-java@forge.provo.novell.com"
Changes:
--------
--- /work/SRC/openSUSE:12.2/jedit/jedit.changes 2012-06-25 15:36:03.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.jedit.new/jedit.changes 2012-06-29 15:20:49.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Jun 27 14:31:29 UTC 2012 - mvyskocil@suse.cz
+
+- update to 4.5.1 (bugfix release)
+- build it from source and don't bundle everything in a tarball
+- strip documentation build and install as it's extremly complicated and needs
+ a lot of dependencies
+- reworked launcher script
+
+-------------------------------------------------------------------
Old:
----
deps.sh
jedit4.5.0source.tar.bz2
New:
----
jedit4.5.1source.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jedit.spec ++++++
--- /var/tmp/diff_new_pack.nPMX0N/_old 2012-06-29 15:20:51.000000000 +0200
+++ /var/tmp/diff_new_pack.nPMX0N/_new 2012-06-29 15:20:51.000000000 +0200
@@ -20,7 +20,7 @@
%define section free
Name: jedit
-Version: 4.5.0
+Version: 4.5.1
Release: 0
Summary: Programmer's Text Editor Written in Java
License: GPL-2.0+
@@ -33,16 +33,18 @@
Source3: %{name}-48.png
Source4: %{name}.desktop
Source5: %{name}.in
-Source100: deps.sh
Patch0: 00build.xml.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: ant
+BuildRequires: ant-contrib
BuildRequires: ant-nodeps
+BuildRequires: bsh2
BuildRequires: desktop-file-utils
-BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
-BuildRequires: java-1_6_0-openjdk-devel
+BuildRequires: hicolor-icon-theme
+BuildRequires: ivy
+BuildRequires: java-devel >= 1.6.0
%description
jEdit is a cross-platform programmer's text editor written in Java.
@@ -64,14 +66,6 @@
* 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
@@ -80,35 +74,30 @@
%build
-# Specify some properties
-cat <<EOF > build.properties
-xsltproc.executable=%{_bindir}/xsltproc
-docbook.xsl=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/
-docbook.catalog=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/catalog.xml
-EOF
+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/
+mkdir -p lib/default-plugins/
# Run the build
-%ant \
- build docs-html docs-javadoc
+ant \
+ build
%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/
-# 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
+# jar
+%__install build/%{name}.jar %{buildroot}%{_datadir}/%{name}/%{name}.jar
+ln -sf %{_datadir}/%{name}/%{name}.jar %{buildroot}/%{_javadir}/
# 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)
+%__cp -ar build/{jars,macros,modes,properties,startup} %{buildroot}%{_datadir}/%{name}
# Man page
%__install -m 0644 package-files/linux/%{name}.1 %{buildroot}%{_mandir}/man1/
@@ -122,7 +111,7 @@
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
# Launcher script
-%__cat %{SOURCE5} | sed 's|@data|%{_datadir}/%{name}|g' > %{name}
+%__cat %{SOURCE5} | sed 's|@@DATADIR@@|%{_datadir}/%{name}|g' > %{name}
%__install %{name} %{buildroot}%{_bindir}
%fdupes -s %{buildroot}
@@ -139,16 +128,11 @@
%files
%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/%{name}
+%doc doc/*
%{_javadir}/*
%{_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
++++++ 00build.xml.patch ++++++
--- /var/tmp/diff_new_pack.nPMX0N/_old 2012-06-29 15:20:51.000000000 +0200
+++ /var/tmp/diff_new_pack.nPMX0N/_new 2012-06-29 15:20:51.000000000 +0200
@@ -2,20 +2,6 @@
===================================================================
--- 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>
-