Author: iarnell Update of /cvs/free/rpms/freeguide/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv30579/F-11 Modified Files: .cvsignore sources Added Files: disable-check-for-updates.patch freeguide.desktop freeguide.spec no-jalopy-retroweaver.patch Log Message: initial import disable-check-for-updates.patch: --- NEW FILE disable-check-for-updates.patch --- diff -up freeguide-0.10.10/src/freeguide/plugins/program/freeguide/options/OptionsDialog.java.orig freeguide-0.10.10/src/freeguide/plugins/program/freeguide/options/OptionsDialog.java --- freeguide-0.10.10/src/freeguide/plugins/program/freeguide/options/OptionsDialog.java.orig 2008-01-18 22:32:34.000000000 +0100 +++ freeguide-0.10.10/src/freeguide/plugins/program/freeguide/options/OptionsDialog.java 2009-09-19 12:05:57.000000000 +0200 @@ -185,14 +185,6 @@ public class OptionsDialog extends FGDia trunk.add( browserLeaf ); - panel = new PrivacyOptionPanel( this ); - - DefaultMutableTreeNode privateLeaf = - new DefaultMutableTreeNode( panel ); - panel.construct( ); - - trunk.add( privateLeaf ); - DefaultMutableTreeNode advancedBranch = new DefaultMutableTreeNode( Application.getInstance( ).getLocalizedMessage( "advanced" ) ); diff -up freeguide-0.10.10/src/freeguide/plugins/program/freeguide/viewer/MainController.java.orig freeguide-0.10.10/src/freeguide/plugins/program/freeguide/viewer/MainController.java --- freeguide-0.10.10/src/freeguide/plugins/program/freeguide/viewer/MainController.java.orig 2009-01-16 20:53:57.000000000 +0100 +++ freeguide-0.10.10/src/freeguide/plugins/program/freeguide/viewer/MainController.java 2009-09-19 12:06:11.000000000 +0200 @@ -236,12 +236,6 @@ public class MainController extends Base applicationFrame = mainFrame; - // Check the FreeGuide version - if( !"no".equals( FreeGuide.config.privacyInfo ) ) - { - new VersionCheckerThread( getApplicationFrame( ) ).start( ); - } - //checkForNoData( ); mainFrame.waitForClose( ); diff -up freeguide-0.10.10/src/freeguide/plugins/program/freeguide/wizard/FirstTimeWizard.java.orig freeguide-0.10.10/src/freeguide/plugins/program/freeguide/wizard/FirstTimeWizard.java --- freeguide-0.10.10/src/freeguide/plugins/program/freeguide/wizard/FirstTimeWizard.java.orig 2009-01-14 03:56:11.000000000 +0100 +++ freeguide-0.10.10/src/freeguide/plugins/program/freeguide/wizard/FirstTimeWizard.java 2009-09-19 12:06:24.000000000 +0200 @@ -91,7 +91,6 @@ public class FirstTimeWizard panels.add( createRegionPanel( ) ); panels.add( createWorkingDirectoryPanel( ) ); panels.add( createBrowserPanel( ) ); - panels.add( createPrivacyPanel( ) ); panels.add( createInstallPanel( ) ); wizardFrame = --- NEW FILE freeguide.desktop --- [Desktop Entry] Name=FreeGuide Comment=Download a TV guide from the Internet and view it GenericName=TV Guide Type=Application Categories=Utility;Java;AudioVideo;Video;TV; Exec=freeguide Icon=freeguide --- NEW FILE freeguide.spec --- Name: freeguide Version: 0.10.10 Release: 1%{?dist} Summary: A TV Guide Group: Applications/Multimedia License: GPLv2 URL: http://www.artificialworlds.net/freeguide/Main/HomePage Source0: http://downloads.sourceforge.net/freeguide-tv/freeguide-%{version}.tar.gz Source1: freeguide.desktop # upstream uses jalopy to format sources and retroweaver to allow 1.5 code to # run on 1.4 jre; we don't need (or have) either, so patch them away Patch0: no-jalopy-retroweaver.patch # completely disable the automatic check for updates Patch1: disable-check-for-updates.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils BuildRequires: ant BuildRequires: ant-nodeps BuildRequires: tagsoup BuildRequires: desktop-file-utils Requires(post): jpackage-utils Requires(post): tagsoup Requires: java >= 1:1.6.0 Requires: jpackage-utils Requires: tagsoup Requires: xmltv-gui %description FreeGuide is a TV guide program. It uses parser programs to extract TV information from web pages and stores them for viewing without the need to connect to the Internet. The viewer allows the user to view television listings and create customised TV guides by selecting programmes and by building up a favourites list. It works with listings for many countries. Check the web site freeguide-tv.sf.net for details. %prep %setup -q %patch0 -p1 %patch1 -p1 find . -name '*.jar' -exec rm -f '{}' \; build-jar-repository -s -p lib tagsoup rm -rf xmltv %build ant jars-lin %install rm -rf %{buildroot} ant -Dinstall_bin_dir=%{buildroot}/%{_bindir} \ -Dinstall_share_dir=%{buildroot}/%{_datadir} \ -Dinstall_doc_dir=%{buildroot}/%{_defaultdocdir}/%{name}-%{version} \ -Dinstall_real_dir=%{_datadir}/freeguide \ -Dinstall_real_doc_dir=%{_defaultdocdir}/%{name}-%{version} \ install-linux rm %{buildroot}%{_datadir}/%{name}/lib/tagsoup.jar install -d -m 0755 %{buildroot}%{_javadir}/%{name} for jar in $(find %{buildroot}%{_datadir}/%{name} -type f -name '*.jar'); do mv ${jar} %{buildroot}%{_javadir}/%{name} ln -s %{_javadir}/%{name}/$(basename ${jar}) ${jar} done rm -f %{buildroot}%{_datadir}/%{name}/lib/docs.zip desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} %clean rm -rf %{buildroot} %post build-jar-repository -s -p %{_datadir}/%{name}/lib tagsoup exit 0 %files %defattr(0644,root,root,0755) %doc doc/COPYING doc/html-local/* %attr(0755,root,root) %{_bindir}/%{name} %{_mandir}/man1/%{name}.* %{_javadir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/* %{_datadir}/pixmaps/* %changelog * Sun Sep 13 2009 Iain Arnell <iarnell(a)gmail.com&gt; 0.10.10-1 - initial packaging no-jalopy-retroweaver.patch: --- NEW FILE no-jalopy-retroweaver.patch --- diff -up freeguide-0.10.10/ant/compile.xml.orig freeguide-0.10.10/ant/compile.xml --- freeguide-0.10.10/ant/compile.xml.orig 2008-09-04 02:31:39.000000000 +0200 +++ freeguide-0.10.10/ant/compile.xml 2009-09-13 07:47:22.000000000 +0200 @@ -11,13 +11,6 @@ <target name="jars-win" depends="jars-lin, jar-xmltv-win"/> - <taskdef name="retroweaver" classname="com.rc.retroweaver.ant.RetroWeaverTask"> - <classpath> - <fileset dir="ant/tasks" includes="**/*.jar"/> - <pathelement location="retroweaver-all-1.2.5.jar"/> - </classpath> - </taskdef> - <target name="compile" description="Compile all the .java files into the build dir."> @@ -34,7 +27,6 @@ </classpath> <!-- Uncomment to show warnings <compilerarg value="-Xlint:unchecked"/>--> </javac> - <retroweaver srcdir="${build}/classes" target="1.4"/> </target> <target name="compile-in-place" depends="prepare" diff -up freeguide-0.10.10/ant/prepare.xml.orig freeguide-0.10.10/ant/prepare.xml --- freeguide-0.10.10/ant/prepare.xml.orig 2008-01-18 22:32:31.000000000 +0100 +++ freeguide-0.10.10/ant/prepare.xml 2009-09-13 07:47:13.000000000 +0200 @@ -56,17 +56,4 @@ </target> - <taskdef name="jalopy" classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"> - <classpath> - <fileset dir="ant/tasks" includes="*.jar"/> - </classpath> - </taskdef> - - <target name="format-sources" depends="prepare"> - <jalopy convention="scripts\source_formatting\freeguide-jalopy.xml" encoding="UTF-8" fileformat="UNIX" failOnError="true" loglevel="ERROR"> - <fileset dir="src"> - <include name="**/*.java"/> - </fileset> - </jalopy> - </target> </project> Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/freeguide/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Oct 2009 12:10:26 -0000 1.1 +++ .cvsignore 10 Oct 2009 12:00:13 -0000 1.2 @@ -0,0 +1 @@ +freeguide-0.10.10.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/freeguide/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Oct 2009 12:10:26 -0000 1.1 +++ sources 10 Oct 2009 12:00:13 -0000 1.2 @@ -0,0 +1 @@ +f6b534a0e67191483bb9a65e818a5710 freeguide-0.10.10.tar.gz