rpms/mythtv/devel mythtv.spec,1.22,1.23 sources,1.5,1.6

[Jarod Wilson]

Author: jarod

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

Modified Files:
	mythtv.spec sources 
Log Message:
* Sat Jan 24 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19811
- Update to pre-0.22 svn trunk, revision 19811
- Drop mythcontrols plugin (functionality merged into mythfrontend)
- Re-enable building iptv support



Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mythtv.spec	18 Jan 2009 03:13:00 -0000	1.22
+++ mythtv.spec	25 Jan 2009 03:52:56 -0000	1.23
@@ -39,7 +39,6 @@
 #
 # --without mytharchive
 # --without mythbrowser
-# --without mythcontrols
 # --without mythflix
 # --without mythgallery
 # --without mythgame
@@ -61,7 +60,7 @@
 %define desktop_vendor  RPMFusion
 
 # SVN Revision number and branch ID
-%define _svnrev r19722
+%define _svnrev r19811
 %define branch trunk
 
 #
@@ -107,7 +106,6 @@
 %define with_plugins        %{?_without_plugins:        0} %{!?_without_plugins:         1}
 %define with_mytharchive    %{?_without_mytharchive:    0} %{!?_without_mytharchive:     1}
 %define with_mythbrowser    %{?_without_mythbrowser:    0} %{!?_without_mythbrowser:     1}
-%define with_mythcontrols   %{?_without_mythcontrols:   0} %{!?_without_mythcontrols:    1}
 %define with_mythflix       %{?_without_mythflix:       0} %{!?_without_mythflix:        1}
 %define with_mythgallery    %{?_without_mythgallery:    0} %{!?_without_mythgallery:     1}
 %define with_mythgame       %{?_without_mythgame:       0} %{!?_without_mythgame:        1}
@@ -458,6 +456,8 @@
 Requires:  mythtv-common       = %{version}-%{release}
 Requires:  mythtv-base-themes  = %{version}
 Provides:  mythtv-frontend-api = %{mythfeapiver}
+Obsoletes: mythcontrols < %{version}-%{release}
+Provides:  mythcontrols = %{version}-%{release}
 
 %description frontend
 MythTV provides a unified graphical interface for recording and viewing
@@ -570,7 +570,6 @@
 Requires:  mythgame       = %{version}-%{release}
 Requires:  mythnews       = %{version}-%{release}
 Requires:  mythbrowser    = %{version}-%{release}
-Requires:  mythcontrols   = %{version}-%{release}
 Requires:  mythflix       = %{version}-%{release}
 Requires:  mytharchive    = %{version}-%{release}
 Requires:  mythzoneminder = %{version}-%{release}
@@ -625,18 +624,6 @@
 
 %endif
 ################################################################################
-%if %{with_mythcontrols}
-
-%package -n mythcontrols
-Summary:   A key bindings editor for MythTV
-Group:     Applications/Multimedia
-Requires:  mythtv-frontend-api = %{mythfeapiver}
-
-%description -n mythcontrols
-MythControls is a key bindings editor for MythTV.
-
-%endif
-################################################################################
 %if %{with_mythflix}
 
 %package -n mythflix
@@ -910,7 +897,7 @@
     --libdir=%{_libdir}                         \
     --libdir-name=%{_lib}                       \
     --mandir=%{_mandir}                         \
---disable-iptv \
+    --enable-iptv				\
     --enable-pthreads                           \
     --enable-ffmpeg-pthreads                    \
     --enable-joystick-menu                      \
@@ -1017,11 +1004,6 @@
     %else
         --disable-mythbrowser \
     %endif
-    %if %{with_mythcontrols}
-        --enable-mythcontrols \
-    %else
-        --disable-mythcontrols \
-    %endif
     %if %{with_mythflix}
         --enable-mythflix \
     %else
@@ -1370,17 +1352,6 @@
 %{_datadir}/mythtv/i18n/mythbrowser_*.qm
 %endif
 
-%if %{with_mythcontrols}
-%files -n mythcontrols
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythcontrols/AUTHORS
-%doc mythplugins-%{version}/mythcontrols/COPYING
-%doc mythplugins-%{version}/mythcontrols/README
-%doc mythplugins-%{version}/mythcontrols/TODO
-%{_libdir}/mythtv/plugins/libmythcontrols.so
-%{_datadir}/mythtv/i18n/mythcontrols_*.qm
-%endif
-
 %if %{with_mythflix}
 %files -n mythflix
 %defattr(-,root,root,-)
@@ -1503,6 +1474,11 @@
 ################################################################################
 
 %changelog
+* Sat Jan 24 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19811
+- Update to pre-0.22 svn trunk, revision 19811
+- Drop mythcontrols plugin (functionality merged into mythfrontend)
+- Re-enable building iptv support
+
 * Sat Jan 17 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19722
 - Update to pre-0.22 svn trunk, revision 19722
 - MythPhone plugin is dead as a doornail (MythTV changeset 19702)


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jan 2009 03:13:00 -0000	1.5
+++ sources	25 Jan 2009 03:52:56 -0000	1.6
@@ -1,4 +1,4 @@
 be3ab99952c2a3a135a7c4af90b08f15  mythfrontend.png
 be3ab99952c2a3a135a7c4af90b08f15  mythtv-setup.png
-141c6c8b45575adf02c1b374603e0347  mythplugins-0.22.tar.bz2
-c46a19549a0ce01384d75246717c361f  mythtv-0.22.tar.bz2
+fead1fa2d6ac55337bb4eb4a6cf358ab  mythplugins-0.22.tar.bz2
+25f49959d13e21c4605e3f928b9b7945  mythtv-0.22.tar.bz2