rpms/freeguide/devel 0001-disable-check-for-updates.patch, NONE,
1.1 freeguide.spec, 1.2, 1.3 disable-check-for-updates.patch,
1.1, NONE no-jalopy-retroweaver.patch, 1.2, NONE
Iain Arnell
iarnell at rpmfusion.org
Wed Jun 23 08:19:43 CEST 2010
Author: iarnell
Update of /cvs/free/rpms/freeguide/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24409
Modified Files:
freeguide.spec
Added Files:
0001-disable-check-for-updates.patch
Removed Files:
disable-check-for-updates.patch no-jalopy-retroweaver.patch
Log Message:
* Wed Jun 23 2010 Iain Arnell <iarnell at gmail.com> 0.11-1
- update to latest upstream version
- remove no-jalopy-retroweaver patch
- rebase disable-check-for-updates patch
- Americanize spelling in description
0001-disable-check-for-updates.patch:
options/OptionsDialog.java | 8 --------
viewer/MainController.java | 6 ------
wizard/FirstTimeWizard.java | 2 --
3 files changed, 16 deletions(-)
--- NEW FILE 0001-disable-check-for-updates.patch ---
>From e2622d46b6ca8ce2009ce7394588d351a4ed2b18 Mon Sep 17 00:00:00 2001
From: Iain Arnell <iarnell at gmail.com>
Date: Wed, 23 Jun 2010 07:47:45 +0200
Subject: [PATCH] disable check for updates
---
.../program/freeguide/options/OptionsDialog.java | 8 --------
.../program/freeguide/viewer/MainController.java | 6 ------
.../program/freeguide/wizard/FirstTimeWizard.java | 1 -
3 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/src/freeguide/plugins/program/freeguide/options/OptionsDialog.java b/src/freeguide/plugins/program/freeguide/options/OptionsDialog.java
index 3f255c6..dcecbc8 100644
--- a/src/freeguide/plugins/program/freeguide/options/OptionsDialog.java
+++ b/src/freeguide/plugins/program/freeguide/options/OptionsDialog.java
@@ -181,14 +181,6 @@ public class OptionsDialog extends FGDialog implements TreeSelectionListener,
trunk.add( horzViewer );
- OptionPanel panel = new PrivacyOptionPanel( this );
-
- DefaultMutableTreeNode privateLeaf =
- new DefaultMutableTreeNode( panel );
- panel.construct( );
-
- trunk.add( privateLeaf );
-
DefaultMutableTreeNode advancedBranch =
new DefaultMutableTreeNode(
Application.getInstance( ).getLocalizedMessage( "advanced" ) );
diff --git a/src/freeguide/plugins/program/freeguide/viewer/MainController.java b/src/freeguide/plugins/program/freeguide/viewer/MainController.java
index 372bb9f..e441fdc 100644
--- a/src/freeguide/plugins/program/freeguide/viewer/MainController.java
+++ b/src/freeguide/plugins/program/freeguide/viewer/MainController.java
@@ -236,12 +236,6 @@ public class MainController extends BaseModule implements IApplication
applicationFrame = mainFrame;
- // Check the FreeGuide version
- if( !"no".equals( FreeGuide.config.privacyInfo ) )
- {
- new VersionCheckerThread( getApplicationFrame( ) ).start( );
- }
-
//checkForNoData( );
mainFrame.waitForClose( );
diff --git a/src/freeguide/plugins/program/freeguide/wizard/FirstTimeWizard.java b/src/freeguide/plugins/program/freeguide/wizard/FirstTimeWizard.java
index 8ed4f9d..94e7dcf 100644
--- a/src/freeguide/plugins/program/freeguide/wizard/FirstTimeWizard.java
+++ b/src/freeguide/plugins/program/freeguide/wizard/FirstTimeWizard.java
@@ -86,7 +86,6 @@ public class FirstTimeWizard
panels.add( createFirstPanel( upgrade ) );
panels.add( createRegionPanel( ) );
panels.add( createWorkingDirectoryPanel( ) );
- panels.add( createPrivacyPanel( ) );
panels.add( createInstallPanel( ) );
wizardFrame =
--
1.7.0.1
Index: freeguide.spec
===================================================================
RCS file: /cvs/free/rpms/freeguide/devel/freeguide.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freeguide.spec 11 Dec 2009 17:09:38 -0000 1.2
+++ freeguide.spec 23 Jun 2010 06:19:42 -0000 1.3
@@ -1,5 +1,5 @@
Name: freeguide
-Version: 0.10.12
+Version: 0.11
Release: 1%{?dist}
Summary: A TV Guide
@@ -8,10 +8,8 @@
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; we don't have it so patch it away
-Patch0: no-jalopy-retroweaver.patch
# completely disable the automatic check for updates
-Patch1: disable-check-for-updates.patch
+Patch0: 0001-disable-check-for-updates.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -23,14 +21,14 @@
Requires: java >= 1:1.6.0
Requires: jpackage-utils
-Requires: xmltv-gui
+Requires: xmltv 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.
+and create customized TV guides by selecting programs and by building up a
+favorites list.
It works with listings for many countries. Check the web site
freeguide-tv.sf.net for details.
@@ -39,14 +37,13 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
find . -name '*.jar' -exec rm -f '{}' \;
rm -rf xmltv
%build
-ant jars-lin
+ant jar
%install
@@ -56,7 +53,7 @@
-Dinstall_doc_dir=%{buildroot}/%{_defaultdocdir}/%{name}-%{version} \
-Dinstall_real_dir=%{_datadir}/freeguide \
-Dinstall_real_doc_dir=%{_defaultdocdir}/%{name}-%{version} \
- install-linux
+ install
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
for jar in $(find %{buildroot}%{_datadir}/%{name} -type f -name '*.jar'); do
@@ -64,7 +61,7 @@
ln -s %{_javadir}/%{name}/$(basename ${jar}) ${jar}
done
-rm -f %{buildroot}%{_datadir}/%{name}/lib/docs.zip
+rm -rf %{buildroot}%{_defaultdocdir}/%{name}
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
@@ -76,7 +73,7 @@
%files
%defattr(0644,root,root,0755)
-%doc doc/COPYING doc/html-local/*
+%doc doc/COPYING doc-bin/*
%attr(0755,root,root) %{_bindir}/%{name}
%{_mandir}/man1/%{name}.*
%{_javadir}/%{name}
@@ -86,6 +83,12 @@
%changelog
+* Wed Jun 23 2010 Iain Arnell <iarnell at gmail.com> 0.11-1
+- update to latest upstream version
+- remove no-jalopy-retroweaver patch
+- rebase disable-check-for-updates patch
+- Americanize spelling in description
+
* Fri Dec 11 2009 Iain Arnell <iarnell at gmail.com> 0.10.12-1
- update to latest upstream version
--- disable-check-for-updates.patch DELETED ---
--- no-jalopy-retroweaver.patch DELETED ---
More information about the rpmfusion-commits
mailing list