[dvb-apps] Update to latest hg snapshot, fix RHBZ 759879 757609

[Peter Robinson]

commit 84a5c6d390833fed4ec72e1a5c6a5a887472f1ad
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jan 3 15:35:22 2012 +0000

    Update to latest hg snapshot, fix RHBZ 759879 757609

 .gitignore          |    1 +
 dvb-apps-Make.patch |   11 +++++++++++
 dvb-apps.spec       |   19 +++++++++++++++----
 sources             |    2 +-
 4 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc5efeb..c6bc8ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 d4e8bf5658ce.tar.bz2
+/bec11f78be51.tar.bz2
diff --git a/dvb-apps-Make.patch b/dvb-apps-Make.patch
index 86f5e1b..5e6f284 100644
--- a/dvb-apps-Make.patch
+++ b/dvb-apps-Make.patch
@@ -33,3 +33,14 @@
  
  inst_bin = $(binaries)
  
+--- dvb-apps-bec11f78be51/util/zap/Makefile.orig	2012-01-03 14:09:42.108471379 +0000
++++ dvb-apps-bec11f78be51/util/zap/Makefile	2012-01-03 14:09:56.947510198 +0000
+@@ -3,7 +3,7 @@
+ objects  = zap_ca.o  \
+            zap_dvb.o
+ 
+-binaries = zap
++binaries = dvbzap
+ 
+ inst_bin = $(binaries)
+ 
diff --git a/dvb-apps.spec b/dvb-apps.spec
index a27b8e2..dc5a4df 100644
--- a/dvb-apps.spec
+++ b/dvb-apps.spec
@@ -1,8 +1,11 @@
-%define hgver d4e8bf5658ce
+# There's not been a release in a long time for dvb-apps
+# We use a Release based on the ChangeSet number and hash
+%define hgr 1457
+%define hgver bec11f78be51
 
 Name:    dvb-apps
 Version: 1.1.2
-Release: 0.%{hgver}%{?dist}
+Release: 0.%{hgr}.%{hgver}%{?dist}
 Summary: Utility, demo and test applications using the Linux DVB API
 
 Group:   Applications/Multimedia
@@ -33,9 +36,10 @@ decoding type.
 
 # Rename to non generic name
 mv util/scan/scan.c util/scan/scandvb.c
+mv util/zap/zap.c util/zap/dvbzap.c
 
 # Fix libdir for 64 bit arches
-%ifarch x86_64 ia64 ppc64 sparc64 s390x
+%ifarch x86_64 ia64 ppc64 sparc64 s390x arm64
 sed -i.lib64 's#$(prefix)/lib#$(prefix)/lib64#' Make.rules 
 %endif
 
@@ -48,10 +52,11 @@ chmod 644 dvbnet/net_start.*
 cd ..
 
 %build
-make %{?_smp_mflags} V=1
+LDFLAGS="$RPM_LD_FLAGS" make %{?_smp_mflags} V=1
 
 %install
 make install DESTDIR=%{buildroot} INSTALL='install -p'
+chmod -c +x %{buildroot}%{_libdir}/lib*.so
 
 #Remove static libraries
 find %{buildroot} -name '*.a' -exec rm -f {} ';'
@@ -75,6 +80,12 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
 %exclude %{_includedir}/*
 
 %changelog
+* Tue Jan  3 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.1.2-0.1457.bec11f78be51
+- Update to latest hg snapshot
+- Fix release based on upstream hg
+- Build with $RPM_LD_FLAGS - RHBZ #759879
+- Fix naming conflicts - RHBZ #757609
+
 * Sat Nov 12 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1.1.2-0.d4e8bf5658ce
 - Move to hg snapshot d4e8bf5658ce
 
diff --git a/sources b/sources
index 6986276..1e94305 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c06d743420e1678f17824099ed22e907  d4e8bf5658ce.tar.bz2
+c391804ac260057120a60030a5341e18  bec11f78be51.tar.bz2