[mythtv-users] Anyone have binary RPMs for 0.27 build for Fedora?

John Pilkington J.Pilk at tesco.net
Sat Nov 16 13:29:35 UTC 2013


On 10/11/13 17:14, John Pilkington wrote:
> On 06/11/13 16:32, Stuart Morgan wrote:
>> On Wednesday 06 Nov 2013 10:05:08 Richard Shaw wrote:
>>> Ok, looks like it's not my fault. I went back through the spec file
>>> and saw
>>> the same thing, the vers_string was set correctly...
>>
>> If you're using an exported copy of the source but then applying
>> patches on
>> top of that you need to remove the EXPORTED_VERSION file.
>>
>> When I added that I didn't anticipate that packagers would thwart me by
>> downloading the tarball for the 0.27 tag then diffing that against
>> 0.27-fixes, to
>> create a patch which then gets applied to the 0.27 source.
>>
>> I didn't expect something so fiendishly complicated, I just naively
>> assumed
>> they'd just use the 0.27-fixes tarball* from github  instead in which
>> case
>> EXPORTED_VERSION would have contained the correct version information and
>> everything would have magically worked.
>>
>> * https://codeload.github.com/MythTV/mythtv/tar.gz/fixes/0.27
>>
> In the hope of simplifying future updates of my 'SL6' installation
> I tried dropping this tarball into the SOURCES folder from the rpmfusion
> SRPM, with what I hoped might be appropriate hacks, but the temporary
> script that is run unpacks it into BUILD/mythtv-fixes-0.27 and looks for
> the result in BUILD/mythtv-0.27
>
> No doubt there's a simple fix, but I haven't found it yet.  Any
> suggestions?  TIA
>
> John P
>
I'm attaching a unified diff between the current rpmfusion f18 x86_64 
spec and my build for the same box from yesterday's tarball as above. 
It appears to be working for me and reports the expected git number but 
not as the intended version_string.  I have a similar but slightly 
earlier build on the SL6 i686 laptop.

MythTV Version : 4ca9300
MythTV Branch : fixes/0.27

There's still something funny about the handling of the version numbers, 
and some references to version names are non-general.

HTH

John P


-------------- next part --------------
--- mythtv.spec	2013-11-03 21:32:32.000000000 +0000
+++ mythtv_jp.spec	2013-11-15 19:08:22.911065921 +0000
@@ -60,7 +60,7 @@
 %define desktop_vendor RPMFusion
 
 # MythTV Version string -- preferably the output from git --describe
-%define vers_string v0.27-56-g29eab51
+%define vers_string v0.27-89-g4ca9300
 
 # Git revision and branch ID
 %define _gitrev v0.27-1-g5b917e8
@@ -79,7 +79,7 @@
 %if "%{branch}" == "master"
 Release:        0.1.git.%{_gitrev}%{?dist}
 %else
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 %endif
 
 # The primary license is GPLv2+, but bits are borrowed from a number of
@@ -134,11 +134,15 @@
 ################################################################################
 
 # https://github.com/MythTV/mythtv/tarball/v0.26
-Source0:   %{name}-%{version}.tar.gz
+#Source0:   %{name}-%{version}.tar.gz
+
+# use the current fixes tarball instead of patching the release
+# https://codeload.github.com/MythTV/mythtv/tar.gz/fixes/0.27
+Source0:   mythtv-fixes-0.27.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
+#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
@@ -832,7 +836,7 @@
 ################################################################################
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-fixes-%{version}
 
 # Replace static lib paths with %{_lib} so we build properly on x86_64
 # systems, where the libs are actually in lib64.
@@ -840,7 +844,8 @@
          find \( -name 'configure' -o -name '*pro' -o -name 'Makefile' \) -exec sed -r -i -e 's,/lib\b,/%{_lib},g' {} \+
     fi
 
-%patch0 -p1 -b .mythtv
+#  We're not patching but using the current tarball
+#%patch0 -p1 -b .mythtv
 %patch1 -p1 -b .types_h
 %patch2 -p1 -b .libcec2
 
@@ -1469,6 +1474,9 @@
 
 
 %changelog
+* Fri Nov 15 2013 John Pilkington - 0.27-1.1
+- Update to  v0.27-89-g4ca9300 using current fixes tarball  
+
 * Wed Oct 30 2013 Richard Shaw <hobbes1069 at gmail.com> - 0.27-1
 - Update to release 0.27.
 


More information about the mythtv-users mailing list