Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Martin Gansser
524d568cc9 Delete missing kernel header files #Source33 because they are
available again in kernel-headers-5.14.0-300 package
2021-10-21 11:35:12 +02:00
2 changed files with 5 additions and 7 deletions

View file

@ -2,7 +2,6 @@ SHA512 (vdr-2.4.7.tar.bz2) = 41b8453bc6cdbb0db728b5d7d6624ab3ff9034b58ba443a8196
SHA512 (vdr-rcu-2.2.0.tgz) = 56abebcfde3511c4dcf6f414915c7aa70a16b8e138e2d9364080828edc9b0da045acaadaaa4094d1315ddefdafa5f966aebcfacf979c068e077f1e32e29773b7
SHA512 (vdr-dvbsddevice-2.2.0.tgz) = ac0b94b8b192208ad7e736d7c4f27cca6517134b17fc86a79cdd19453176d5f6076418bf679435899cd953053f3b54776342bcdab23a659e8331e9f2ed4ee364
SHA512 (2ea854ae8c7a.zip) = 2b3e5c91646e4250afc53577393c9d10f11fcbc46353535e38e9ddcfbf5642a4dd0355bd7583262bd684ef76cf75373585b3f67fdf154f22ee85541625fa467f
SHA512 (kernel-headers-5.13.tar.gz) = 02188d21a871ea7400ccc59d9045b1e147e25e9dc07a8f8773efb187bd2ffd536bf60e10f9fc62fa6afdc7c64cd2b5646e0cc56c6718cdee46dbf7a83ee11ad8
SHA512 (vdr_2.2.0-5.debian.tar.bz2) = 6ba924fee84673be2a2652a26bccde4dc07dd9c7bcc871868f44bdc2748136a8ac26feb026c5b5dd9b3831c641ef1e729052c1190a45cc805f3fa563c3a59798
SHA512 (vdr_1.4.5-2.ds.diff.gz) = dc82ca24e830a4fc4bfed51b2d112301b9058f2d1fea93761a42df8715dbe3ba0e9e8621464c8a6fe2dd3bd62d33efaff911182d3489ef741096654b7a3eb326
SHA512 (vdr-2.4.6-editrecording.patch.gz) = 0935fdbe6b557c8b03396ff31021b35758a040f297315f39bdf605961a8ad77897884b527e2655e36ff8241e06cd1b2592c3bd0be09e78434263e43e85368e86

View file

@ -30,7 +30,7 @@
Name: vdr
Version: 2.4.7
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Video Disk Recorder
License: GPLv2+
@ -60,7 +60,6 @@ Source21: %{name}-set-wakeup.sh
Source30: https://bitbucket.org/powARman/dvbhddevice/get/2ea854ae8c7a.zip
Source31: ftp://ftp.tvdr.de/vdr/Plugins/vdr-dvbsddevice-2.2.0.tgz
Source32: ftp://ftp.tvdr.de/vdr/Plugins/vdr-rcu-2.2.0.tgz
Source33: kernel-headers-5.13.tar.gz
Patch0: define_AUDIO_GET_PTS.patch
Patch1: http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr_1.4.5-2.ds.diff.gz
@ -81,7 +80,6 @@ Patch15: %{name}-1.7.37-fedora-pkgconfig.patch
Patch16: vdr-2.4.4-RecordingInfo.patch
# https://gitweb.gentoo.org/repo/gentoo.git/plain/media-video/vdr/files/vdr-2.4.7_gcc11.patch
Patch17: vdr-2.4.7_gcc11.patch
Patch20: missing-kernel-headers.patch
# https://www.vdr-portal.de/index.php?attachment/44831-vdr-2-4-6-clearobsoletechannels-diff/
Patch99: %{name}-2.4.6-ClearObsoleteChannels2.diff
@ -177,8 +175,6 @@ window, using only plain text output.
%prep
%setup -q -a 18
# kernel-headers-5.13 files for dvbhddevice and dvbsddevice
tar -xzf %{SOURCE33} -C $RPM_BUILD_DIR/vdr-%{apiver}/
# dvbhddevice
unzip -o %{SOURCE30} -d $RPM_BUILD_DIR/vdr-%{apiver}/PLUGINS/src
mv $RPM_BUILD_DIR/vdr-%{apiver}/PLUGINS/src/powARman-dvbhddevice-2ea854ae8c7a $RPM_BUILD_DIR/vdr-%{apiver}/PLUGINS/src/dvbhddevice
@ -214,7 +210,6 @@ sed \
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch20 -p1
%patch99 -p1
# Patch APIVERSION TO 2.4.7 to match VDRVERSION
@ -562,6 +557,10 @@ systemctl daemon-reload
%changelog
* Thu Oct 21 2021 Martin Gansser <martinkg@fedoraproject.org> - 2.4.7-5
- Delete missing kernel header files #Source33 because they are
available again in kernel-headers-5.14.0-300 package
* Tue Aug 03 2021 Martin Gansser <martinkg@fedoraproject.org> - 2.4.7-4
- Add missing kernel-header files audio.h osd.h and video.h via #Source33
- Add missing-kernel-headers.patch fixes (BZ#1989125) (BZ#1988085)