Author: glen Date: Sat Oct 22 15:47:05 2005 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- 20051022 snap (doesn't build)
---- Files affected:
SPECS:
mythplugins.spec (1.12.2.1 -> 1.12.2.2)
---- Diffs:
================================================================
Index: SPECS/mythplugins.spec
diff -u SPECS/mythplugins.spec:1.12.2.1 SPECS/mythplugins.spec:1.12.2.2
--- SPECS/mythplugins.spec:1.12.2.1 Sat Oct 22 17:33:36 2005
+++ SPECS/mythplugins.spec Sat Oct 22 17:46:59 2005
@@ -4,13 +4,18 @@
Summary(pl): Główne wtyczki MythTV
Name: mythplugins
Version: 0.18.1
-Release: 0.112.11
+%define _snap 20051022
+%define _rel 0.1
+Release: 0.%{_snap}.%{_rel}
License: GPL v2
Group: Applications/Multimedia
-Source0: http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
-# Source0-md5: 1d94d19e2a13c24a408ced9b6c4f5b47
+#Source0: http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
+Source0: %{name}-%{_snap}.tar.bz2
+# Source0-md5: e3a5d3c8063cd9527f93f50875c80af2
Patch0: %{name}-configure.patch
Patch1: %{name}-libversion.patch
+Patch2: %{name}-lib64.patch
+Patch3: %{name}-paths.patch
URL: http://www.mythtv.org/
BuildRequires: OpenGL-devel
BuildRequires: SDL-devel
@@ -202,20 +207,13 @@
(fwd.pulver.com).
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-
-# lib64 fix
-find '(' -name '*.[ch]' -o -name '*.cpp' -o -name '*.pro' ')' | \
-xargs grep -l /lib/ . | xargs sed -i -e '
- s,/usr/lib/,/usr/%{_lib}/,g
- s,{PREFIX}/lib,{PREFIX}/%{_lib},g
-'
-
-sed -i -e 's|/mnt/store/music|/var/lib/mythmusic|'
mythmusic/mythmusic/globalsettings.cpp
-sed -i -e 's|/share/Movies/dvd|/var/lib/mythvideo|'
mythvideo/mythvideo/globalsettings.cpp
-sed -i -e 's|/mnt/cdrom:/mnt/camera|/media/cdrom:/mnt/camera|'
mythgallery/mythgallery/gallerysettings.cpp
+%setup -q %{?_snap:-n %{name}}
+#%patch0 -p1
+#%patch1 -p1
+%if %{_lib} != "lib"
+%patch2 -p1
+%endif
+%patch3 -p1
# include mythtv build settings
cp %{_datadir}/mythtv/build/config.mak .
@@ -226,6 +224,16 @@
echo 'DEFINES -= HAVE_MMX' >> settings.pro
%endif
+# lib64 fix - enable to update patch
+%if %{_lib} != "lib" && 0
+find '(' -name '*.[ch]' -o -name '*.cpp' -o -name '*.pro' ')' | \
+xargs grep -l /lib/ . | xargs sed -i -e '
+ s,/usr/lib/,/usr/%{_lib}/,g
+ s,{PREFIX}/lib,{PREFIX}/%{_lib},g
+'
+exit 1
+%endif
+
%build
export QTDIR="%{_prefix}"
# Not gnu configure
@@ -427,6 +435,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12.2.2 2005/10/22 15:46:59 glen
+- 20051022 snap (doesn't build)
+
Revision 1.12.2.1 2005/10/22 15:33:36 glen
- try building against snap of mythtv
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mythplugins.spec?r1=1.12.2.1&r2=1.12.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
