+3 -1

rpm/.dockerignore

reviewed

··· 1 1 - SOURCES 1 1 + SOURCES 2 2 + RPMS 3 3 + SRPMS

+7 -7

rpm/Dockerfile

reviewed

··· 1 1 - ARG OS=fedora:27 1 1 + ARG OS=fedora:28 2 2 FROM ${OS} 3 3 4 4 SHELL ["bash", "-euxvc"] 5 5 6 6 - RUN dnf install -y rpm-build dnf-utils rpmdevtools;\ 6 6 + RUN dnf install -y rpm-build dnf-utils rpmdevtools; \ 7 7 dnf clean all 8 8 9 9 # Bootstrap 10 10 - RUN dnf install -y bison cairo-devel clang cmake dkms flex fontconfig-devel \ 11 11 - fontconfig-devel.i686 freetype-devel freetype-devel.i686 \ 10 10 + RUN dnf install -y bison cairo-devel clang cmake dkms flex fontconfig-devel.x86_64 \ 11 11 + fontconfig-devel.i686 freetype-devel.x86_64 freetype-devel.i686 \ 12 12 fuse-devel glibc-devel glibc-devel.i686 kernel-devel \ 13 13 libglvnd-devel libjpeg-turbo-devel libjpeg-turbo-devel.i686 \ 14 14 - libtiff-devel libtiff-devel.i686 mesa-libGL-devel python2 \ 15 15 - systemd-devel;\ 14 14 + libtiff-devel libtiff-devel.i686 mesa-libGL-devel mesa-libEGL-devel \ 15 15 + python2 systemd-devel make libxml2-devel elfutils-libelf-devel; \ 16 16 dnf clean all 17 17 18 18 RUN mkdir -p /root/rpmbuild/SOURCES 19 19 20 20 - CMD bash -xv /src/rpm/build.bsh 20 20 + CMD bash -xv /src/rpm/build.bsh

+2 -2

rpm/README.md

reviewed

··· 8 8 9 9 ## Building on other operating systems 10 10 11 11 - By default, it will build for Fedora 27. To use a different OS, simply 11 11 + By default, it will build for Fedora 28. To use a different OS, simply 12 12 13 13 - RPM_OS=fedora:26 13 13 + RPM_OS=fedora:27 14 14 15 15 ## Future improvements 16 16

+11 -4

rpm/SPECS/darling.spec

reviewed

··· 5 5 6 6 Name: darling 7 7 Version: 0.1 8 8 - Release: 1%{?dist} 8 8 + Release: 2%{?dist} 9 9 Summary: Darling 10 10 11 11 Group: Utility ··· 19 19 BuildRequires: cmake clang bison flex python2 glibc-devel(x86-64) glibc-devel(x86-32) 20 20 BuildRequires: fuse-devel systemd-devel kernel-devel dkms 21 21 BuildRequires: cairo-devel freetype-devel(x86-64) fontconfig-devel(x86-64) 22 22 - BuildRequires: freetype-devel(x86-32) fontconfig-devel(x86-32) 22 22 + BuildRequires: freetype-devel(x86-32) fontconfig-devel(x86-32) make 23 23 BuildRequires: libjpeg-turbo-devel(x86-64) libtiff-devel(x86-64) 24 24 BuildRequires: libjpeg-turbo-devel(x86-32) libtiff-devel(x86-32) 25 25 - BuildRequires: libglvnd-devel mesa-libGL-devel 25 25 + BuildRequires: libglvnd-devel mesa-libGL-devel mesa-libEGL-devel 26 26 + BuildRequires: libxml2-devel elfutils-libelf-devel 26 27 27 28 #It will pick up all the mac pieces as dependencies. No thank you! 28 29 AutoReqProv: no ··· 48 49 # Release is broken https://github.com/darlinghq/darling/issues/331 49 50 # -DCMAKE_BUILD_TYPE=Release \ 50 51 %{__cmake} -DCMAKE_INSTALL_PREFIX=/usr \ 52 52 + -DOpenGL_GL_PREFERENCE=GLVND \ 51 53 .. 52 54 %{make_build} 53 55 popd ··· 90 92 %{_sysconfdir}/udev/rules.d/00-darling-mach.rules 91 93 %{_prefix}/src/%{name}-mach-%{version} 92 94 93 93 - %changelog 95 95 + %changelog 96 96 + * Wed Jul 18 2018 Andy Neff <andy@visionsystemsinc.com> - 0.1-2 97 97 + - Update for Fedora 28 and new master 98 98 + 99 99 + * Tue Jan 23 2018 Andy Neff <andy@visionsystemsinc.com> - 0.1-1 100 100 + - Initial version working for Fedora 27

+1 -1

rpm/docker-compose.yml

reviewed

··· 5 5 build: 6 6 context: . 7 7 args: 8 8 - - OS=${RPM_OS-fedora:27} 8 8 + - OS=${RPM_OS-fedora:28} 9 9 volumes: 10 10 - ..:/src:ro 11 11 - ./RPMS:/root/rpmbuild/RPMS