commit jeuclid for openSUSE:Factory
Hello community, here is the log from the commit of package jeuclid for openSUSE:Factory checked in at 2019-11-08 15:28:49 Comparing /work/SRC/openSUSE:Factory/jeuclid (Old) and /work/SRC/openSUSE:Factory/.jeuclid.new.2990 (New) Package is "jeuclid" Fri Nov 8 15:28:49 2019 rev:10 rq:746585 version:3.1.3 Changes: --- /work/SRC/openSUSE:Factory/jeuclid/jeuclid.changes 2019-02-05 11:18:25.788906751 +0100 +++ /work/SRC/openSUSE:Factory/.jeuclid.new.2990/jeuclid.changes 2019-11-08 15:28:51.107200627 +0100 @@ -1,0 +2,5 @@ +Fri Nov 8 12:16:35 UTC 2019 - Fridrich Strba + +- Add xml-apis explicitely to the build classpath + +--- Other differences: -- ++ jeuclid.spec ++ --- /var/tmp/diff_new_pack.5bPRCY/_old 2019-11-08 15:28:52.091201734 +0100 +++ /var/tmp/diff_new_pack.5bPRCY/_new 2019-11-08 15:28:52.099201744 +0100 @@ -156,7 +156,7 @@ mv NOTICE.unix NOTICE mkdir lib -build-jar-repository -s -p lib jcip-annotations commons-logging xmlgraphics-commons batik-all xmlgraphics-fop.jar commons-cli commons-lang3 +build-jar-repository -s -p lib jcip-annotations commons-logging xmlgraphics-commons batik-all xmlgraphics-fop.jar commons-cli commons-lang3 xml-apis %patch0 -p1 %patch1 -p1
commit jeuclid for openSUSE:Factory
Hello community,
here is the log from the commit of package jeuclid for openSUSE:Factory checked
in at 2019-02-05 11:18:24
Comparing /work/SRC/openSUSE:Factory/jeuclid (Old)
and /work/SRC/openSUSE:Factory/.jeuclid.new.28833 (New)
Package is "jeuclid"
Tue Feb 5 11:18:24 2019 rev:9 rq:667382 version:3.1.3
Changes:
--- /work/SRC/openSUSE:Factory/jeuclid/jeuclid.changes 2018-03-07
10:37:26.568493978 +0100
+++ /work/SRC/openSUSE:Factory/.jeuclid.new.28833/jeuclid.changes
2019-02-05 11:18:25.788906751 +0100
@@ -1,0 +2,14 @@
+Sun Jan 20 22:36:34 UTC 2019 - Fridrich Strba
+
+- Build against batik >= 1.10
+- Added patch:
+ * jeuclid-batik_1_10.patch
++ org.w3c.dom.events.CustomEvent ->
+ -> org.apache.batik.w3c.dom.events.CustomEvent
+
+---
+Thu Dec 6 15:26:27 UTC 2018 - Fridrich Strba
+
+- Fix build with xml-commons-apis package
+
+---
New:
jeuclid-batik_1_10.patch
Other differences:
--
++ jeuclid.spec ++
--- /var/tmp/diff_new_pack.9GUV4P/_old 2019-02-05 11:18:26.772906209 +0100
+++ /var/tmp/diff_new_pack.9GUV4P/_new 2019-02-05 11:18:26.772906209 +0100
@@ -1,7 +1,7 @@
#
# spec file for package jeuclid
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -23,7 +23,7 @@
# LGPL-2.1 is for the FreeHEP component only (see LICENSE.FreeHEP)
License:Apache-2.0 AND LGPL-2.1-only
Group: Development/Libraries/Java
-Url:http://jeuclid.sourceforge.net/index.html
+URL:http://jeuclid.sourceforge.net/index.html
Source0:
http://downloads.sourceforge.net/%{name}/%{name}-parent-%{version}-src.zip
#fedora specific build script based on debian
Source1:build.xml
@@ -37,11 +37,12 @@
#removes OSX dep for the viewer
Patch2: MacOSX.patch
Patch3: jeuclid-commons-lang3.patch
+Patch4: jeuclid-batik_1_10.patch
BuildRequires: ant
BuildRequires: apache-commons-cli >= 1.1
BuildRequires: apache-commons-lang3
BuildRequires: apache-commons-logging
-BuildRequires: batik >= 1.7
+BuildRequires: batik >= 1.10
BuildRequires: desktop-file-utils
BuildRequires: hicolor-icon-theme
BuildRequires: java-devel
@@ -49,10 +50,11 @@
BuildRequires: jcip-annotations
BuildRequires: unzip
BuildRequires: update-desktop-files
+BuildRequires: xml-commons-apis
BuildRequires: xmlgraphics-commons >= 1.3
BuildRequires: xmlgraphics-fop >= 0.95
Requires: apache-commons-logging
-Requires: batik >= 1.7
+Requires: batik >= 1.10
Requires: java
Requires: javapackages-tools
Requires: jcip-annotations
@@ -160,6 +162,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
@@ -200,7 +203,8 @@
%icon_theme_cache_postun
%files
-%doc NOTICE LICENSE.txt README.Release jeuclid/LICENSE.FreeHEP
+%license LICENSE.txt jeuclid/LICENSE.FreeHEP
+%doc NOTICE README.Release
%{_javadir}/%{name}-core.jar
%files mathviewer
++ jeuclid-batik_1_10.patch ++
---
jeuclid-parent-3.1.3/jeuclid-core/src/main/java/net/sourceforge/jeuclid/elements/presentation/token/Mo.java
2019-01-20 23:29:28.841276674 +0100
+++
jeuclid-parent-3.1.3/jeuclid-core/src/main/java/net/sourceforge/jeuclid/elements/presentation/token/Mo.java
2019-01-20 23:32:09.942100475 +0100
@@ -43,8 +43,8 @@
import net.sourceforge.jeuclid.layout.TextObject;
import org.apache.batik.dom.events.DOMCustomEvent;
+import org.apache.batik.w3c.dom.events.CustomEvent;
import org.w3c.dom.Node;
-import org.w3c.dom.events.CustomEvent;
import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget;
commit jeuclid for openSUSE:Factory
Hello community,
here is the log from the commit of package jeuclid for openSUSE:Factory checked
in at 2018-03-07 10:37:23
Comparing /work/SRC/openSUSE:Factory/jeuclid (Old)
and /work/SRC/openSUSE:Factory/.jeuclid.new (New)
Package is "jeuclid"
Wed Mar 7 10:37:23 2018 rev:8 rq:583257 version:3.1.3
Changes:
--- /work/SRC/openSUSE:Factory/jeuclid/jeuclid.changes 2017-10-17
01:51:14.810007386 +0200
+++ /work/SRC/openSUSE:Factory/.jeuclid.new/jeuclid.changes 2018-03-07
10:37:26.568493978 +0100
@@ -1,0 +2,6 @@
+Tue Mar 6 09:57:12 UTC 2018 - fst...@suse.com
+
+- Add to the build.xml file target="6", in order to be sure the
+ right bytecode version is generated
+
+---
Other differences:
--
++ jeuclid.spec ++
--- /var/tmp/diff_new_pack.ceWnSL/_old 2018-03-07 10:37:27.368465123 +0100
+++ /var/tmp/diff_new_pack.ceWnSL/_new 2018-03-07 10:37:27.376464834 +0100
@@ -1,7 +1,7 @@
#
# spec file for package jeuclid
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
Release:0
Summary:MathML rendering solution
# LGPL-2.1 is for the FreeHEP component only (see LICENSE.FreeHEP)
-License:Apache-2.0 AND LGPL-2.1
+License:Apache-2.0 AND LGPL-2.1-only
Group: Development/Libraries/Java
Url:http://jeuclid.sourceforge.net/index.html
Source0:
http://downloads.sourceforge.net/%{name}/%{name}-parent-%{version}-src.zip
++ build.xml ++
--- /var/tmp/diff_new_pack.ceWnSL/_old 2018-03-07 10:37:27.432462814 +0100
+++ /var/tmp/diff_new_pack.ceWnSL/_new 2018-03-07 10:37:27.432462814 +0100
@@ -122,7 +122,7 @@
-
+
@@ -141,7 +141,7 @@
-
+
@@ -169,7 +169,7 @@
-
+
@@ -195,7 +195,7 @@
-
+
commit jeuclid for openSUSE:Factory
Hello community,
here is the log from the commit of package jeuclid for openSUSE:Factory checked
in at 2017-10-17 01:51:12
Comparing /work/SRC/openSUSE:Factory/jeuclid (Old)
and /work/SRC/openSUSE:Factory/.jeuclid.new (New)
Package is "jeuclid"
Tue Oct 17 01:51:12 2017 rev:7 rq:533053 version:3.1.3
Changes:
--- /work/SRC/openSUSE:Factory/jeuclid/jeuclid.changes 2017-09-20
17:10:11.870612471 +0200
+++ /work/SRC/openSUSE:Factory/.jeuclid.new/jeuclid.changes 2017-10-17
01:51:14.810007386 +0200
@@ -1,0 +2,11 @@
+Tue Oct 10 06:21:08 UTC 2017 - fst...@suse.com
+
+- Don't depend on apache-commons-lang that cannot be built with
+ java source and target >= 1.5, but on apache-commons-lang3, that
+ can
+- Added patch:
+ * jeuclid-commons-lang3.patch
+- Check for org.apache.commons.lang3.StringUtils instead of
+ org.apache.commons.lang.StringUtils
+
+---
New:
jeuclid-commons-lang3.patch
Other differences:
--
++ jeuclid.spec ++
--- /var/tmp/diff_new_pack.WNndUo/_old 2017-10-17 01:51:15.641968411 +0200
+++ /var/tmp/diff_new_pack.WNndUo/_new 2017-10-17 01:51:15.641968411 +0200
@@ -36,9 +36,10 @@
Patch1: AppleJavaExtensions.patch
#removes OSX dep for the viewer
Patch2: MacOSX.patch
+Patch3: jeuclid-commons-lang3.patch
BuildRequires: ant
BuildRequires: apache-commons-cli >= 1.1
-BuildRequires: apache-commons-lang
+BuildRequires: apache-commons-lang3
BuildRequires: apache-commons-logging
BuildRequires: batik >= 1.7
BuildRequires: desktop-file-utils
@@ -126,7 +127,7 @@
Requires: %{name} = %{version}
Requires: apache-commons-cli >= 1.1
Requires: apache-commons-io
-Requires: apache-commons-lang
+Requires: apache-commons-lang3
%description cli
JEuclid is a complete MathML rendering solution, consisting of:
@@ -153,11 +154,12 @@
mv NOTICE.unix NOTICE
mkdir lib
-build-jar-repository -s -p lib jcip-annotations commons-logging
xmlgraphics-commons batik-all xmlgraphics-fop.jar commons-cli commons-lang
+build-jar-repository -s -p lib jcip-annotations commons-logging
xmlgraphics-commons batik-all xmlgraphics-fop.jar commons-cli commons-lang3
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
++ build.xml ++
--- /var/tmp/diff_new_pack.WNndUo/_old 2017-10-17 01:51:15.677966725 +0200
+++ /var/tmp/diff_new_pack.WNndUo/_new 2017-10-17 01:51:15.681966537 +0200
@@ -105,11 +105,11 @@
-
-
+
+
-
+
++ jeuclid-commons-lang3.patch ++
--- jeuclid-parent-3.1.3/jeuclid-cli/build.xml 2008-09-24 07:02:58.0
+0200
+++ jeuclid-parent-3.1.3/jeuclid-cli/build.xml 2017-10-10 08:16:22.041856304
+0200
@@ -28,11 +28,11 @@
-
-
+
+
-
+
---
jeuclid-parent-3.1.3/jeuclid-cli/src/main/java/net/sourceforge/jeuclid/app/Mml2xxx.java
2008-09-24 07:02:58.0 +0200
+++
jeuclid-parent-3.1.3/jeuclid-cli/src/main/java/net/sourceforge/jeuclid/app/Mml2xxx.java
2017-10-10 08:18:21.401856755 +0200
@@ -40,7 +40,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
/**
* Utility class to be used from the command line to call the converters.
commit jeuclid for openSUSE:Factory
Hello community,
here is the log from the commit of package jeuclid for openSUSE:Factory checked
in at 2017-09-20 17:10:10
Comparing /work/SRC/openSUSE:Factory/jeuclid (Old)
and /work/SRC/openSUSE:Factory/.jeuclid.new (New)
Package is "jeuclid"
Wed Sep 20 17:10:10 2017 rev:6 rq:527205 version:3.1.3
Changes:
--- /work/SRC/openSUSE:Factory/jeuclid/jeuclid.changes 2016-07-14
09:50:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.jeuclid.new/jeuclid.changes 2017-09-20
17:10:11.870612471 +0200
@@ -1,0 +2,5 @@
+Tue Sep 19 05:36:53 UTC 2017 - fst...@suse.com
+
+- Fix build with jdk9: specify java source and target 6
+
+---
Other differences:
--
++ jeuclid.spec ++
--- /var/tmp/diff_new_pack.w5Ml93/_old 2017-09-20 17:10:13.386399094 +0200
+++ /var/tmp/diff_new_pack.w5Ml93/_new 2017-09-20 17:10:13.386399094 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jeuclid
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
Release:0
Summary:MathML rendering solution
# LGPL-2.1 is for the FreeHEP component only (see LICENSE.FreeHEP)
-License:Apache-2.0 and LGPL-2.1
+License:Apache-2.0 AND LGPL-2.1
Group: Development/Libraries/Java
Url:http://jeuclid.sourceforge.net/index.html
Source0:
http://downloads.sourceforge.net/%{name}/%{name}-parent-%{version}-src.zip
@@ -49,7 +49,6 @@
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: xmlgraphics-commons >= 1.3
-BuildRequires: xmlgraphics-fop
BuildRequires: xmlgraphics-fop >= 0.95
Requires: apache-commons-logging
Requires: batik >= 1.7
@@ -57,7 +56,6 @@
Requires: javapackages-tools
Requires: jcip-annotations
Requires: xmlgraphics-commons >= 1.3
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -200,23 +198,19 @@
%icon_theme_cache_postun
%files
-%defattr(-,root,root,-)
%doc NOTICE LICENSE.txt README.Release jeuclid/LICENSE.FreeHEP
%{_javadir}/%{name}-core.jar
%files mathviewer
-%defattr(-,root,root,-)
%{_javadir}/%{name}-mathviewer.jar
%{_bindir}/jeuclid-mathviewer
%{_datadir}/icons/hicolor/48x48/apps/jeuclid_48x48.png
%{_datadir}/applications/jeuclid-mathviewer.desktop
%files fop
-%defattr(-,root,root,-)
%{_javadir}/%{name}-fop.jar
%files cli
-%defattr(-,root,root,-)
%{_javadir}/%{name}-cli.jar
%{_bindir}/jeuclid-cli
++ build.xml ++
--- /var/tmp/diff_new_pack.w5Ml93/_old 2017-09-20 17:10:13.422394027 +0200
+++ /var/tmp/diff_new_pack.w5Ml93/_new 2017-09-20 17:10:13.422394027 +0200
@@ -122,7 +122,7 @@
-
+
@@ -141,7 +141,7 @@
-
+
@@ -169,7 +169,7 @@
-
+
@@ -195,7 +195,7 @@
-
+
commit jeuclid for openSUSE:Factory
Hello community,
here is the log from the commit of package jeuclid for openSUSE:Factory checked
in at 2016-07-14 09:50:25
Comparing /work/SRC/openSUSE:Factory/jeuclid (Old)
and /work/SRC/openSUSE:Factory/.jeuclid.new (New)
Package is "jeuclid"
Changes:
--- /work/SRC/openSUSE:Factory/jeuclid/jeuclid.changes 2015-03-11
09:57:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.jeuclid.new/jeuclid.changes 2016-07-14
09:50:30.0 +0200
@@ -1,0 +2,9 @@
+Tue Jul 5 18:15:40 UTC 2016 - toddrme2...@gmail.com
+
+- Spec file cleanups:
+ * Expand descriptions and summaries
+ * Change Group tags
+ * Remove some redundant lines.
+ * Remove unnecessary %{release} dependency.
+
+---
Other differences:
--
++ jeuclid.spec ++
--- /var/tmp/diff_new_pack.vlZt5V/_old 2016-07-14 09:50:31.0 +0200
+++ /var/tmp/diff_new_pack.vlZt5V/_new 2016-07-14 09:50:31.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jeuclid
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX 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,9 +20,9 @@
Version:3.1.3
Release:0
Summary:MathML rendering solution
-License:Apache-2.0 and LGPL-2.1
-Group: Development/Libraries
# LGPL-2.1 is for the FreeHEP component only (see LICENSE.FreeHEP)
+License:Apache-2.0 and LGPL-2.1
+Group: Development/Libraries/Java
Url:http://jeuclid.sourceforge.net/index.html
Source0:
http://downloads.sourceforge.net/%{name}/%{name}-parent-%{version}-src.zip
#fedora specific build script based on debian
@@ -61,36 +61,90 @@
BuildArch: noarch
%description
-Core module containing basic JEuclid rendering and document handling classes.
+JEuclid is a complete MathML rendering solution, consisting of:
+
+A MathViewer application
+Command line converters from MathML to other formats
+An ant task for automated conversion
+Display components for AWT, Swing, and SWT
+
+JEuclid features:
+
+Almost complete support for presentation MathML 2.0
+Basic support for content MathML 2.0
+Initial support for the upcoming MathML 3.0
+
+This pacakges contains the core module containing basic JEuclid
+rendering and document handling classes.
%package mathviewer
Summary:Viewer for MathML files
-Group: Applications/Publishing
-Requires: %{name} = %{version}-%{release}
+Group: Productivity/Scientific/Math
+Requires: %{name} = %{version}
Requires: hicolor-icon-theme
%description mathviewer
-The %{name}-mathviewer package contains the Swing MathViewer application.
+JEuclid is a complete MathML rendering solution, consisting of:
+
+A MathViewer application
+Command line converters from MathML to other formats
+An ant task for automated conversion
+Display components for AWT, Swing, and SWT
+
+JEuclid features:
+
+Almost complete support for presentation MathML 2.0
+Basic support for content MathML 2.0
+Initial support for the upcoming MathML 3.0
+
+This pacakges contains the Swing MathViewer application.
%package fop
Summary:JEuclid plug-in for FOP
-Group: Applications/Publishing
-Requires: %{name} = %{version}-%{release}
+Group: Productivity/Scientific/Math
+Requires: %{name} = %{version}
Requires: xmlgraphics-fop >= 0.95
%description fop
-The %{name}-fop package is a jeuclid plug-in for FOP.
+JEuclid is a complete MathML rendering solution, consisting of:
+
+A MathViewer application
+Command line converters from MathML to other formats
+An ant task for automated conversion
+Display components for AWT, Swing, and SWT
+
+JEuclid features:
+
+Almost complete support for presentation MathML 2.0
+Basic support for content MathML 2.0
+Initial support for the upcoming MathML 3.0
+
+This pacakges contains a JEuclid plug-in for
+FOP (Formatting Objects Processor).
%package cli
-Summary:Command line interface for Jeuclid
-Group: Applications/Publishing
-Requires: %{name} = %{version}-%{release}
+Summary:Command line interface for JEuclid
+Group: Productivity/Scientific/Math
+Requires: %{name} = %{version}
Requires: apache-commons-cli >= 1.1
Requires: apache-commons-io
Requires: apache-commons-lang
%description cli
-The %{name}-cli package provides a command line interface for jeuclid
+JEuclid is a complete MathML
commit jeuclid for openSUSE:Factory
Hello community,
here is the log from the commit of package jeuclid for openSUSE:Factory checked
in at 2015-03-11 09:57:55
Comparing /work/SRC/openSUSE:Factory/jeuclid (Old)
and /work/SRC/openSUSE:Factory/.jeuclid.new (New)
Package is jeuclid
Changes:
--- /work/SRC/openSUSE:Factory/jeuclid/jeuclid.changes 2014-06-30
22:49:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.jeuclid.new/jeuclid.changes 2015-03-11
09:57:56.0 +0100
@@ -1,0 +2,5 @@
+Mon Mar 9 09:40:10 UTC 2015 - tchva...@suse.com
+
+- Add extra Categories to desktop file to pass on Factory
+
+---
Other differences:
--
++ jeuclid.spec ++
--- /var/tmp/diff_new_pack.VL2zSx/_old 2015-03-11 09:57:57.0 +0100
+++ /var/tmp/diff_new_pack.VL2zSx/_new 2015-03-11 09:57:57.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package jeuclid
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -137,7 +137,6 @@
desktop-file-install --dir=%{buildroot}/%{_datadir}/applications \
%{SOURCE2}
-%if 0%{?suse_version} = 1140
%post
%desktop_database_post
%icon_theme_cache_post
@@ -145,7 +144,6 @@
%postun
%desktop_database_postun
%icon_theme_cache_postun
-%endif
%files
%defattr(-,root,root,-)
++ jeuclid-mathviewer.desktop ++
--- /var/tmp/diff_new_pack.VL2zSx/_old 2015-03-11 09:57:57.0 +0100
+++ /var/tmp/diff_new_pack.VL2zSx/_new 2015-03-11 09:57:57.0 +0100
@@ -7,4 +7,4 @@
Icon=/usr/share/icons/hicolor/48x48/apps/jeuclid_48x48.png
Terminal=false
Type=Application
-Categories=Education;Science;
+Categories=Education;Math;Science;Math;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jeuclid for openSUSE:Factory
Hello community,
here is the log from the commit of package jeuclid for openSUSE:Factory checked
in at 2014-06-30 22:49:53
Comparing /work/SRC/openSUSE:Factory/jeuclid (Old)
and /work/SRC/openSUSE:Factory/.jeuclid.new (New)
Package is jeuclid
Changes:
--- /work/SRC/openSUSE:Factory/jeuclid/jeuclid.changes 2014-05-28
10:01:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.jeuclid.new/jeuclid.changes 2014-06-30
22:49:55.0 +0200
@@ -1,0 +2,6 @@
+Fri Jun 27 13:58:37 UTC 2014 - tchva...@suse.com
+
+- Cleanup with spec-cleaner a bit.
+- Try to sort out some dependencies to work on SLE11
+
+---
Other differences:
--
++ jeuclid.spec ++
--- /var/tmp/diff_new_pack.Q2z1u9/_old 2014-06-30 22:49:56.0 +0200
+++ /var/tmp/diff_new_pack.Q2z1u9/_new 2014-06-30 22:49:56.0 +0200
@@ -20,9 +20,9 @@
Version:3.1.3
Release:0
Summary:MathML rendering solution
-# LGPL-2.1 is for the FreeHEP component only (see LICENSE.FreeHEP)
License:Apache-2.0 and LGPL-2.1
Group: Development/Libraries
+# LGPL-2.1 is for the FreeHEP component only (see LICENSE.FreeHEP)
Url:http://jeuclid.sourceforge.net/index.html
Source0:
http://downloads.sourceforge.net/%{name}/%{name}-parent-%{version}-src.zip
#fedora specific build script based on debian
@@ -30,39 +30,35 @@
Source2:jeuclid-mathviewer.desktop
Source3:jeuclid-mathviewer.sh
Source4:jeuclid-cli.sh
-
#removes FreeHep support as per the build README, optional feature (not
upstream)
Patch0: jeuclid-core-FreeHep.patch
#Allows for compiling code that uses Apple EAWT without the lib
Patch1: AppleJavaExtensions.patch
#removes OSX dep for the viewer
Patch2: MacOSX.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArch: noarch
-
BuildRequires: ant
BuildRequires: apache-commons-cli = 1.1
BuildRequires: apache-commons-lang
BuildRequires: apache-commons-logging
BuildRequires: batik = 1.7
BuildRequires: desktop-file-utils
-BuildRequires: fop = 0.95
BuildRequires: hicolor-icon-theme
BuildRequires: java-devel
+BuildRequires: javapackages-tools
BuildRequires: jcip-annotations
-BuildRequires: jpackage-utils
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: xmlgraphics-commons = 1.3
BuildRequires: xmlgraphics-fop
-
+BuildRequires: xmlgraphics-fop = 0.95
Requires: apache-commons-logging
Requires: batik = 1.7
Requires: java
+Requires: javapackages-tools
Requires: jcip-annotations
-Requires: jpackage-utils
Requires: xmlgraphics-commons = 1.3
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
%description
Core module containing basic JEuclid rendering and document handling classes.
@@ -80,7 +76,7 @@
Summary:JEuclid plug-in for FOP
Group: Applications/Publishing
Requires: %{name} = %{version}-%{release}
-Requires: fop = 0.95
+Requires: xmlgraphics-fop = 0.95
%description fop
The %{name}-fop package is a jeuclid plug-in for FOP.
@@ -120,34 +116,32 @@
ant compile-core compile-mathviewer compile-cli compile-fop -verbose
%install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
+mkdir -p %{buildroot}%{_javadir}
cp -p target/%{name}-core.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}-core.jar
+%{buildroot}%{_javadir}/%{name}-core.jar
cp -p target/%{name}-fop.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}-fop.jar
+%{buildroot}%{_javadir}/%{name}-fop.jar
cp -p target/%{name}-mathviewer.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}-mathviewer.jar
+%{buildroot}%{_javadir}/%{name}-mathviewer.jar
cp -p target/%{name}-cli.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}-cli.jar
+%{buildroot}%{_javadir}/%{name}-cli.jar
-install -dm 755 $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/jeuclid-mathviewer
-install -pm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/jeuclid-cli
+install -dm 755 %{buildroot}%{_bindir}
+install -pm 755 %{SOURCE3} %{buildroot}%{_bindir}/jeuclid-mathviewer
+install -pm 755 %{SOURCE4} %{buildroot}%{_bindir}/jeuclid-cli
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
-cp -p src/icons/jeuclid_48x48.png
$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
+cp -p src/icons/jeuclid_48x48.png
%{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-desktop-file-install --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
+mkdir -p %{buildroot}/%{_datadir}/applications
+desktop-file-install
