From 90e08906b9939ea2e328b87bc3a80c4b2431197c Mon Sep 17 00:00:00 2001 From: Sergey Zhemoitel Date: Wed, 8 Apr 2015 00:06:30 +0300 Subject: [PATCH] Update to 1.0.1 --- .abf.yml | 3 +- freemind.spec | 321 ++++++++------------------------------------------ 2 files changed, 54 insertions(+), 270 deletions(-) diff --git a/.abf.yml b/.abf.yml index 751223f..246da9b 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,3 @@ sources: - "freemind-src-0.9.0_RC_6.tar.gz": 81691b0175f9ea27ff503b964794c789803d3d8a + freemind-src-0.9.0_RC_6.tar.gz: 81691b0175f9ea27ff503b964794c789803d3d8a + freemind-src-1.0.1.tar.gz: 8a1aef0ad49f53d22e5a40ce3f73ae75fa7daa8e diff --git a/freemind.spec b/freemind.spec index c13daca..db0f4ee 100644 --- a/freemind.spec +++ b/freemind.spec @@ -1,30 +1,34 @@ -%define section free -%define gcj_support 0 +%define section free +%define gcj_support 0 Name: freemind -Version: 0.9.0 -Release: %mkrel 0.0.11 -Epoch: 1 +Version: 1.0.1 +Release: 1 +#Epoch: 1 Summary: Free mind mapping software License: GPL URL: http://freemind.sourceforge.net/ Group: Development/Java -Source0: http://downloads.sourceforge.net/sourceforge/freemind/freemind-src-0.9.0_RC_6.tar.gz -Source1: freemind.desktop -Source2: freemind.sh -Source3: freemind.xml -Source4: freemind-bindings.patch -Patch0: freemind-patch-bindings.patch -Patch1: freemind-fix-hyperlink-function.patch -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-src-%{version}.tar.gz +Source1: %{name}.desktop +Source2: %{name}.sh +Source3: %{name}.xml +Source4: %{name}-bindings.patch +Source5: build.xml.new +Patch0: %{name}-patch-bindings.patch +Patch1: %{name}-fix-hyperlink-function.patch +Patch5: %{name}-build.patch +Patch6: build.xml.patch + +#Requires(post): desktop-file-utils +#Requires(postun): desktop-file-utils Requires: firefox Requires: crimson Requires: simplyhtml Requires: jakarta-commons-lang Requires: jakarta-oro Requires: jgoodies-forms -Requires: jibx +#Requires: jibx Requires: echomine-muse Requires: javahelp2 Requires: batik @@ -43,13 +47,13 @@ BuildRequires: jakarta-oro BuildRequires: jgoodies-forms BuildRequires: junit BuildRequires: jarbundler -BuildRequires: jibx +#BuildRequires: jibx BuildRequires: echomine-muse BuildRequires: javahelp2 BuildRequires: batik BuildRequires: batik-squiggle BuildRequires: fop -BuildRequires: xsd2jibx +#BuildRequires: xsd2jibx %if %{gcj_support} BuildRequires: java-gcj-compat-devel %else @@ -84,187 +88,54 @@ Group: Development/Java Javadoc for %{name}. %prep -%setup -q -c -%patch1 -p0 -find . -name '*.jar' | xargs -t %{__rm} -pushd freemind -#%{__cp} -a %{SOURCE4} . -#%patch0 -p1 -%{__perl} -pi -e 's/^Class-Path:.*\n//' MANIFEST.MF -%{__perl} -pi -e 's/^properties_folder = freemind$/properties_folder = .freemind/;' \ - -e 's|\./|file://%{_datadir}/%{name}/|g;' \ - -e 's|mozilla|firefox|;' \ - freemind.properties +rm -rf %{buildroot} +%setup -q -n %{name} -pushd lib/SimplyHTML -%{__ln_s} $(build-classpath simplyhtml) SimplyHTML.jar -%{__ln_s} $(build-classpath gnu-regexp) gnu-regexp-1.1.4.jar -popd +%patch6 -p0 -pushd lib -%{__ln_s} $(build-classpath commons-lang) commons-lang-2.0.jar -%{__ln_s} $(build-classpath jgoodies-forms) forms-1.0.5.jar -%{__ln_s} $(build-classpath junit) junit.jar -%{__ln_s} $(build-classpath jarbundler) jarbundler-2.0.0.jar -popd - -pushd lib/jibx -%{__ln_s} $(build-classpath bcel) bcel.jar -%{__ln_s} $(build-classpath commons-logging) commons-logging-1.0.4.jar -%{__ln_s} $(build-classpath jaxme/ws-jaxmejs) jaxme-js-0.3.jar -%{__ln_s} $(build-classpath log4j) log4j-1.2.8.jar -%{__ln_s} $(build-classpath xpp3) xpp3.jar -%{__ln_s} $(build-classpath jibx/bind) jibx-bind.jar -%{__ln_s} $(build-classpath jibx/extras) jibx-extras.jar -%{__ln_s} $(build-classpath jibx/run) jibx-run.jar -%{__ln_s} $(build-classpath xsd2jibx) xsd2jibx.jar -popd - -pushd plugins/collaboration/jabber -%{__ln_s} $(build-classpath commons-logging) commons-logging.jar -%{__ln_s} $(build-classpath crimson) crimson-1.1.3.jar -%{__ln_s} $(build-classpath oro) jakarta-oro.jar -%{__ln_s} $(build-classpath jaxp) jaxp-1.1.jar -%{__ln_s} $(build-classpath jdom) jdom.jar -%{__ln_s} $(build-classpath log4j) log4j.jar -%{__ln_s} $(build-classpath muse) muse.jar -popd - -pushd plugins/help -%{__ln_s} $(build-classpath javahelp2) jhall.jar -popd - -pushd plugins/latex -# FIXME: non-free HotEqn.jar -popd - -pushd plugins/script -# FIXME: not in mdv (requires maven to build) groovy-all-1.5.6.jar -popd - -pushd plugins/svg -%{__ln_s} $(build-classpath batik-all) batik-awt-util.jar -%{__ln_s} $(build-classpath batik-all) batik-bridge.jar -%{__ln_s} $(build-classpath batik-all) batik-css.jar -%{__ln_s} $(build-classpath batik-all) batik-dom.jar -%{__ln_s} $(build-classpath batik-all) batik-ext.jar -%{__ln_s} $(build-classpath batik-all) batik-extension.jar -%{__ln_s} $(build-classpath batik-all) batik-gui-util.jar -%{__ln_s} $(build-classpath batik-all) batik-gvt.jar -%{__ln_s} $(build-classpath batik-all) batik-parser.jar -%{__ln_s} $(build-classpath batik-all) batik-script.jar -%{__ln_s} $(build-classpath batik-squiggle) batik-squiggle.jar -%{__ln_s} $(build-classpath batik-all) batik-svg-dom.jar -%{__ln_s} $(build-classpath batik-all) batik-svggen.jar -%{__ln_s} $(build-classpath batik-all) batik-swing.jar -%{__ln_s} $(build-classpath batik-all) batik-transcoder.jar -%{__ln_s} $(build-classpath batik-all) batik-util.jar -%{__ln_s} $(build-classpath batik-all) batik-xml.jar -%{__ln_s} $(build-classpath rhino) js.jar -%{__ln_s} $(build-classpath pdf-transcoder) pdf-transcoder.jar -%{__ln_s} $(build-classpath xerces-j2) xerces_2_5_0.jar -%{__ln_s} $(build-classpath xml-commons-apis) xml-apis.jar -popd - -JARS=`%{_bindir}/find . ! -type l -name '*.jar'` -test -z "$JARS" || exit 1 - -# FIXME: non-free HotEqn.jar -%{__rm} -r plugins/latex -# FIXME: missing groovy-1.5.6 -%{__rm} -r plugins/script -popd %build -pushd freemind -export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/nodeps` `%{__cat} %{_sysconfdir}/ant.d/trax`" -export CLASSPATH=$(build-classpath avalon-framework) -%{ant} all doc -popd +chmod +x ./check_for_duplicate_resources.sh + +export LC_ALL=en_US.UTF-8 + +ant all doc %install %{__rm} -rf %{buildroot} -# jars -%{__mkdir_p} %{buildroot}%{_javadir} -%{__cp} -a bin/dist/lib/freemind.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -%{__cp} -a bin/dist/lib/bindings.jar %{buildroot}%{_javadir}/%{name}-bindings-%{version}.jar -%{__cp} -a bin/dist/browser/freemindbrowser.jar %{buildroot}%{_javadir}/%{name}browser-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done) - -# javadoc -%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__cp} -a bin/dist/doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -(cd %{buildroot}%{_javadocdir} && %{__ln_s} %{name}-%{version} %{name}) - -# scripts -%{__mkdir_p} %{buildroot}%{_bindir} -%{__cp} -a %{SOURCE2} %{buildroot}%{_bindir}/%{name} - -# data -%{__mkdir_p} %{buildroot}%{_datadir}/%{name} -%{__cp} -a bin/dist/* %{buildroot}%{_datadir}/%{name}/ - -# install .destop file desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1} %{__mkdir_p} %{buildroot}%{_datadir}/pixmaps -%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps -%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps -%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps +%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48}/apps -pushd freemind +#pushd freemind %{_bindir}/convert -scale 32 images/FreeMindWindowIcon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png %{_bindir}/convert -scale 16 images/FreeMindWindowIcon.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_bindir}/convert -scale 32 images/FreeMindWindowIcon.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_bindir}/convert -scale 48 images/FreeMindWindowIcon.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png -popd +#popd %{__mkdir_p} %{buildroot}%{_datadir}/mime/packages %{__cp} -a %{SOURCE3} %{buildroot}%{_datadir}/mime/packages/ -pushd %{buildroot}%{_datadir}/%{name} -%{__rm} freemind.bat -%{__rm} FreeMind.exe -%{__rm} freemind.sh -%{__rm} -r doc/javadoc -%{__ln_s}f %{_javadocdir}/%{name} doc/javadoc -%{__ln_s}f %{_javadir}/freemindbrowser.jar browser/freemindbrowser.jar -%{__ln_s}f %{_javadir}/freemind.jar lib/freemind.jar -%{__ln_s}f $(build-classpath jgoodies-forms) lib/forms-1.0.5.jar -%{__ln_s}f $(build-classpath simplyhtml) lib/SimplyHTML/SimplyHTML.jar -%{__ln_s}f $(build-classpath gnu-regexp) lib/SimplyHTML/gnu-regexp-1.1.4.jar -%{__ln_s}f %{_javadir}/freemind-bindings.jar lib/bindings.jar -%{__ln_s}f $(build-classpath xpp3) lib/jibx/xpp3.jar -%{__ln_s}f $(build-classpath jibx/run) lib/jibx/jibx-run.jar -%{__ln_s}f $(build-classpath commons-lang) lib/commons-lang-2.0.jar -%{__ln_s}f $(build-classpath javahelp2) plugins/help/jhall.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-awt-util.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-xml.jar -%{__ln_s}f $(build-classpath xml-commons-apis) plugins/svg/xml-apis.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-svg-dom.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-transcoder.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-bridge.jar -%{__ln_s}f $(build-classpath batik-squiggle) plugins/svg/batik-squiggle.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-dom.jar -%{__ln_s}f $(build-classpath xerces-j2) plugins/svg/xerces_2_5_0.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-util.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-swing.jar -%{__ln_s}f $(build-classpath rhino) plugins/svg/js.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-parser.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-css.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-extension.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-svggen.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-ext.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-gui-util.jar -%{__ln_s}f $(build-classpath pdf-transcoder) plugins/svg/pdf-transcoder.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-gvt.jar -%{__ln_s}f $(build-classpath batik-all) plugins/svg/batik-script.jar -JARS=`%{_bindir}/find . ! -type l -name '*.jar' -a ! -name '*_plugin.jar'` -test -z "$JARS" || exit 1 -EXES=`%{_bindir}/find . -name '*.exe' -o -name '*.bat' -o -name '*.sh'` -test -z "$EXES" || exit 1 -popd +%{__rm} bin/dist/*.bat +%{__rm} bin/dist/*.exe + +mkdir -p %{buildroot}{%{_bindir},%{_datadir},%{_docdir}} +mkdir -p %{buildroot}%{_datadir}/%{name} + +cp -R bin/dist/* %{buildroot}%{_datadir}/%{name} + +#chmod +x {buildroot}{_datadir}/{name}/{name}.sh +#{__ln_s}f ../share/{name}/{name}.sh {buildroot}{_bindir}/{name} +%{__ln_s}f ../%{name}/doc %{buildroot}%{_docdir}/%{name} + +install -Dm0644 license readme.txt history.txt %{buildroot}%{_docdir}/%{name} +install -Dm0755 bin/dist/%{name}.sh %{buildroot}/%{_bindir}/%{name} + +%{__rm} bin/dist/*.sh + %if %{gcj_support} %{_bindir}/aot-compile-rpm @@ -291,7 +162,7 @@ popd %files %defattr(0644,root,root,0755) -%doc freemind/history.txt freemind/license freemind/readme.txt +#doc history.txt license readme.txt %attr(0755,root,root) %{_bindir}/%{name} %{_datadir}/applications/*%{name}.desktop %{_datadir}/mime/packages/%{name}.xml @@ -299,13 +170,8 @@ popd %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png -%{_javadir}/freemind.jar -%{_javadir}/freemind-%{version}.jar -%{_javadir}/freemind-bindings.jar -%{_javadir}/freemind-bindings-%{version}.jar -%{_javadir}/freemindbrowser.jar -%{_javadir}/freemindbrowser-%{version}.jar %{_datadir}/%{name} + %if %{gcj_support} %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/*.jar.* @@ -313,89 +179,6 @@ popd %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} - +%{_docdir}/%{name} %changelog -* Thu Sep 08 2011 Sergey Zhemoitel 1:0.9.0-0.0.11mdv2012.0 -+ Revision: 699012 -- add russian comment in .desktop file - -* Sun Dec 05 2010 Oden Eriksson 1:0.9.0-0.0.10mdv2011.0 -+ Revision: 610759 -- rebuild - -* Wed Jan 27 2010 Ahmad Samir 1:0.9.0-0.0.9mdv2010.1 -+ Revision: 497020 -- add 'text/x-troff-mm' mimetype - -* Tue Jan 12 2010 Rémy Clouard 1:0.9.0-0.0.8mdv2010.1 -+ Revision: 490015 -- wipe out unneeded patch -- disable temporarily broken function -- fix jarbundler issue -- try to fix jarbundler path -- drop wrong source file -- comment unappliable patch -- activate --execdebug for ant - - + Sandro Cazzaniga - - upgrade to 0.9.0 RC6 - -* Thu Sep 03 2009 Thierry Vignaud 1:0.9.0-0.0.7mdv2010.0 -+ Revision: 428889 -- rebuild - - + Oden Eriksson - - lowercase ImageMagick - -* Mon Aug 11 2008 David Walluck 1:0.9.0-0.0.6mdv2009.0 -+ Revision: 270875 -- fix %%doc -- 0.9.0 Beta 19 - -* Fri Feb 01 2008 David Walluck 1:0.9.0-0.0.5mdv2008.1 -+ Revision: 161225 -- add gnu-regexp and simplyhtml to CLASSPATH - -* Sun Dec 30 2007 David Walluck 1:0.9.0-0.0.4mdv2008.1 -+ Revision: 139453 -- don't ship javadoc in the main package - -* Sun Dec 30 2007 David Walluck 1:0.9.0-0.0.3mdv2008.1 -+ Revision: 139394 -- fix jakarta-oro -- bindings.jar is removed and then patched -- add sources -- fix macro -- 0.9.0-beta15 - - + Olivier Blin - - restore BuildRoot - - + Thierry Vignaud - - kill re-definition of %%buildroot on Pixel's request - - + Anssi Hannula - - buildrequire java-rpmbuild, i.e. build with icedtea on x86(_64) - -* Sat Sep 15 2007 Anssi Hannula 1:0.7.1-2mdv2008.0 -+ Revision: 87375 -- rebuild to filter out autorequires of GCJ AOT objects -- remove unnecessary Requires(post) on java-gcj-compat - -* Mon Sep 10 2007 David Walluck 1:0.7.1-1mdv2008.0 -+ Revision: 83973 -- bump epoch and change to real version 0.7.1 -- use 0.7.1 tagged CVS source -- fix javadoc Group -- fix javadoc build with sijdoc -- add vendor to dekstop file -- remove %%ghost from %%dir %%{_javadocdir}/%%{name} -- don't force CVS dir removal -- remove Application category from desktop file - - + Per Øyvind Karlsen - - do not force usage of jamvm (which is also broken on i586..) -