[faac] Drop libtool deps
by Nicolas Chauvet
commit 23e138777a15d51bc70917f7efca22afc6f03384
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jan 29 13:12:19 2019 +0100
Drop libtool deps
faac-1.29.9.2-drm.patch | 128 ++++++++++++++++++++++++++++++++++++++++++++++++
faac.spec | 4 +-
2 files changed, 129 insertions(+), 3 deletions(-)
---
diff --git a/faac-1.29.9.2-drm.patch b/faac-1.29.9.2-drm.patch
index 685b6ce..b822df0 100644
--- a/faac-1.29.9.2-drm.patch
+++ b/faac-1.29.9.2-drm.patch
@@ -22,3 +22,131 @@ index 6211c82..044b372 100644
libfaac_la_LDFLAGS = -no-undefined
if MINGW
+diff --git a/libfaac/Makefile.in b/libfaac/Makefile.in
+index 6211c82..044b372 100644
+--- a/libfaac/Makefile.in
++++ b/libfaac/Makefile.in
+@@ -130,12 +130,7 @@ am__uninstall_files_from_dir = { \
+ am__installdirs = "$(DESTDIR)$(libdir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-@USE_DRM_FALSE@libfaac_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__libfaac_la_SOURCES_DIST = bitstream.c fft.c frame.c blockswitch.c \
+- util.c channels.c filtbank.c tns.c quantize.c huff2.c \
+- huffdata.c stereo.c channels.h filtbank.h blockswitch.h \
+- coder.h frame.h tns.h bitstream.h fft.h util.h quantize.h \
+- huffdata.h huff2.h stereo.h
++libfaac_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am__objects_1 = libfaac_la-bitstream.lo libfaac_la-fft.lo \
+ libfaac_la-frame.lo libfaac_la-blockswitch.lo \
+ libfaac_la-util.lo libfaac_la-channels.lo \
+@@ -143,8 +138,7 @@ am__objects_1 = libfaac_la-bitstream.lo
+ libfaac_la-quantize.lo libfaac_la-huff2.lo \
+ libfaac_la-huffdata.lo libfaac_la-stereo.lo
+ am__objects_2 =
+-@USE_DRM_FALSE@am_libfaac_la_OBJECTS = $(am__objects_1) \
+-@USE_DRM_FALSE@ $(am__objects_2)
++am_libfaac_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+ libfaac_la_OBJECTS = $(am_libfaac_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -153,14 +147,7 @@ am__v_lt_1 =
+ libfaac_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libfaac_la_CFLAGS) \
+ $(CFLAGS) $(libfaac_la_LDFLAGS) $(LDFLAGS) -o $@
+-@USE_DRM_FALSE@am_libfaac_la_rpath = -rpath $(libdir)
+-@USE_DRM_TRUE@libfaac_drm_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__libfaac_drm_la_SOURCES_DIST = bitstream.c fft.c frame.c \
+- blockswitch.c util.c channels.c filtbank.c tns.c quantize.c \
+- huff2.c huffdata.c stereo.c channels.h filtbank.h \
+- blockswitch.h coder.h frame.h tns.h bitstream.h fft.h util.h \
+- quantize.h huffdata.h huff2.h stereo.h kiss_fft/kiss_fftr.c \
+- kiss_fft/kiss_fft.c kiss_fft/kiss_fft.h
++libfaac_drm_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am__objects_3 = libfaac_drm_la-bitstream.lo libfaac_drm_la-fft.lo \
+ libfaac_drm_la-frame.lo libfaac_drm_la-blockswitch.lo \
+ libfaac_drm_la-util.lo libfaac_drm_la-channels.lo \
+@@ -168,18 +155,14 @@ am__objects_3 = libfaac_drm_la-bitstream
+ libfaac_drm_la-quantize.lo libfaac_drm_la-huff2.lo \
+ libfaac_drm_la-huffdata.lo libfaac_drm_la-stereo.lo
+ am__dirstamp = $(am__leading_dot)dirstamp
+-@USE_DRM_TRUE@am_libfaac_drm_la_OBJECTS = $(am__objects_3) \
+-@USE_DRM_TRUE@ $(am__objects_2) \
+-@USE_DRM_TRUE@ kiss_fft/libfaac_drm_la-kiss_fftr.lo \
+-@USE_DRM_TRUE@ kiss_fft/libfaac_drm_la-kiss_fft.lo
+-am__EXTRA_libfaac_drm_la_SOURCES_DIST = kiss_fft/_kiss_fft_guts.h \
+- kiss_fft/kiss_fftr.h kiss_fft/README kiss_fft/README.kiss_fft
++am_libfaac_drm_la_OBJECTS = $(am__objects_3) $(am__objects_2) \
++ kiss_fft/libfaac_drm_la-kiss_fftr.lo \
++ kiss_fft/libfaac_drm_la-kiss_fft.lo
+ libfaac_drm_la_OBJECTS = $(am_libfaac_drm_la_OBJECTS)
+ libfaac_drm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(libfaac_drm_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+ $@
+-@USE_DRM_TRUE@am_libfaac_drm_la_rpath = -rpath $(libdir)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+ am__v_P_0 = false
+@@ -216,9 +199,8 @@ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
+ SOURCES = $(libfaac_la_SOURCES) $(libfaac_drm_la_SOURCES) \
+ $(EXTRA_libfaac_drm_la_SOURCES)
+-DIST_SOURCES = $(am__libfaac_la_SOURCES_DIST) \
+- $(am__libfaac_drm_la_SOURCES_DIST) \
+- $(am__EXTRA_libfaac_drm_la_SOURCES_DIST)
++DIST_SOURCES = $(libfaac_la_SOURCES) $(libfaac_drm_la_SOURCES) \
++ $(EXTRA_libfaac_drm_la_SOURCES)
+ am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+@@ -358,7 +340,6 @@ pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+-runstatedir = @runstatedir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+@@ -371,15 +352,14 @@ common_SOURCES = bitstream.c fft.c frame
+ common_INCLUDES = channels.h filtbank.h blockswitch.h coder.h frame.h tns.h bitstream.h fft.h util.h quantize.h huffdata.h huff2.h stereo.h
+ common_LIBADD = -lm
+ common_CFLAGS = -fvisibility=hidden $(am__append_1)
+-@USE_DRM_FALSE@lib_LTLIBRARIES = libfaac.la
+-@USE_DRM_TRUE@lib_LTLIBRARIES = libfaac_drm.la
+-@USE_DRM_TRUE@libfaac_drm_la_SOURCES = ${common_SOURCES} ${common_INCLUDES} kiss_fft/kiss_fftr.c kiss_fft/kiss_fft.c kiss_fft/kiss_fft.h
+-@USE_DRM_TRUE@EXTRA_libfaac_drm_la_SOURCES = kiss_fft/_kiss_fft_guts.h kiss_fft/kiss_fftr.h kiss_fft/README kiss_fft/README.kiss_fft
+-@USE_DRM_TRUE@libfaac_drm_la_LIBADD = ${common_LIBADD}
+-@USE_DRM_TRUE@libfaac_drm_la_CFLAGS = ${common_CFLAGS} -DDRM
+-@USE_DRM_FALSE@libfaac_la_SOURCES = ${common_SOURCES} ${common_INCLUDES}
+-@USE_DRM_FALSE@libfaac_la_LIBADD = ${common_LIBADD}
+-@USE_DRM_FALSE@libfaac_la_CFLAGS = ${common_CFLAGS}
++lib_LTLIBRARIES = libfaac_drm.la libfaac.la
++libfaac_drm_la_SOURCES = ${common_SOURCES} ${common_INCLUDES} kiss_fft/kiss_fftr.c kiss_fft/kiss_fft.c kiss_fft/kiss_fft.h
++EXTRA_libfaac_drm_la_SOURCES = kiss_fft/_kiss_fft_guts.h kiss_fft/kiss_fftr.h kiss_fft/README kiss_fft/README.kiss_fft
++libfaac_drm_la_LIBADD = ${common_LIBADD}
++libfaac_drm_la_CFLAGS = ${common_CFLAGS} -DDRM
++libfaac_la_SOURCES = ${common_SOURCES} ${common_INCLUDES}
++libfaac_la_LIBADD = ${common_LIBADD}
++libfaac_la_CFLAGS = ${common_CFLAGS}
+ libfaac_la_LDFLAGS = -no-undefined $(am__append_2)
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ all: all-am
+@@ -452,7 +432,7 @@ clean-libLTLIBRARIES:
+ }
+
+ libfaac.la: $(libfaac_la_OBJECTS) $(libfaac_la_DEPENDENCIES) $(EXTRA_libfaac_la_DEPENDENCIES)
+- $(AM_V_CCLD)$(libfaac_la_LINK) $(am_libfaac_la_rpath) $(libfaac_la_OBJECTS) $(libfaac_la_LIBADD) $(LIBS)
++ $(AM_V_CCLD)$(libfaac_la_LINK) -rpath $(libdir) $(libfaac_la_OBJECTS) $(libfaac_la_LIBADD) $(LIBS)
+ kiss_fft/$(am__dirstamp):
+ @$(MKDIR_P) kiss_fft
+ @: > kiss_fft/$(am__dirstamp)
+@@ -465,7 +445,7 @@ kiss_fft/libfaac_drm_la-kiss_fft.lo: kis
+ kiss_fft/$(DEPDIR)/$(am__dirstamp)
+
+ libfaac_drm.la: $(libfaac_drm_la_OBJECTS) $(libfaac_drm_la_DEPENDENCIES) $(EXTRA_libfaac_drm_la_DEPENDENCIES)
+- $(AM_V_CCLD)$(libfaac_drm_la_LINK) $(am_libfaac_drm_la_rpath) $(libfaac_drm_la_OBJECTS) $(libfaac_drm_la_LIBADD) $(LIBS)
++ $(AM_V_CCLD)$(libfaac_drm_la_LINK) -rpath $(libdir) $(libfaac_drm_la_OBJECTS) $(libfaac_drm_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
diff --git a/faac.spec b/faac.spec
index 02ef682..a7754a2 100644
--- a/faac.spec
+++ b/faac.spec
@@ -7,8 +7,7 @@ License: LGPLv2+
URL: http://www.audiocoding.com/
Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.t...
-BuildRequires: libtool
-BuildRequires: autoconf
+BuildRequires: gcc
Patch0: faac-1.29.9.2-drm.patch
@@ -36,7 +35,6 @@ This package contains development files and documentation for libfaac.
%build
-autoreconf -fiv
%configure --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
5 years, 9 months
[faad2] (2 commits) ...Update changelog
by Nicolas Chauvet
Summary of changes:
875940c... Drop autoreconf (*)
9812760... Update changelog (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 9 months
[faad2/el8] Update changelog
by Nicolas Chauvet
commit 9812760ad39d7c209cae2995219144c513a017ca
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jan 29 12:54:01 2019 +0100
Update changelog
faad2.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/faad2.spec b/faad2.spec
index f070722..f4356ca 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -4,7 +4,7 @@ Summary: Library and frontend for decoding MPEG2/4 AAC
Name: faad2
Epoch: 1
Version: 2.8.8
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.audiocoding.com/faad2.html
@@ -102,6 +102,9 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
%{xmmsinputplugindir}/libmp4.so
%changelog
+* Tue Jan 29 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.8.8-3
+- Drop autoreconf
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:2.8.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
5 years, 9 months
[faad2/el8] Drop autoreconf
by Nicolas Chauvet
commit 875940ce4597640a76580e93ab675f4af8491dd9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jan 29 12:53:43 2019 +0100
Drop autoreconf
faad2-pic.patch | 11 +++++++++++
faad2.spec | 7 ++++---
2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/faad2-pic.patch b/faad2-pic.patch
index 5ab3abe..a92722d 100644
--- a/faad2-pic.patch
+++ b/faad2-pic.patch
@@ -10,3 +10,14 @@
libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
mp4tagupdate.c mp4ff.h mp4ffint.h
+--- a/common/mp4ff/Makefile.in
++++ b/common/mp4ff/Makefile.in
+@@ -308,7 +307,7 @@
+ top_srcdir = @top_srcdir@
+ noinst_LIBRARIES = libmp4ff.a
+ noinst_HEADERS = mp4ff.h mp4ffint.h
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++libmp4ff_a_CFLAGS = -DUSE_TAGGING=1 -DPIC -fPIC
+ libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+ mp4tagupdate.c mp4ff.h mp4ffint.h
+
diff --git a/faad2.spec b/faad2.spec
index cae40ae..f070722 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -14,8 +14,6 @@ Patch0: %{name}-pic.patch
Patch1: fix_undefined_version.patch
BuildRequires: gcc-c++
-BuildRequires: automake
-BuildRequires: libtool
BuildRequires: id3lib-devel
BuildRequires: libsysfs-devel
BuildRequires: xmms-devel
@@ -62,13 +60,16 @@ This package contains an input plugin for xmms.
%prep
%autosetup -p1
-autoreconf -fiv
%build
%configure \
--disable-static \
--with-xmms
+# remove rpath from libtool
+sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
%make_build
%install
5 years, 9 months
[kodi] Kodi 18.0 final
by Leigh Scott
commit 2241df2e88107357e79d23640e781fa6e6b2978b
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Jan 29 08:53:57 2019 +0000
Kodi 18.0 final
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 11 +++++++----
sources | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index ca7c923..be04fea 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=18
-MINORVERSION=0rc5
+MINORVERSION=0
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Leia
diff --git a/kodi.spec b/kodi.spec
index a8ae123..67995f5 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,8 +1,8 @@
-%global PRERELEASE rc5
-#global DIRVERSION %{version}
+#global PRERELEASE rc5
+%global DIRVERSION %{version}
#global GITCOMMIT Gotham_r2-ge988513
# use the line below for pre-releases
-%global DIRVERSION %{version}%{PRERELEASE}
+#global DIRVERSION %{version}%{PRERELEASE}
%global _hardened_build 1
# We support hte following options:
@@ -30,7 +30,7 @@
Name: kodi
Version: 18.0
-Release: 0.24.rc5%{?dist}
+Release: 1%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -481,6 +481,9 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/
%changelog
+* Tue Jan 29 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 18.0-1
+- Kodi 18.0 final
+
* Sat Jan 12 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 18.0-0.24.rc5
- Kodi 18.0 RC5
diff --git a/sources b/sources
index 3d58e6a..14e748c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-b1b8f145763819ba3648b230794a55d2 kodi-18.0rc5-patched.tar.xz
+11493da7e2a245d66439b46510998834 kodi-18.0-patched.tar.xz
2aec5f8c790449126118abc6bb3cb5cd kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
f3244e7b002d37f91cc6a77461c4f619 kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz
5 years, 10 months
[mp4tools] Rebuilt for wxsvg-1.5.16
by Martin Gansser
commit e15b17231761c04b8f19c9120c7295a658bc89b6
Author: Martin Gansser <mgansser(a)online.de>
Date: Tue Jan 29 08:24:02 2019 +0100
Rebuilt for wxsvg-1.5.16
mp4tools.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mp4tools.spec b/mp4tools.spec
index 01d046d..4fb850a 100644
--- a/mp4tools.spec
+++ b/mp4tools.spec
@@ -13,7 +13,7 @@ Version: 3.8
Release: 1.beta3%{?snapshottag}%{?dist}
%else
Version: 3.7
-Release: 3%{?dist}
+Release: 4%{?dist}
%endif
Summary: A free cross-platform tool to manipulate MP4 files
License: GPLv2
@@ -41,7 +41,7 @@ BuildRequires: ffmpeg
BuildRequires: ffmpeg-devel
BuildRequires: gettext-devel
BuildRequires: gpac
-BuildRequires: wxsvg-devel
+BuildRequires: wxsvg-devel >= 1.5.16
Requires: ffmpeg
Requires: gpac
@@ -122,6 +122,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mp4splitter.desktop
%{_datadir}/pixmaps/mp4splitter.png
%changelog
+* Tue Jan 29 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 3.7.1-4
+- Rebuilt for wxsvg-1.5.16
+
* Mon Jan 28 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 3.7.1-3
- Rebuilt for wxsvg-1.5.16
5 years, 10 months
[VirtualBox-kmod] Update to 6.0.4
by Sérgio M. Basto
commit 2efdc6bfc1a4c7f8419f5862e084bad340a1c9f1
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jan 29 04:39:05 2019 +0000
Update to 6.0.4
0001-Fix-FTBFS-for-kernel-5.0.0-rc3.patch | 26 +++++
...on_of_host_modules_on_Linux_kernel_5.0.v1.patch | 12 ++
VirtualBox-kmod.spec | 14 ++-
changeset_75402.diff | 125 ---------------------
fixes_for_4.17.patch | 29 -----
5 files changed, 49 insertions(+), 157 deletions(-)
---
diff --git a/0001-Fix-FTBFS-for-kernel-5.0.0-rc3.patch b/0001-Fix-FTBFS-for-kernel-5.0.0-rc3.patch
new file mode 100644
index 0000000..dff74ba
--- /dev/null
+++ b/0001-Fix-FTBFS-for-kernel-5.0.0-rc3.patch
@@ -0,0 +1,26 @@
+From d1860de35252ec91f03d1f32618ee147cda14eac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio(a)serjux.com>
+Date: Tue, 29 Jan 2019 04:06:03 +0000
+Subject: [PATCH] Fix FTBFS for kernel 5.0.0-rc3
+
+---
+ vfsmod.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/vfsmod.h b/vfsmod.h
+index 20efcb7..b0c257c 100644
+--- a/vfsmod.h
++++ b/vfsmod.h
+@@ -10,6 +10,9 @@
+
+ #include <linux/backing-dev.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++# include <uapi/linux/mount.h>
++#endif
+ #include "shfl_hostintf.h"
+
+ #define DIR_BUFFER_SIZE SZ_16K
+--
+2.17.2
+
diff --git a/Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch b/Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch
new file mode 100644
index 0000000..bd80c59
--- /dev/null
+++ b/Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch
@@ -0,0 +1,12 @@
+--- ./VirtualBox-kmod-6.0.2/vboxsf/vfsmod.c.orig 2019-01-27 03:29:18.138159346 +0000
++++ ./VirtualBox-kmod-6.0.2/vboxsf/vfsmod.c 2019-01-27 03:54:08.850764196 +0000
+@@ -43,6 +43,9 @@
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+ # include <linux/mount.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++# include <uapi/linux/mount.h>
++#endif
+ #include <linux/seq_file.h>
+
+ MODULE_DESCRIPTION(VBOX_PRODUCT " VFS Module for Host File System Access");
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 02309db..eb1762c 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -39,8 +39,8 @@
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 6.0.2
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Version: 6.0.4
+Release: 1%{?dist}
#Release: 1%%{?dist}
Summary: Kernel module for VirtualBox
@@ -50,6 +50,8 @@ URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: excludekernel-filter.txt
Source2: https://github.com/jwrdegoede/vboxsf/archive/master.zip
+Patch1: Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch
+Patch2: 0001-Fix-FTBFS-for-kernel-5.0.0-rc3.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
@@ -74,11 +76,14 @@ Kernel module for VirtualBox
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
-#patch1 -p2 -b .kernel_4.18
+%patch1 -p2 -b .kernel_5.0
%if %{with newvboxsf}
rm -rf vboxsf/
unzip %{SOURCE2}
mv vboxsf-master/ vboxsf/
+pushd vboxsf
+%patch2 -p1 -b .kernel_5.0.rc3
+popd
%endif
popd
@@ -139,6 +144,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Tue Jan 29 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.4-1
+- Update to 6.0.4
+
* Thu Jan 17 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 6.0.2-1
- Update to 6.0.2
5 years, 10 months
[lpf-flash-plugin] https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
by Sérgio M. Basto
commit b6ca3b4b6e83b4874fb474058c1a9420c4466029
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jan 29 02:28:32 2019 +0000
https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
flash-plugin.spec.in | 12 ------------
1 file changed, 12 deletions(-)
---
diff --git a/flash-plugin.spec.in b/flash-plugin.spec.in
index 49dc8c5..6263b53 100644
--- a/flash-plugin.spec.in
+++ b/flash-plugin.spec.in
@@ -53,18 +53,6 @@ install -p -m 0755 -D libflashplayer.so \
desktop-file-validate %{buildroot}%{_datadir}/applications/flash-player-properties.desktop
-%post properties
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun properties
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans properties
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files
%doc readme.txt
%{_libdir}/mozilla/plugins/libflashplayer.so
5 years, 10 months