SPECS: mythtv.spec - filter branch.diff - sort BR

[glen]

Author: glen                         Date: Sun May 28 13:11:03 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- filter branch.diff
- sort BR

---- Files affected:
SPECS:
   mythtv.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: SPECS/mythtv.spec
diff -u SPECS/mythtv.spec:1.50 SPECS/mythtv.spec:1.51
--- SPECS/mythtv.spec:1.50	Sun May 28 13:59:54 2006
+++ SPECS/mythtv.spec	Sun May 28 15:10:57 2006
@@ -38,7 +38,7 @@
 Summary(pl):	Osobista aplikacja do nagrywania obrazu (PVR)
 Name:		mythtv
 Version:	0.19
-Release:	2.1
+Release:	2.2
 License:	GPL v2
 Group:		Applications/Multimedia
 Source0:	http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
@@ -61,21 +61,20 @@
 BuildRequires:	XFree86-devel
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
 %{?with_arts:BuildRequires:	arts-devel >= 13:0.9.5}
+BuildRequires:	freetype-devel >= 1:2.0.0
 %{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
+BuildRequires:	lame-libs-devel
+%{?with_xvmc:BuildRequires:	libXvMCW-devel}
+%{?with_firewire:BuildRequires:	libavc1394-devel}
 %{?with_dvb:BuildRequires:	libdvb-devel}
 BuildRequires:	libdvdnav-devel
+%{?with_firewire:BuildRequires:	libiec61883-devel}
+%{?with_firewire:BuildRequires:	libraw1394-devel}
 %{?with_oggvorbis:BuildRequires:	libvorbis-devel}
-%if %{with firewire}
-BuildRequires:	libavc1394-devel
-BuildRequires:	libiec61883-devel # missing in PLD?
-BuildRequires:	libraw1394-devel
-%endif
-BuildRequires:	freetype-devel >= 1:2.0.0
-BuildRequires:	lame-libs-devel
-%{?with_xvmc:BuildRequires:	libXvMCW-devel}
 BuildRequires:	linux-libc-headers >= 7:2.6.10
 %{?with_lirc:BuildRequires:	lirc-devel}
 BuildRequires:	mysql-devel
+BuildRequires:	patchutils
 BuildRequires:	qmake >= 6:3.2.1-4
 BuildRequires:	qt-devel >= 6:3.2.1-4
 BuildRequires:	rpmbuild(macros) >= 1.228
@@ -277,7 +276,7 @@
 %patch5 -p1
 %patch6 -p0
 %patch7 -p1
-%patch8 -p1
+filterdiff -i 'mythtv/*' %{PATCH8} | %{__patch} -p1 -s
 
 rm -rf database/old # not supported in PLD
 
@@ -323,16 +322,16 @@
 %if %{with cpu_autodetect}
 	--enable-proc-opt \
 %else
-    %ifarch %{ix86}
+	%ifarch %{ix86}
 		%ifarch athlon
 			--arch=athlon \
 		%else
 			--cpu=i386 --tune=pentium4 \
 		%endif
-    %endif
-    %ifarch %{x8664}
+	%endif
+	%ifarch %{x8664}
 	--arch=x86_64 \
-    %endif
+	%endif
 	%{?with_mmx:--enable-mmx} \
 %endif
 	%{?with_dvb:--enable-dvb --dvb-path=%{_includedir} --enable-dvb-eit} \
@@ -505,9 +504,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2006/05/28 13:10:57  glen
+- filter branch.diff
+- sort BR
+
 Revision 1.50  2006/05/28 11:59:54  glen
 - add optflags patch
-- add branch diff
+- add branch.diff: release 0.19 fixes up to svn 10051
 
 Revision 1.49  2006/05/13 08:49:09  charles
 - with_jack typo
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mythtv.spec?r1=1.50&r2=1.51&f=u