SPECS: mythtv.spec - 0.21 - rel 0.1 - get rid of this "snap" stuff, confuse...

[shadzik]

Author: shadzik                      Date: Tue Oct  7 09:27:55 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 0.21
- rel 0.1
- get rid of this "snap" stuff, confuses me
- del optflags.patch, add fixes.patch
- renumber patches
- no --disable-opts option nor --enable-dvb-eit
- call make with addition QTDIR variable (exporting it works for most cases but unfortunately not for all)
- shall we use the generic build mode instead of our qmake-hack thing? for now we let it build as was

---- Files affected:
SPECS:
   mythtv.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: SPECS/mythtv.spec
diff -u SPECS/mythtv.spec:1.67 SPECS/mythtv.spec:1.68
--- SPECS/mythtv.spec:1.67	Sun Nov 11 13:15:00 2007
+++ SPECS/mythtv.spec	Tue Oct  7 11:27:50 2008
@@ -33,20 +33,15 @@
 %endif
 %endif
 
-#define _snap 20060905
-#define _rev 11046
-%define _rel 0.1
 Summary:	A personal video recorder (PVR) application
 Summary(pl.UTF-8):	Osobista aplikacja do nagrywania obrazu (PVR)
 Name:		mythtv
-Version:	0.20.2
-Release:	%{?_snap:0.%{_snap}.%{_rev}.}%{_rel}
+Version:	0.21
+Release:	0.1
 License:	GPL v2
 Group:		Applications/Multimedia
 Source0:	http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
-# Source0-md5:	db7ab2049e716349e43edf8e67458218
-#Source0:	%{name}-%{version}-fix.tar.bz2
-#Source0:	%{name}-%{_snap}.%{_rev}.tar.bz2
+# Source0-md5:	49fc135e1cde90cd935c1229467fa37e
 Source1:	mythbackend.sysconfig
 Source2:	mythbackend.init
 Source3:	mythbackend.logrotate
@@ -58,9 +53,9 @@
 Patch3:		%{name}-ldconfig.patch
 #Patch4:		%{name}-pl.patch
 Patch5:		%{name}-sbinpath.patch
-Patch7:		%{name}-optflags.patch
-Patch8:		mythtv-dvdnav-shared.patch
-Patch9:		%{name}-libs.patch
+Patch6:		mythtv-dvdnav-shared.patch
+Patch7:		%{name}-libs.patch
+Patch8:		%{name}-fixes.patch
 URL:		http://www.mythtv.org/
 #BuildRequires:	DirectFB-devel
 #BuildRequires:	XFree86-devel
@@ -78,7 +73,6 @@
 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
@@ -279,10 +273,9 @@
 %patch3 -p1
 #%patch4 -p1 REDIFF and submit
 %patch5 -p1
-
+%patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 rm -rf database/old # not supported in PLD
 
@@ -339,8 +332,6 @@
 fi
 %endif
 
-export QTDIR="%{_prefix}"
-
 # NB: not autoconf configure
 # help configure::has_library() to locate libs
 LD_LIBRARY_PATH=%{_libdir} \
@@ -350,7 +341,6 @@
  	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
 	--mandir=%{_mandir} \
-	--disable-opts \
 	--disable-distcc --disable-ccache \
 	--compile-type=%{?debug:debug}%{!?debug:release} \
 	--extra-cflags="%{rpmcflags} -fomit-frame-pointer" \
@@ -370,7 +360,7 @@
 	%endif
 	%{?with_mmx:--enable-mmx} \
 %endif
-	%{?with_dvb:--enable-dvb --dvb-path=%{_includedir} --enable-dvb-eit} \
+	%{?with_dvb:--enable-dvb --dvb-path=%{_includedir}} \
 	--%{?with_arts:en}%{!?with_arts:dis}able-audio-arts \
 	--%{?with_alsa:en}%{!?with_alsa:dis}able-audio-alsa \
 	--%{?with_oss:en}%{!?with_oss:dis}able-audio-oss \
@@ -388,6 +378,7 @@
 QMAKE_LIBDIR_X11=%{?_x_libraries}%{!?_x_libraries:%{_libdir}}
 
 %{__make} \
+	QTDIR="%{_prefix}" \
 	QMAKE=$(pwd)/qmake-wrapper.sh
 
 %install
@@ -472,7 +463,7 @@
 %files
 %defattr(644,root,root,755)
 %doc README* UPGRADING AUTHORS FAQ
-%doc docs contrib configfiles
+#%doc docs contrib configfiles
 %doc keys.txt mythtvosd mythwelcome mythlcdserver
 
 %files backend
@@ -538,6 +529,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2008/10/07 09:27:50  shadzik
+- 0.21
+- rel 0.1
+- get rid of this "snap" stuff, confuses me
+- del optflags.patch, add fixes.patch
+- renumber patches
+- no --disable-opts option nor --enable-dvb-eit
+- call make with addition QTDIR variable (exporting it works for most cases but unfortunately not for all)
+- shall we use the generic build mode instead of our qmake-hack thing? for now we let it build as was
+
 Revision 1.67  2007/11/11 12:15:00  glen
 - add QTDIR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mythtv.spec?r1=1.67&r2=1.68&f=u