From f0ff4400d06125f7fcc0e8ddc10f83288dfd4efea6c0cc978056c426913d7262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 22 Jan 2019 08:19:30 +0000 Subject: [PATCH] - Update to 2.6.1: * No obvious changelog from upstream OBS-URL: https://build.opensuse.org/package/show/X11:Bumblebee/dkms?expand=0&rev=22 --- dkms-2.3.tar.gz | 3 --- dkms.changes | 6 ++++++ dkms.spec | 24 +++++++++++++----------- v2.6.1.tar.gz | 3 +++ 4 files changed, 22 insertions(+), 14 deletions(-) delete mode 100644 dkms-2.3.tar.gz create mode 100644 v2.6.1.tar.gz diff --git a/dkms-2.3.tar.gz b/dkms-2.3.tar.gz deleted file mode 100644 index f738406..0000000 --- a/dkms-2.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e25c4d399a6abf99550c04b4ede71c0781bd6b5ed5ab32ac4ec95f6181bd31c8 -size 103123 diff --git a/dkms.changes b/dkms.changes index caea837..881f3bc 100644 --- a/dkms.changes +++ b/dkms.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 22 08:14:34 UTC 2019 - Tomáš Chvátal + +- Update to 2.6.1: + * No obvious changelog from upstream + ------------------------------------------------------------------- Mon Apr 24 11:58:23 UTC 2017 - tchvatal@suse.com diff --git a/dkms.spec b/dkms.spec index 65be849..b60ab18 100644 --- a/dkms.spec +++ b/dkms.spec @@ -1,7 +1,7 @@ # # spec file for package dkms # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: dkms -Version: 2.3 +Version: 2.6.1 Release: 0 Summary: Dynamic Kernel Module Support Framework -License: GPL-2.0 +License: GPL-2.0-only Group: System/Kernel -Url: https://github.com/dell/dkms -Source0: https://github.com/dell/dkms/archive/%{version}/dkms-%{version}.tar.gz +URL: https://github.com/dell/dkms +Source0: https://github.com/dell/dkms/archive/v%{version}.tar.gz Source1: dkms.service Source2: dkms.systemd Source3: dkms.default @@ -42,7 +42,6 @@ Requires: mktemp Requires: modutils Requires: sed Requires: tar -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %systemd_requires @@ -62,7 +61,7 @@ make install DESTDIR=%{buildroot} \ VAR=%{buildroot}%{_localstatedir}/lib/%{name} \ MAN=%{buildroot}%{_mandir}/man8 \ ETC=%{buildroot}%{_sysconfdir}/%{name} \ - BASHDIR=%{buildroot}%{_sysconfdir}/bash_completion.d \ + BASHDIR=%{buildroot}%{_datadir}/bash-completion/completions \ LIBDIR=%{buildroot}%{_libexecdir}/%{name} make install-doc DESTDIR=%{buildroot} \ DOCDIR=%{buildroot}%{_docdir}/%{name} @@ -78,6 +77,9 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcdkms # remove regular init file rm -rf %{buildroot}%{_sysconfdir}/rc.d/init.d/dkms_autoinstaller +# remove license in wrong dir +rm -f %{buildroot}%{_docdir}/%{name}/COPYING + sed -i \ -e 's:# tmp_location="/tmp":tmp_location="%{_localstatedir}/tmp/dkms":' \ %{buildroot}%{_sysconfdir}/dkms/framework.conf @@ -109,7 +111,6 @@ exit 0 exit 0 %files -%defattr(-,root,root) %{_sbindir}/%{name} %{_sbindir}/rcdkms %{_localstatedir}/lib/%{name} @@ -117,12 +118,13 @@ exit 0 %{_tmpfilesdir}/dkms.conf %{_mandir}/*/* %config(noreplace) %{_sysconfdir}/%{name} -%doc sample.spec sample.conf AUTHORS COPYING README.dkms +%license COPYING +%doc sample.spec sample.conf AUTHORS README.md %doc sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec # these dirs are for plugins - owned by other packages %{_sysconfdir}/kernel/postinst.d/%{name} %{_sysconfdir}/kernel/prerm.d/%{name} -%config %{_sysconfdir}/bash_completion.d/%{name} +%{_datadir}/bash-completion/completions/%{name} %{_unitdir}/dkms.service %{_unitdir}/dkms.systemd %config %{_sysconfdir}/default/dkms diff --git a/v2.6.1.tar.gz b/v2.6.1.tar.gz new file mode 100644 index 0000000..3f7e904 --- /dev/null +++ b/v2.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a34f42a80e01682efcb13c513692e72f1d21570bbc7a9eba855dde30f116ce7 +size 102156