rpms/mythtv/EL-6 mythtv.spec, 1.83, 1.84 sources, 1.51, 1.52 mythplugins-0.24.1-fixes.patch, 1.2, NONE mythtv-0.24.1-fixes.patch, 1.2, NONE mythtv-0.24.1-glu_h_gluErrorString.patch, 1.1, NONE mythweb-0.24.1-fixes.patch, 1.1, NONE

[Richard Shaw]

Author: hobbes1069

Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24009

Modified Files:
	mythtv.spec sources 
Removed Files:
	mythplugins-0.24.1-fixes.patch mythtv-0.24.1-fixes.patch 
	mythtv-0.24.1-glu_h_gluErrorString.patch 
	mythweb-0.24.1-fixes.patch 
Log Message:
Branch cleanup.


Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- mythtv.spec	18 Nov 2011 22:20:06 -0000	1.83
+++ mythtv.spec	9 Jun 2012 02:17:35 -0000	1.84
@@ -83,7 +83,7 @@
 Release: 0.1.git.%{_gitrev}%{?dist}
 #Release: 0.1.rc1%{?dist}
 %else
-Release: 4%{?dist}
+Release: 5%{?dist}
 %endif
 
 # The primary license is GPLv2+, but bits are borrowed from a number of
@@ -135,12 +135,10 @@
 Patch0:    mythtv-%{version}-fixes.patch
 Patch1:    mythplugins-%{version}-fixes.patch
 #Patch2:    mythweb-%{version}-fixes.patch\
-Patch3:    mythtv-0.24.1-glu_h_gluErrorString.patch
 Source10:  PACKAGE-LICENSING
 Source101: mythbackend.sysconfig
 Source102: mythbackend.init
 Source103: mythbackend.logrotate
-Source104: mythbackend.service
 Source106: mythfrontend.png
 Source107: mythfrontend.desktop
 Source108: mythtv-setup.png
@@ -148,8 +146,6 @@
 Source110: mysql.txt
 Source401: mythweb.conf
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 ################################################################################
 # Python setup
 
@@ -854,7 +850,6 @@
 
 cd mythtv-%{version}
 %patch0 -p2
-%patch3 -p1 -b .p3
 
 # Drop execute permissions on contrib bits, since they'll be %doc
     find contrib/ -type f -exec chmod -x "{}" \;
@@ -1209,7 +1204,7 @@
 # Add the "mythtv" user, with membership in the audio and video group
 getent group mythtv >/dev/null || groupadd -r mythtv
 getent passwd mythtv >/dev/null || \
-    useradd -r -g mythtv -d d %{_localstatedir}/lib/mythtv -s /sbin/nologin \
+    useradd -r -g mythtv -d %{_localstatedir}/lib/mythtv -s /sbin/nologin \
     -c "mythbackend user" mythtv
 exit 0
 # Make sure the mythtv user is in the audio and video group for existing
@@ -1276,12 +1271,16 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc mythtv-%{version}/README* mythtv-%{version}/UPGRADING
-%doc mythtv-%{version}/AUTHORS mythtv-%{version}/COPYING mythtv-%{version}/FAQ
+%doc mythtv-%{version}/README*
+%doc mythtv-%{version}/UPGRADING
+%doc mythtv-%{version}/AUTHORS
+%doc mythtv-%{version}/COPYING
+%doc mythtv-%{version}/FAQ
 %doc mythtv-%{version}/database mythtv-%{version}/keys.txt
 %doc mythtv-%{version}/docs/*.html mythtv-%{version}/docs/*.png
 %doc mythtv-%{version}/docs/*.txt
 %doc mythtv-%{version}/PACKAGE-LICENSING
+%doc mythtv-%{version}/contrib
 
 %files common
 %defattr(-,root,root,-)
@@ -1535,6 +1534,12 @@
 ################################################################################
 
 %changelog
+* Mon Nov 21 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.24.1-5
+- Fix typo in spec file causing mythtv user to not be created (#2051).
+- Change mythbackend systemd type to "simple" and other fixes (#2016).
+- Update to latest 0.24.1-fixes, git revision f5fd11fa54.
+- Readd contrib directory (#1924).
+
 * Fri Oct 28 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.24.1-4
 - Fix for glibc bug rhbz#747377
 ! Reminder:


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	17 May 2011 22:34:20 -0000	1.51
+++ sources	9 Jun 2012 02:17:35 -0000	1.52
@@ -1,4 +1,2 @@
-be3ab99952c2a3a135a7c4af90b08f15  mythfrontend.png
-be3ab99952c2a3a135a7c4af90b08f15  mythtv-setup.png
-6870c679619ec58456e76839745411d8  mythtv-0.24.1.tar.bz2
-3fbe948f05263000fb50ec20d89835b6  mythplugins-0.24.1.tar.bz2
+68928bcd22857d4905cc6141e3b7f7dc  MythTV-mythtv-v0.25-0-g1f5962a.tar.gz
+370bf39a67c1d405d455e4ff74180cba  MythTV-mythweb-v0.25-0-g1d056f7.tar.gz


--- mythplugins-0.24.1-fixes.patch DELETED ---


--- mythtv-0.24.1-fixes.patch DELETED ---


--- mythtv-0.24.1-glu_h_gluErrorString.patch DELETED ---


--- mythweb-0.24.1-fixes.patch DELETED ---