rpms/mythtv-themes/devel myththemes-0.24-fixes.patch, NONE, 1.1 mythtv-themes.spec, 1.28, 1.29 sources, 1.23, 1.24

Jarod Wilson jarod at rpmfusion.org
Mon Mar 21 01:10:39 CET 2011


Author: jarod

Update of /cvs/free/rpms/mythtv-themes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13284

Modified Files:
	mythtv-themes.spec sources 
Added Files:
	myththemes-0.24-fixes.patch 
Log Message:
* Sun Jan 16 2011 Jarod Wilson <jarod at wilsonet.com> 0.24-2
- Update to 0.24 fixes, git revision 945c67317


myththemes-0.24-fixes.patch:
 menu-ui.xml   |   25 +++++++++++++++++++++++++
 osd.xml       |   14 +++++++-------
 themeinfo.xml |    2 +-
 3 files changed, 33 insertions(+), 8 deletions(-)

--- NEW FILE myththemes-0.24-fixes.patch ---
diff -Naurp myththemes-0.24.orig/metallurgy/menu-ui.xml myththemes-0.24.fixes/metallurgy/menu-ui.xml
--- myththemes-0.24.orig/metallurgy/menu-ui.xml	2010-10-12 15:44:18.000000000 -0400
+++ myththemes-0.24.fixes/metallurgy/menu-ui.xml	2010-12-01 09:23:53.000000000 -0500
@@ -135,6 +135,31 @@
                     <value>Search Lists</value>
                 </textarea>
             </state>
+            <state name="TV">
+                <textarea name="title" from="baseheading">
+                    <value>TV</value>
+                </textarea>
+            </state>
+            <state name="VIDEO">
+                <textarea name="title" from="baseheading">
+                    <value>Videos</value>
+                </textarea>
+            </state>
+            <state name="NETVISION">
+                <textarea name="title" from="baseheading">
+                    <value>Internet Video</value>
+                </textarea>
+            </state>
+            <state name="ARCHIVEUTILS">
+                <textarea name="title" from="baseheading">
+                    <value>Archive Utilities</value>
+                </textarea>
+            </state>
+            <state name="SETUP_TVRECPRIORITIES">
+                <textarea name="title" from="baseheading">
+                    <value>Recording Priorities</value>
+                </textarea>
+            </state>
         </statetype>
 
         <buttonlist name="menu">
diff -Naurp myththemes-0.24.orig/metallurgy/osd.xml myththemes-0.24.fixes/metallurgy/osd.xml
--- myththemes-0.24.orig/metallurgy/osd.xml	2010-11-04 09:54:31.000000000 -0400
+++ myththemes-0.24.fixes/metallurgy/osd.xml	2010-12-01 09:23:53.000000000 -0500
@@ -65,40 +65,40 @@
         <area>0,480,1280,240</area>
 
         <imagetype name="background">
-            <area>0,480,1280,240</area>
+            <area>0,0,1280,240</area>
             <filename>osd/background.png</filename>
         </imagetype>
 
         <textarea name="title">
-            <area>185,510,830,38</area>
+            <area>185,30,830,38</area>
             <font>extralarge</font>
         </textarea>
 
         <textarea name="description">
             <multiline>yes</multiline>
-            <area>185,585,1054,130</area>
+            <area>185,105,1054,130</area>
             <font>medium</font>
             <template>%"|SUBTITLE|" %%DESCRIPTION%</template>
         </textarea>
 
         <textarea name="starttime">
-            <area>185,551,880,25</area>
+            <area>185,71,880,25</area>
             <font>smallgrey</font>
             <template>(%STARTTIME% - %ENDTIME%) %LENMINS%</template>
         </textarea>
 
         <imagetype name="channelicon">
-            <area>46,520,120,90</area>
+            <area>46,40,120,90</area>
         </imagetype>
 
         <textarea name="time">
-            <area>1034,510,200,40</area>
+            <area>1034,30,200,40</area>
             <font>medium</font>
             <align>right</align>
         </textarea>
 
         <textarea name="channum">
