[get_iplayer] Fix perl module dependencies and some minor spec tidy-ups
by Paul Howarth
commit b57dc6d6e862ce4be5b81cbda20e82dc2d9eb3d4
Author: Paul Howarth <paul(a)city-fan.org>
Date: Mon Oct 24 10:15:07 2016 +0100
Fix perl module dependencies and some minor spec tidy-ups
- BR: perl-generators
(https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl)
- Add various other perl module dependencies
- Resolve rpmlint warning about mixed use of spaces and tabs
- Use %license where available
- Drop %defattr, redundant since rpm 4.4
get_iplayer.spec | 49 +++++++++++++++++++++++++++++++++++++++----------
1 file changed, 39 insertions(+), 10 deletions(-)
---
diff --git a/get_iplayer.spec b/get_iplayer.spec
index b7429ec..4d802f4 100644
--- a/get_iplayer.spec
+++ b/get_iplayer.spec
@@ -1,29 +1,47 @@
Name: get_iplayer
Version: 2.97
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lists, records and streams BBC iPlayer TV and radio programmes
Group: Applications/Internet
License: GPLv3+
URL: http://www.infradead.org/get_iplayer/html/get_iplayer.html
-Source0: https://github.com/get-iplayer/%{name}/archive/v%{version}.tar.gz#/%{name...
+Source0: https://github.com/get-iplayer/%{name}/archive/v%{version}.tar.gz#/%{name...
Source1: options
-Source2: get_iplayer.xml
-Source3: get_iplayer.desktop
+Source2: get_iplayer.xml
+Source3: get_iplayer.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: sed
+BuildRequires: perl
+BuildRequires: perl-generators
+BuildRequires: perl(base)
+BuildRequires: perl(constant)
BuildRequires: perl(Cwd) perl(Env) perl(Fcntl) perl(File::Copy)
BuildRequires: perl(File::Path) perl(File::stat) perl(Getopt::Long)
BuildRequires: perl(HTML::Entities) perl(HTTP::Cookies) perl(HTTP::Headers)
BuildRequires: perl(IO::Seekable) perl(IO::Socket) perl(LWP::ConnCache)
BuildRequires: perl(LWP::UserAgent) perl(POSIX) perl(Time::Local) perl(URI)
BuildRequires: perl(HTML::Entities) perl(HTTP::Cookies)
-BuildRequires: file-libs >= 5.14-14
-BuildRequires: desktop-file-utils
+BuildRequires: perl(Encode)
+BuildRequires: perl(Encode::Locale)
+BuildRequires: perl(File::Basename)
+BuildRequires: perl(File::Spec)
+BuildRequires: perl(integer)
+BuildRequires: perl(List::Util)
+BuildRequires: perl(open)
+BuildRequires: perl(PerlIO::encoding)
+BuildRequires: perl(Storable)
+BuildRequires: perl(strict)
+BuildRequires: perl(Text::ParseWords)
+BuildRequires: perl(Unicode::Normalize)
+BuildRequires: file-libs >= 5.14-14
+BuildRequires: desktop-file-utils
+BuildRequires: sed
Requires: rtmpdump ffmpeg id3v2 lame mplayer vlc-core AtomicParsley
-Requires: perl(XML::Simple) perl(XML::LibXML)
+Requires: perl(Encode::Locale)
+Requires: perl(XML::Simple) perl(XML::LibXML)
+
%{?filter_setup:
# https://bugzilla.redhat.com/show_bug.cgi?id=734244
@@ -54,14 +72,17 @@ rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%{_bindir}/get_iplayer
%{_mandir}/man1/get_iplayer.1.*
%dir %{_sysconfdir}/get_iplayer
%config(noreplace) %{_sysconfdir}/get_iplayer/options
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime/packages/get_iplayer.xml
-%doc LICENSE.txt
+%if 0%{?_licensedir:1}
+%license LICENSE.txt
+%else
+%doc LICENSE.txt
+%endif
%doc README.md
@@ -82,6 +103,14 @@ fi
%changelog
+* Mon Oct 24 2016 Paul Howarth <paul(a)city-fan.org> - 2.97-2
+- BR: perl-generators
+ (https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl)
+- Add various other perl module dependencies
+- Resolve rpmlint warning about mixed use of spaces and tabs
+- Use %%license where available
+- Drop %%defattr, redundant since rpm 4.4
+
* Thu Sep 29 2016 Peter Oliver <git(a)mavit.org.uk> - 2.97-1
- New upstream release 2.97
7 years, 6 months
[xorg-x11-drv-nvidia] /etc/glvnd/egl_vendor.d/10_nvidia.json
by Leigh Scott
commit 9e01feed4774740d7e0e5356865f82294b809120
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Oct 24 10:08:05 2016 +0100
/etc/glvnd/egl_vendor.d/10_nvidia.json
xorg-x11-drv-nvidia.spec | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 7fa77ac..5b9241e 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -127,6 +127,9 @@ Group: User Interface/X Hardware Support
Requires: %{name} = %{?epoch}:%{version}-%{release}
Requires: libvdpau%{_isa} >= 0.5
Requires: libglvnd%{_isa}
+%ifarch x86_64 i686
+Requires: vulkan-filesystem
+%endif
%description libs
This package provides the shared libraries for %{name}.
@@ -206,6 +209,9 @@ ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so
install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/vulkan/icd.d/
install -p -m 0644 nvidia_icd.json $RPM_BUILD_ROOT%{_sysconfdir}/vulkan/icd.d/
%endif
+# EGL config
+install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/glvnd/egl_vendor.d/
+install -p -m 0644 10_nvidia.json $RPM_BUILD_ROOT%{_sysconfdir}/glvnd/egl_vendor.d/
#Vdpau
install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
@@ -427,10 +433,9 @@ fi ||:
%doc nvidiapkg/nvidia-application-profiles-%{version}-rc
%doc nvidiapkg/html
%ifarch x86_64 i686
-%dir %{_sysconfdir}/vulkan
-%dir %{_sysconfdir}/vulkan/icd.d
%config %{_sysconfdir}/vulkan/icd.d/nvidia_icd.json
%endif
+%config %{_sysconfdir}/glvnd/egl_vendor.d/10_nvidia.json
%dir %{_sysconfdir}/nvidia
%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
7 years, 6 months
[ffmpeg/f24] fix patch
by Leigh Scott
commit becfd5e0a02ee3f6a0030a4b0c3eb854c6003968
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Oct 22 10:37:22 2016 +0100
fix patch
0001-configure-add-direct-detection-of-libopencv.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/0001-configure-add-direct-detection-of-libopencv.patch b/0001-configure-add-direct-detection-of-libopencv.patch
index 237b0a3..bc09049 100644
--- a/0001-configure-add-direct-detection-of-libopencv.patch
+++ b/0001-configure-add-direct-detection-of-libopencv.patch
@@ -24,7 +24,7 @@ diff --git a/configure b/configure
index f4b821a..f28aa8f 100755
--- a/configure
+++ b/configure
-@@ -5566,7 +5566,8 @@ enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
+@@ -5482,7 +5482,8 @@ enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
enabled libopencv && { check_header opencv2/core/core_c.h &&
@@ -33,7 +33,7 @@ index f4b821a..f28aa8f 100755
+ require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
- enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
+ enabled libopenjpeg && { { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
--
2.7.4
7 years, 6 months
[xorg-x11-drv-nvidia/f24] Clean up more libglvnd provided libs
by Leigh Scott
commit 82f0db0ff65b092861335d8545094ed74b89c7a4
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Oct 22 07:33:21 2016 +0100
Clean up more libglvnd provided libs
xorg-x11-drv-nvidia.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index f96a65a..a4f77c6 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 367.57
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -175,7 +175,8 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
# GLVND
-rm libGL.so.%{version}
+rm libGL.so*
+rm libEGL.so*
# Simple wildcard install of libs
install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}
@@ -544,6 +545,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Sat Oct 22 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.57-2
+- Clean up more libglvnd provided libs
+
* Sat Oct 15 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.57-1
- Update to 367.57
- Add libglvnd path to ld.so.conf.d conf file
7 years, 6 months
[xorg-x11-drv-nvidia/f25] Clean up more libglvnd provided libs
by Leigh Scott
commit 039843eb74e5cba08631ae53cea0cc0e66a8e2de
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Oct 22 07:31:54 2016 +0100
Clean up more libglvnd provided libs
xorg-x11-drv-nvidia.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 65c7eb9..65fc2e4 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 370.28
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -176,7 +176,8 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
# GLVND
-rm libGL.so.%{version}
+rm libGL.so*
+rm libEGL.so*
# Simple wildcard install of libs
install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}
@@ -549,6 +550,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Sat Oct 22 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:370.28-6
+- Clean up more libglvnd provided libs
+
* Wed Oct 12 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:370.28-5
- Add libglvnd path to ld.so.conf.d conf file
7 years, 6 months
[nvidia-kmod] Update to 375.10 beta release
by Leigh Scott
commit 847e626ed55ad9267c88a83b13afe08441530973
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Oct 22 07:25:51 2016 +0100
Update to 375.10 beta release
nvidia-4.8_kernel.patch | 81 -------------------------------------------------
nvidia-kmod.spec | 7 +++--
2 files changed, 4 insertions(+), 84 deletions(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index cb73386..f78ab64 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -8,7 +8,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 370.28
+Version: 375.10
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -19,7 +19,6 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: nv-linux-arm2.patch
-Patch2: nvidia-4.8_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,7 +46,6 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
# patch loop
%patch0 -p1
%patch1 -p1
-%patch2 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -79,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Oct 22 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.10-1
+- Update to 375.10 beta release
+
* Fri Sep 09 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:370.28-1
- Update to 370.28
7 years, 6 months