rpms/mythtv-themes/devel mythtv-themes.spec, 1.20, 1.21 sources, 1.14, 1.15

[Jarod Wilson]

Author: jarod

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

Modified Files:
	mythtv-themes.spec sources 
Log Message:
* Fri Sep 11 2009 Jarod Wilson <jarod at wilsonet.com> - 0.22-0.5.svn.r21778
- The myththemes tarball is actually what become oldthemes. Oops.



Index: mythtv-themes.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/mythtv-themes.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mythtv-themes.spec	11 Sep 2009 16:20:08 -0000	1.20
+++ mythtv-themes.spec	11 Sep 2009 19:03:35 -0000	1.21
@@ -32,19 +32,20 @@
 # Version/Release info
 Version: 0.22
 %if "%{branch}" == "trunk"
-Release: 0.4.svn.%{_svnrev}%{?dist}
+Release: 0.5.svn.%{_svnrev}%{?dist}
 %else
 Release: 1%{?dist}
 %endif
 
 ################################################################################
 
-# Tarballs created from svn "themes" and "myththemes" directories
-# Hopefully these will merge before 0.22 is released.
-#Source0:        http://www.mythtv.org/mc/myththemes-%{version}.tar.bz2
-Source0:        myththemes-%{version}.tar.bz2
-Source1:        themes-%{version}.tar.bz2
-Source2:        oldthemes-%{version}.tar.bz2
+# Tarballs created from svn "themes" and "oldthemes" directories, should be
+# a formal tarball after release
+#Source0:        http://www.mythtv.org/mc/mythtv-themes-%{version}.tar.bz2
+Source0:        themes-%{version}.tar.bz2
+# The oldthemes bits haven't been updated for 0.22's UI changes, but still
+# at least sort of work...
+Source1:        oldthemes-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,15 +76,11 @@
 ################################################################################
 
 %prep
-%setup -q -c -a 1 -a 2
+%setup -q -c -a 1
 
 ################################################################################
 
 %build
-cd myththemes-%{version}
-%configure
-cd ..
-
 cd themes-%{version}
 %configure
 cd ..
@@ -97,10 +94,6 @@
 %install
 rm -rf %{buildroot}
 
-cd myththemes-%{version}
-make install INSTALL_ROOT=%{buildroot}
-cd ..
-
 cd themes-%{version}
 make install INSTALL_ROOT=%{buildroot}
 cd ..
@@ -121,6 +114,9 @@
 %{_datadir}/mythtv/themes/*
 
 %changelog
+* Fri Sep 11 2009 Jarod Wilson <jarod at wilsonet.com> - 0.22-0.5.svn.r21778
+- The myththemes tarball is actually what become oldthemes. Oops.
+
 * Fri Sep 11 2009 Jarod Wilson <jarod at wilsonet.com> - 0.22-0.4.svn.r21778
 - Update to pre-0.22 svn trunk, rev 21778
 - Add back old themes not fully updated for 0.22 yet


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	11 Sep 2009 16:20:08 -0000	1.14
+++ sources	11 Sep 2009 19:03:35 -0000	1.15
@@ -1,3 +1,2 @@
-c616cffee0f344c37fd4e045a7a87054  myththemes-0.22.tar.bz2
 88200dd231d7b1b47b0433cab4087e14  themes-0.22.tar.bz2
 23755cd0cda080481cf5bb2a52e66751  oldthemes-0.22.tar.bz2