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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jeuclid.new/jeuclid.changes 2014-06-30 22:49:55.000000000 +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.000000000 +0200 +++ /var/tmp/diff_new_pack.Q2z1u9/_new 2014-06-30 22:49:56.000000000 +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 --dir=%{buildroot}/%{_datadir}/applications \ %{SOURCE2} %if 0%{?suse_version} >= 1140 %post %desktop_database_post %icon_theme_cache_post -%endif -%if 0%{?suse_version} >= 1140 %postun %desktop_database_postun %icon_theme_cache_postun -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
