scop pushed to vdr-live (f22). "rebuild for new git version (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Apr 6 14:15:51 UTC 2015


>From 569f0eafa3590abc24d6040efedc2edfba9f2f96 Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser at alice.de>
Date: Thu, 12 Feb 2015 19:49:54 +0100
Subject: rebuild for new git version

- added Fedora %optflags for CFLAGS and CXXFLAGS
- cleanup spec file
- mark license files as %license where available

diff --git a/.gitignore b/.gitignore
index fe1c51f..ef9335d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /vdr-plugin-live-69f84f95fa875c6f562294b1a6a1ea6f584d3f6c.tar.bz2
 /vdr-live-0.3.0-69f84f9.tar.bz2
 /vdr-live.spec
+/vdr-plugin-live-894daa8e959122e563d8d9f0e4bf2e7d324af081.tar.bz2
diff --git a/sources b/sources
index 40d13ba..f54545e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4bdbb1d2b492c6e7a7dd09ebba26447  vdr-plugin-live-69f84f95fa875c6f562294b1a6a1ea6f584d3f6c.tar.bz2
+fb6674e20341b0f7b158efbc657f2c15  vdr-plugin-live-894daa8e959122e563d8d9f0e4bf2e7d324af081.tar.bz2
diff --git a/vdr-live.spec b/vdr-live.spec
index af33213..dfed815 100644
--- a/vdr-live.spec
+++ b/vdr-live.spec
@@ -1,10 +1,10 @@
-%global commit  69f84f95fa875c6f562294b1a6a1ea6f584d3f6c
+%global commit  894daa8e959122e563d8d9f0e4bf2e7d324af081
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20130504
+%global gitdate 20150211
 
 Name:           vdr-live
 Version:        0.3.0
-Release:        16.%{gitdate}git%{shortcommit}%{?dist}
+Release:        17.%{gitdate}git%{shortcommit}%{?dist}
 Summary:        An interactive web interface for VDR
 
 Group:          Applications/Multimedia
@@ -17,7 +17,7 @@ URL:            http://projects.vdr-developer.org/projects/plg-live
 Source0:        http://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/vdr-plugin-live-%{commit}.tar.bz2
 Source1:        %{name}.conf
 
-BuildRequires:  vdr-devel >= 1.7.30
+BuildRequires:  vdr-devel >= 2.0.0
 BuildRequires:  pcre-devel
 BuildRequires:  tntnet-devel
 BuildRequires:  cxxtools-devel
@@ -54,20 +54,15 @@ rm -rf httpd
 iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README
 
 %build
-make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr VDRINCDIR=%{_includedir} \
-    LOCALEDIR=./locale all
+make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
 
 %install
-install -dm 755 %{buildroot}%{vdr_plugindir}
-install -pm 755 libvdr-*.so.%{vdr_apiversion} %{buildroot}%{vdr_plugindir}
+make install DESTDIR=%{buildroot}
 
 # live.conf
 install -Dpm 644 %{SOURCE1} \
     %{buildroot}%{_sysconfdir}/sysconfig/vdr-plugins.d/live.conf
 
-# Locale
-install -dm 755 %{buildroot}%{_datadir}/locale
-cp -pR locale/* %{buildroot}%{_datadir}/locale
 %find_lang %{name}
 
 install -dm 755 %{buildroot}%{vdr_resdir}/plugins/live
@@ -75,7 +70,8 @@ cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live
 
 
 %files -f %{name}.lang
-%doc CONTRIBUTORS COPYING README
+%doc CONTRIBUTORS README
+%license COPYING
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/live.conf
 %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
 
@@ -84,6 +80,12 @@ cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live
 
 
 %changelog
+* Thu Feb 12 2015 Martin Gansser <martinkg at fedoraproject.org> - 0.3.0-17.20150211git894daa8
+- rebuild for new git version
+- added Fedora %%optflags for CFLAGS and CXXFLAGS
+- cleanup spec file
+- mark license files as %%license where available
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-16.20130504git69f84f9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/vdr-live.git/commit/?h=f22&id=569f0eafa3590abc24d6040efedc2edfba9f2f96


More information about the scm-commits mailing list