this repo has no description
Merge pull request #864 from andyneff/fedora_31
Update to work on Fedora 31 with newest version
authored by
Sergey Bugaev
and committed by
GitHub
8fce6f5d
1eb3ba8e
+26
-14
+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
+16
-8
rpm/SPECS/darling.spec
+16
-8
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
+
# https://github.com/dell/dkms/issues/25
72
75
%preun mach
73
-
/usr/sbin/dkms remove -m %{name}-mach -v %{version} --all || :
76
+
/usr/sbin/dkms remove -m %{name}-mach -v %{version} --all --rpm_safe_upgrade || :
74
77
75
-
%post mach
76
-
occurrences=$(/usr/sbin/dkms status | grep "%{name}" | grep "%{version}" | wc -l)
77
-
if [ ! ${occurrences} -gt 0 ];
78
-
then
79
-
/usr/sbin/dkms add -m %{name}-mach -v %{version} || :
78
+
%pre mach
79
+
occurrences=$(/usr/sbin/dkms status "%{name}/%{version}" | wc -l)
80
+
if [ ! ${occurrences} -gt 0 ]; then
81
+
/usr/sbin/dkms remove -m %{name}-mach -v %{version} --all --rpm_safe_upgrade || :
80
82
fi
83
+
84
+
%post mach
85
+
/usr/sbin/dkms add -m %{name}-mach -v %{version} --rpm_safe_upgrade || :
81
86
/usr/sbin/dkms build -m %{name}-mach -v %{version} || :
82
87
/usr/sbin/dkms install -m %{name}-mach -v %{version} || :
83
88
···
90
95
%{_prefix}/src/%{name}-mach-%{version}
91
96
92
97
%changelog
98
+
* Tue Aug 18 2020 Andy Neff <andy@visionsystemsinc.com> - 0.1.20200331-1
99
+
- Update for latest version and Fedora 31
100
+
93
101
* Mon Aug 12 2019 Andy Neff <andy@visionsystemsinc.com> - 0.1-4
94
102
- Update for Fedora 30
95
103
+1
-1
rpm/build.bsh
+1
-1
rpm/build.bsh
···
7
7
ln -s /src/rpm/SOURCES/darling.tar.gz /root/rpmbuild/SOURCES/
8
8
else
9
9
# Preparing tarball
10
-
tar --transform "s|^\./|./darling/|" -cf /root/rpmbuild/SOURCES/darling.tar.gz -C /src --exclude=.git --exclude SOURCES .
10
+
tar --transform "s|^\./|./darling/|" -cf /root/rpmbuild/SOURCES/darling.tar.gz -C /src --exclude=.git --exclude SOURCES --exclude SRPMS --exclude RPMS .
11
11
fi
12
12
ln -s /src/rpm/SOURCES/dkms.conf /root/rpmbuild/SOURCES/
13
13
#spectool -g -R /src/rpm/SPECS/darling.spec
+1
-1
rpm/docker-compose.yml
+1
-1
rpm/docker-compose.yml
+1
-1
rpm/tarup.bsh
+1
-1
rpm/tarup.bsh
···
6
6
if [ -e "${CWD}/SOURCES/darling.tar.gz" ]; then
7
7
rm "${CWD}/SOURCES/darling.tar.gz"
8
8
fi
9
-
tar --transform "s|^\./|darling/|" -cf "${CWD}/SOURCES/darling.tar.gz" -C "${CWD}/.." --exclude=.git --exclude SOURCES .
9
+
tar --transform "s|^\./|darling/|" -cf "${CWD}/SOURCES/darling.tar.gz" -C "${CWD}/.." --exclude=.git --exclude SOURCES --exclude SRPMS --exclude RPMS .