this repo has no description
Update to work on Fedora 31 with newest version
Signed-off-by: Andy Neff <andy@visionsystemsinc.com>
+21
-6
+6
-2
rpm/Dockerfile
+6
-2
rpm/Dockerfile
···
1
-
ARG OS=fedora:30
1
+
ARG OS=fedora:31
2
2
FROM ${OS}
3
3
4
4
SHELL ["bash", "-euxvc"]
5
5
6
6
RUN dnf install -y rpm-build dnf-utils rpmdevtools; \
7
+
source /etc/os-release; \
8
+
dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-${VERSION_ID}.noarch.rpm; \
7
9
dnf clean all
8
10
9
11
# Bootstrap
···
13
15
libglvnd-devel libjpeg-turbo-devel libjpeg-turbo-devel.i686 \
14
16
libtiff-devel libtiff-devel.i686 mesa-libGL-devel mesa-libEGL-devel \
15
17
python2 systemd-devel make libxml2-devel elfutils-libelf-devel \
16
-
libbsd-devel; \
18
+
libbsd-devel ffmpeg-devel pulseaudio-libs-devel openssl-devel \
19
+
giflib-devel libXrandr-devel libXcursor-devel libxkbfile-devel \
20
+
dbus-devel mesa-libGLU-devel; \
17
21
dnf clean all
18
22
19
23
RUN mkdir -p /root/rpmbuild/SOURCES
+1
-1
rpm/SOURCES/dkms.conf
+1
-1
rpm/SOURCES/dkms.conf
+13
-2
rpm/SPECS/darling.spec
+13
-2
rpm/SPECS/darling.spec
···
4
4
%define debug_package %{nil}
5
5
6
6
Name: darling
7
-
Version: 0.1
8
-
Release: 4%{?dist}
7
+
Version: 0.1.20200331
8
+
Release: 1%{?dist}
9
9
Summary: Darling
10
10
11
11
Group: Utility
···
26
26
BuildRequires: libglvnd-devel mesa-libGL-devel mesa-libEGL-devel
27
27
BuildRequires: libxml2-devel elfutils-libelf-devel
28
28
BuildRequires: libbsd-devel
29
+
BuildRequires: ffmpeg-devel pulseaudio-libs-devel openssl-devel giflib-devel
30
+
BuildRequires: libXrandr-devel libXcursor-devel libxkbfile-devel dbus-devel mesa-libGLU-devel
29
31
# Normally rpm will pick up all the mac pieces as dependencies. Disable that.
30
32
AutoReqProv: no
31
33
···
69
71
70
72
%{__install} -m 644 %{SOURCE1} %{?buildroot}/usr/src/%{name}-mach-%{version}
71
73
74
+
# Note: This is run AFTER the new version is installed... If the new version
75
+
# has the same version number as the old, this means the new version is
76
+
# uninstalled.
77
+
# Order of events:
78
+
# - New version %pre -> (installs files) -> %post
79
+
# - Old version %preun -> (uninstalls files) -> %postun
72
80
%preun mach
73
81
/usr/sbin/dkms remove -m %{name}-mach -v %{version} --all || :
74
82
···
90
98
%{_prefix}/src/%{name}-mach-%{version}
91
99
92
100
%changelog
101
+
* Tue Aug 18 2020 Andy Neff <andy@visionsystemsinc.com> - 0.1.20200331-1
102
+
- Update for latest version and Fedora 31
103
+
93
104
* Mon Aug 12 2019 Andy Neff <andy@visionsystemsinc.com> - 0.1-4
94
105
- Update for Fedora 30
95
106