Hello community, here is the log from the commit of package tvbrowser for openSUSE:Factory checked in at 2014-02-11 11:03:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tvbrowser (Old) and /work/SRC/openSUSE:Factory/.tvbrowser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tvbrowser" Changes: -------- --- /work/SRC/openSUSE:Factory/tvbrowser/tvbrowser.changes 2013-11-23 08:18:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tvbrowser.new/tvbrowser.changes 2014-02-11 11:03:53.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Feb 8 16:39:25 UTC 2014 - [email protected] + +- actually build from source + +------------------------------------------------------------------- Old: ---- tvbrowser_3.3.3_bin.tar.gz New: ---- NewsPlugin.jar tvbrowser_3.3.3_src.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tvbrowser.spec ++++++ --- /var/tmp/diff_new_pack.Equzo0/_old 2014-02-11 11:03:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Equzo0/_new 2014-02-11 11:03:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tvbrowser # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,12 +24,19 @@ Release: 0 Requires: java >= 1.6 Url: http://tv-browser.org -Source0: http://downloads.sourceforge.net/project/tvbrowser/TV-Browser%20Releases%20%28Java%206%20and%20higher%29/%{version}/%{name}_%{version}_bin.tar.gz +Source: http://downloads.sourceforge.net/project/tvbrowser/TV-Browser%20Releases%20%28Java%206%20and%20higher%29/%{version}/%{name}_%{version}_src.zip +# TODO build from source, too +Source2: http://www.tvbrowser.org/data/uploads/1372016422809_543/NewsPlugin.jar +BuildRequires: ant +BuildRequires: ant-junit BuildRequires: dos2unix +BuildRequires: fdupes +BuildRequires: hicolor-icon-theme +BuildRequires: java-devel +BuildRequires: jpackage-utils BuildRequires: optipng +BuildRequires: unzip BuildRequires: update-desktop-files -# needed for expanding %%icon_theme_cache_post in %%post/un -BuildRequires: gtk3-tools BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -37,23 +44,25 @@ TV-Browser is Plugin based digital TV guide. Plugins can be installed with the download function of TV-Browser. - %prep +cp %{S:2} . %setup -q -dos2unix LICENSE.txt +dos2unix src/LICENSE.txt find -name "*.png" | while read a; do optipng -o 5 "$a" || optipng -o 5 -fix "$a" done %build +%ant runtime-linux -Dnewsplugin.url=file:///%{_sourcedir}/NewsPlugin.jar + cat >tvbrowser <<'EOF' #!/bin/sh -cd %{_datadir}/%{name} && \ +cd %{_javadir}/%{name}/ && \ exec %{_bindir}/java \ -Xms16m \ -Xmx128m \ - -Djava.library.path=%{_datadir}/%{name} \ + -Djava.library.path=%{_javadir}/%{name} \ -Dpropertiesfile=linux.properties \ -jar tvbrowser.jar \ "$@" @@ -61,21 +70,31 @@ %install export NO_BRP_CHECK_BYTECODE_VERSION="true" + install -D -p -m 755 tvbrowser %{buildroot}%{_bindir}/tvbrowser -for file in tvbrowser.jar; do - install -D -p -m 644 ${file} %{buildroot}%{_datadir}/%{name}/${file} -done -find hyphen icons imgs personas plugins themepacks -depth -print | \ - cpio -p -d -m %{buildroot}%{_datadir}/%{name} + +mkdir -p %{buildroot}%{_javadir}/%{name}/ +cp -r runtime/tvbrowser_linux/* %{buildroot}%{_javadir}/%{name}/ + for size in 16 32 48 128; do ( install -d %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/ cd %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/ - ln -s ../../../../tvbrowser/imgs/tvbrowser${size}.png tvbrowser.png + ln -s %{_javadir}/%{name}/imgs/tvbrowser${size}.png tvbrowser.png ) done + %suse_update_desktop_file -c tvbrowser TV-Browser 'Digital TV Guide' tvbrowser tvbrowser AudioVideo TV Java +%fdupes %{buildroot}%{_javadir} + +# TODO: JUnit is causing trouble +#%check +#%ant test + +%clean +%ant clean + %post %desktop_database_post %icon_theme_cache_post @@ -86,9 +105,9 @@ %files %defattr(-,root,root,-) -%doc COPYRIGHT.txt LICENSE.txt +%doc ChangeLog.txt %{_bindir}/tvbrowser -%{_datadir}/%{name} +%{_javadir}/%{name} %{_datadir}/applications/tvbrowser.desktop %{_datadir}/icons/hicolor/*/apps/tvbrowser.png -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
