[mythtv] Building rpms for master

[John Pilkington]

On 09/09/14 14:22, John Pilkington wrote:
> On 09/09/14 14:12, Richard Shaw wrote:
>> On Tue, Sep 9, 2014 at 6:33 AM, John Pilkington <J.Pilk at tesco.net
>> <mailto:J.Pilk at tesco.net>> wrote:
>>
>>     After a few more iterations
>>
>>     Checking for unpackaged file(s): /usr/lib/rpm/check-files
>>
>> /home/john/rpmbuild/BUILDROOT/__mythtv-master-0.1.git.__gfd72f58.el6.i386
>>     error: Installed (but unpackaged) file(s) found:
>>         /usr/bin/mythfilerecorder
>>
>>
>> Looks like a new binary was added... I'm not exactly sure which package
>> it belongs in but the fact it has recorder in the name I'm going to
>> assume it belongs in the backend package.
>>
>>   Add a line in the "%files backend" section
>>
>> %{_bindir}/mythfilerecorder
>>
>> Richard
>
> It looks as if it has the same status as the other 'programs', but I'll
> give it a whirl  Thanks.
>
Looks as if it completed ok.  Now for the install.
=====================
  diff -u RPMfusion_f20_mythtv.spec mythtvmasterJP1.spec
--- RPMfusion_f20_mythtv.spec   2014-09-07 20:55:47.693989619 +0100
+++ mythtvmasterJP1.spec        2014-09-09 14:27:26.280798944 +0100
@@ -60,11 +60,11 @@
  %define desktop_vendor RPMFusion

  # MythTV Version string -- preferably the output from git --describe
-%define vers_string v0.27.3-109-g0dd5ab3
-%define branch fixes/0.27
+%define vers_string v0.28-pre-2167-gfd72f58
+%define branch master

  # Git revision and branch ID
-%define _gitrev g5b917e8
+%define _gitrev gfd72f58

  #
  # Basic descriptive tags for this package:
@@ -74,7 +74,7 @@
  URL:            http://www.mythtv.org/

  # Version/Release info
-Version:        0.27.3
+Version:   master
  %if "%{branch}" == "master"
  Release:        0.1.git.%{_gitrev}%{?dist}
  %else
@@ -131,17 +131,18 @@
  %define with_mythnetvision  %{?_without_mythnetvision:  0} 
%{!?_without_mythnetvision:   1}

 
################################################################################
-
+#https://codeload.github.com/MythTV/mythtv/tar.gz/master
  # https://github.com/MythTV/mythtv/tarball/v0.26
-Source0:   %{name}-%{version}.tar.gz
+#Source0:   %{name}-%{version}.tar.gz
+Source0:  mythtv-master(2).tar.gz

  # From the mythtv git repository with the appropriate branch checked out:
  # git diff -p --stat v0.26.0 > mythtv-0.26-fixes.patch
-Patch0:    mythtv-0.27-fixes.patch
-Patch1:    mythtv-0.26.0-types_h.patch
+#Patch0:    mythtv-0.27-fixes.patch
+#Patch1:    mythtv-0.26.0-types_h.patch
  # http://code.mythtv.org/trac/ticket/11338
  # Offset required for 0.27, patch was for 0.26.1
-Patch2:    mythtv-0.27-libcec2.patch
+#Patch2:    mythtv-0.27-libcec2.patch

  Source10:  PACKAGE-LICENSING
  Source11:  ChangeLog
@@ -193,6 +194,7 @@
  BuildRequires:  lm_sensors-devel
  BuildRequires:  lirc-devel
  BuildRequires:  nasm, yasm-devel
+BuildRequires:  exiv2-devel

  # X, and Xv video support
  BuildRequires:  libXmu-devel
@@ -221,7 +223,8 @@
  BuildRequires:  gsm-devel
  BuildRequires:  lame-devel
  BuildRequires:  libdca-devel
-BuildRequires:  libcdio-devel libcdio-paranoia-devel
+#BuildRequires:  libcdio-devel libcdio-paranoia-devel #no el6 package
+BuildRequires:  libcdio-devel
  # nb: libdvdcss will be dynamically loaded if installed
  #BuildRequires:  libfame-devel >= 0.9.0
  BuildRequires:  libogg-devel
@@ -817,8 +820,8 @@
      fi

  #patch0 -p1 -b .mythtv
-%patch1 -p1 -b .types_h
-%patch2 -p1 -b .libcec2
+#%patch1 -p1 -b .types_h
+#%patch2 -p1 -b .libcec2

  # Install ChangeLog
  install -m 0644 %{SOURCE11} .
@@ -906,11 +909,11 @@
      --without-bindings=python                   \
  %endif
  %ifarch ppc
-    --extra-cflags="%{optflags} -maltivec -fomit-frame-pointer" \
-    --extra-cxxflags="%{optflags} -maltivec -fomit-frame-pointer" \
+    --extra-cflags="%{optflags} -maltivec -fomit-frame-pointer " \
+    --extra-cxxflags="%{optflags} -maltivec -fomit-frame-pointer " \
  %else
-    --extra-cflags="%{optflags} -fomit-frame-pointer -fno-devirtualize" \
-    --extra-cxxflags="%{optflags} -fomit-frame-pointer -fno-devirtualize" \
+   --extra-cflags="%{optflags} -fomit-frame-pointer"  \
+   --extra-cxxflags="%{optflags} -fomit-frame-pointer"  \
  %endif
  %ifarch %{ix86}
      --cpu=i686 --tune=i686 --enable-mmx \
@@ -1228,6 +1231,7 @@
  %files backend
  %{_bindir}/mythbackend
  %{_bindir}/mythfilldatabase
+%{_bindir}/mythfilerecorder
  %{_bindir}/mythjobqueue
  %{_bindir}/mythmediaserver
  %{_bindir}/mythreplex
@@ -1292,7 +1296,7 @@
  %files devel
  %{_includedir}/*
  %{_libdir}/*.so
-%exclude %{_libdir}/*.a
+#%exclude %{_libdir}/*.a # fails if no match
  %dir %{_datadir}/mythtv/build
  %{_datadir}/mythtv/build/settings.pro

@@ -1435,6 +1439,9 @@


  %changelog
+* Tue Sep 9 2014 John P
+- try master with new upnp code  v0.28-pre-2167-gfd72f58
+
  * Sun Jul 27 2014 Richard Shaw <hobbes1069 at gmail.com> - 0.27.3-1
  - Update to new upstream release.

==================