rpms/freeguide/F-12 .cvsignore, 1.2, 1.3 freeguide.spec, 1.1, 1.2 no-jalopy-retroweaver.patch, 1.1, 1.2 sources, 1.2, 1.3

[Iain Arnell]

Author: iarnell

Update of /cvs/free/rpms/freeguide/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12529

Modified Files:
	.cvsignore freeguide.spec no-jalopy-retroweaver.patch sources 
Log Message:
* Fri Dec 11 2009 Iain Arnell <iarnell at gmail.com> 0.10.12-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/freeguide/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Oct 2009 12:00:13 -0000	1.2
+++ .cvsignore	12 Dec 2009 07:08:03 -0000	1.3
@@ -1 +1 @@
-freeguide-0.10.10.tar.gz
+freeguide-0.10.12.tar.gz


Index: freeguide.spec
===================================================================
RCS file: /cvs/free/rpms/freeguide/F-12/freeguide.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeguide.spec	10 Oct 2009 12:00:13 -0000	1.1
+++ freeguide.spec	12 Dec 2009 07:08:03 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           freeguide
-Version:        0.10.10
+Version:        0.10.12
 Release:        1%{?dist}
 Summary:        A TV Guide
 
@@ -8,8 +8,7 @@
 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
+# 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
@@ -20,15 +19,10 @@
 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
@@ -48,7 +42,6 @@
 %patch1 -p1
 
 find . -name '*.jar' -exec rm -f '{}' \;
-build-jar-repository -s -p lib tagsoup
 
 rm -rf xmltv
 
@@ -65,8 +58,6 @@
     -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}
@@ -83,11 +74,6 @@
 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/*
@@ -100,6 +86,9 @@
 
 
 %changelog
+* Fri Dec 11 2009 Iain Arnell <iarnell at gmail.com> 0.10.12-1
+- update to latest upstream version
+
 * Sun Sep 13 2009 Iain Arnell <iarnell at gmail.com> 0.10.10-1
 - initial packaging
 

no-jalopy-retroweaver.patch:

Index: no-jalopy-retroweaver.patch
===================================================================
RCS file: /cvs/free/rpms/freeguide/F-12/no-jalopy-retroweaver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- no-jalopy-retroweaver.patch	10 Oct 2009 12:00:13 -0000	1.1
+++ no-jalopy-retroweaver.patch	12 Dec 2009 07:08:03 -0000	1.2
@@ -1,46 +1,15 @@
-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 @@
+diff -up freeguide-0.10.12/ant/prepare.xml.orig freeguide-0.10.12/ant/prepare.xml
+--- freeguide-0.10.12/ant/prepare.xml.orig	2009-11-19 02:12:44.000000000 +0100
++++ freeguide-0.10.12/ant/prepare.xml	2009-12-11 18:03:03.000000000 +0100
+@@ -51,11 +51,4 @@
+         fork="true"/>
      </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: sources
===================================================================
RCS file: /cvs/free/rpms/freeguide/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Oct 2009 12:00:13 -0000	1.2
+++ sources	12 Dec 2009 07:08:03 -0000	1.3
@@ -1 +1 @@
-f6b534a0e67191483bb9a65e818a5710  freeguide-0.10.10.tar.gz
+9bc51dda18506794da8021e98e52305f  freeguide-0.10.12.tar.gz