SPECS: mythtv.spec - 0.20.2

[glen]

Author: glen                         Date: Sun Nov 11 11:40:28 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 0.20.2

---- Files affected:
SPECS:
   mythtv.spec (1.65 -> 1.66) 

---- Diffs:

================================================================
Index: SPECS/mythtv.spec
diff -u SPECS/mythtv.spec:1.65 SPECS/mythtv.spec:1.66
--- SPECS/mythtv.spec:1.65	Thu Jun 14 20:23:08 2007
+++ SPECS/mythtv.spec	Sun Nov 11 12:40:23 2007
@@ -35,17 +35,17 @@
 
 #define _snap 20060905
 #define _rev 11046
-%define _rel 1
+%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
+Version:	0.20.2
 Release:	%{?_snap:0.%{_snap}.%{_rev}.}%{_rel}
 License:	GPL v2
 Group:		Applications/Multimedia
-#Source0:	http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
-Source0:	%{name}-%{version}-fix.tar.bz2
-# Source0-md5:	8901d3962eb58d1dd9ec2cd3bdbdfb76
+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
 Source1:	mythbackend.sysconfig
 Source2:	mythbackend.init
@@ -60,6 +60,7 @@
 Patch5:		%{name}-sbinpath.patch
 Patch7:		%{name}-optflags.patch
 Patch8:		mythtv-dvdnav-shared.patch
+Patch9:		%{name}-libs.patch
 URL:		http://www.mythtv.org/
 #BuildRequires:	DirectFB-devel
 #BuildRequires:	XFree86-devel
@@ -269,7 +270,7 @@
 Statyczna biblioteka libmyth.
 
 %prep
-%setup -q %{?_rev:-n %{name}} %{?_rel: -n %{name}-%{version}-fix}
+%setup -q %{?_rev:-n %{name}}
 %if %{_lib} != "lib"
 #%patch0 -p1
 %endif
@@ -281,6 +282,7 @@
 
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 rm -rf database/old # not supported in PLD
 
@@ -336,17 +338,12 @@
 	exit 1
 fi
 %endif
-export QTDIR="%{_prefix}"
-
-%if "%{_lib}" != "lib"
-export QMAKE_LIBDIR_X11=%{_prefix}/X11R6/%{_lib}
-# help configure::has_library() to locate libs
-export LD_LIBRARY_PATH=%{_libdir}
-%endif
 
 # NB: not autoconf configure
-export CC="%{__cc}"
-export CXX="%{__cxx}"
+# help configure::has_library() to locate libs
+LD_LIBRARY_PATH=%{_libdir} \
+CC="%{__cc}" \
+CXX="%{__cxx}" \
 ./configure \
  	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
@@ -384,7 +381,10 @@
 	--enable-xv \
 	--enable-x11 \
 
-qmake mythtv.pro
+qmake mythtv.pro \
+QTDIR="%{_prefix}" \
+QMAKE_LIBDIR_X11=%{?_x_libraries}%{!?_x_libraries:%{_libdir}}
+
 %{__make} \
 	QMAKE=$(pwd)/qmake-wrapper.sh
 
@@ -536,7 +536,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.65  2007-06-14 18:23:08  arekm
+Revision 1.66  2007-11-11 11:40:23  glen
+- 0.20.2
+
+Revision 1.65  2007/06/14 18:23:08  arekm
 - rel 1
 
 Revision 1.64  2007/02/13 07:16:49  glen
================================================================

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