heffer pushed to vdr-streamdev (master). "fix compile for VDR 2.2 and F22+ (..more)"

[notifications at fedoraproject.org]

>From 8b1aeb60a1a35190cb4007c9a1c1ba1ce4006e78 Mon Sep 17 00:00:00 2001
From: Felix Kaechele <heffer at fedoraproject.org>
Date: Sat, 11 Apr 2015 10:38:44 +0200
Subject: fix compile for VDR 2.2 and F22+

- use make install

diff --git a/.gitignore b/.gitignore
index 9726c06..6301ae2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ vdr-streamdev-0.5.0.tgz
 /vdr-streamdev-0.5.1.tgz
 /vdr-streamdev-0.6.0.tgz
 /vdr-streamdev-10db11ac.tar.xz
+/vdr-streamdev-84c6f6b6.tar.xz
diff --git a/sources b/sources
index ba703dd..d77240d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5011fd1a4b0624b192911f37c6040e3  vdr-streamdev-10db11ac.tar.xz
+a423976db5df43893fb00e50a6aa44e7  vdr-streamdev-84c6f6b6.tar.xz
diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec
index 3bd0e58..67ece94 100644
--- a/vdr-streamdev.spec
+++ b/vdr-streamdev.spec
@@ -1,7 +1,7 @@
 %global pname     streamdev
 # If this variable is set the spec file assumes it's building a git snapshot
 # Also see info below on generating snapshots
-%global gitver    10db11acd9a9785443182da1ec032c1d83db271a
+%global gitver    84c6f6b6f363549e88efd01d12df35ae6e336578
 %global gitshort  %(echo %gitver | awk '{print substr($0,1,8)}')
 %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 
@@ -20,7 +20,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.6.1
-Release:        0.10%{?gitver:.git%{gitshort}}%{?dist}
+Release:        0.11%{?gitver:.git%{gitshort}}%{?dist}
 Summary:        Streaming plug-in for VDR
 License:        GPL+ and GPLv2+
 URL:            http://projects.vdr-developer.org/projects/plg-streamdev
@@ -69,22 +69,18 @@ done
 
 
 %build
-make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr LOCALEDIR=$PWD/locale all
+make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC"
 
 
 %install
-install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}
+%make_install
 install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins/streamdev-server
-install -pm 755 server/libvdr-%{pname}-server.so.%{vdr_apiversion} $RPM_BUILD_ROOT%{vdr_plugindir}
-install -pm 755 client/libvdr-%{pname}-client.so.%{vdr_apiversion} $RPM_BUILD_ROOT%{vdr_plugindir}
 install -Dpm 644 streamdev-server/streamdevhosts.conf $RPM_BUILD_ROOT%{vdr_configdir}/plugins/streamdev-server/streamdevhosts.conf
 install -Dpm 755 streamdev-server/externremux.sh $RPM_BUILD_ROOT%{_libdir}/vdr/bin/externremux.sh 
 install -Dpm 644 %{SOURCE1} \
   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf
 install -Dpm 644 %{SOURCE2} \
   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
-cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 %find_lang %{name}-server
 %find_lang %{name}-client
 
@@ -104,6 +100,10 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Tue Apr 07 2015 Felix Kaechele <heffer at fedoraproject.org> - 0.6.1-0.11.git84c6f6b6
+- fix compile for VDR 2.2 and F22+
+- use make install
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-0.10.git10db11ac
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/vdr-streamdev.git/commit/?h=master&id=8b1aeb60a1a35190cb4007c9a1c1ba1ce4006e78