-            <area>46,635,120,30</area>
+            <area>46,155,120,30</area>
             <font>extralarge</font>
             <align>hcenter</align>
         </textarea>
diff -Naurp myththemes-0.24.orig/metallurgy/themeinfo.xml myththemes-0.24.fixes/metallurgy/themeinfo.xml
--- myththemes-0.24.orig/metallurgy/themeinfo.xml	2010-08-28 16:16:22.000000000 -0400
+++ myththemes-0.24.fixes/metallurgy/themeinfo.xml	2010-12-01 09:23:53.000000000 -0500
@@ -17,7 +17,7 @@
 
     <version>
         <major>1</major>
-        <minor>1</minor>
+        <minor>2</minor>
     </version>
 
     <detail>


Index: mythtv-themes.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/mythtv-themes.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mythtv-themes.spec	2 Sep 2010 01:49:33 -0000	1.28
+++ mythtv-themes.spec	21 Mar 2011 00:10:39 -0000	1.29
@@ -16,9 +16,10 @@
 # The vendor name we should attribute the aforementioned entries to
 %define desktop_vendor  RPMFusion
 
-# SVN Revision number and branch ID
-%define _svnrev r26065
-%define branch trunk
+# Git revision and branch ID
+# 0.24 release: git tag b0.24
+%define _gitrev 945c67317
+%define branch fixes/0.24
 
 #
 # Basic descriptive tags for this package:
@@ -31,10 +32,11 @@
 
 # Version/Release info
 Version: 0.24
-%if "%{branch}" == "trunk"
-Release: 0.1.svn.%{_svnrev}%{?dist}
+%if "%{branch}" == "master"
+Release: 0.1.git.%{_gitrev}%{?dist}
+#Release: 0.1.rc1%{?dist}
 %else
-Release: 1%{?dist}
+Release: 2%{?dist}
 %endif
 
 ################################################################################
@@ -45,8 +47,8 @@
 Source0:        ftp://ftp.osuosl.org/pub/mythtv/myththemes-%{version}.tar.bz2
 # Robert Siebert's user-contributed theme, included at his (and users') request
 Source1:	ftp://miroku.no-ip.com/blue-abstract-wide.2010.07.15.tar.bz2
-# svnfixes branch patch
-#Patch0:		myththemes-0.23-svnfixes.patch
+# fixes/0.24 branch patch
+Patch0:		myththemes-0.24-fixes.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -79,8 +81,7 @@
 %prep
 %setup -q -c -a 1
 cd myththemes-%{version}
-# Patch is currently empty after 0.23.1 rebase
-#patch0 -p1
+%patch0 -p1
 cd ..
 
 ################################################################################
@@ -122,6 +123,15 @@
 %{_datadir}/fonts/%{name}/*.otf
 
 %changelog
+* Sun Jan 16 2011 Jarod Wilson <jarod at wilsonet.com> 0.24-2
+- Update to 0.24 fixes, git revision 945c67317
+
+* Thu Nov 18 2010 Jarod Wilson <jarod at wilsonet.com> 0.24-1
+- Update to release 0.24 + svn fixes branch up to revision 27286
+
+* Wed Oct 27 2010 Jarod Wilson <jarod at wilsonet.com> 0.24-0.2.rc1
+- Update to svn trunk, revision 26998 (which is actually post-0.24-rc1)
+
 * Wed Sep 01 2010 Jarod Wilson <jarod at wilsonet.com> 0.24-0.1.svn.r26065
 - Update to svn trunk, rev 26065
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	4 Sep 2010 15:10:02 -0000	1.23
+++ sources	21 Mar 2011 00:10:39 -0000	1.24
@@ -1,2 +1,2 @@
 970f9fa081c4d2763516180bf434805a  blue-abstract-wide.2010.07.15.tar.bz2
-dff8634022f482c62cc4356811c58a83  myththemes-0.24.tar.bz2
+ac257cbe0c340c0bf271e66e58f0b64d  myththemes-0.24.tar.bz2



More information about the rpmfusion-commits mailing list