From 007442089b9d53ea7377c9df25b6bdab204583f7 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Fri, 21 Sep 2018 14:12:21 +0200 Subject: [PATCH 1/4] bolt 0.5 release Remove forge macros again and use gitlab as authorative source Testing depedencies are now only pulled in on Fedora --- .gitignore | 1 + bolt.spec | 34 +++++++++++++++++++--------------- sources | 2 +- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index e245806..9e3fdc3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /bolt-0.2.tar.gz /bolt-0.3.tar.gz /bolt-0.4.tar.gz +/bolt-0.5.tar.gz diff --git a/bolt.spec b/bolt.spec index 77fb8c1..d2e9e68 100644 --- a/bolt.spec +++ b/bolt.spec @@ -1,15 +1,12 @@ -%global forgeurl https://github.com/gicmo/bolt - Name: bolt -Version: 0.4 -%global tag %{version} -%forgemeta -Release: 2%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Thunderbolt device manager License: LGPLv2+ -URL: %{forgeurl} -Source0: %{forgesource} +URL: https://gitlab.freedesktop.org/bolt/bolt +Source0: %{url}/-/archive/%{version}/%{name}-%{version}.tar.gz +BuildRequires: gcc BuildRequires: asciidoc BuildRequires: meson BuildRequires: libudev-devel @@ -17,12 +14,16 @@ BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(systemd) BuildRequires: polkit-devel +BuildRequires: systemd +%{?systemd_requires} + +# for the integration test (optional) +%if 0%{?fedora} BuildRequires: pygobject3-devel BuildRequires: python3-dbus BuildRequires: python3-dbusmock BuildRequires: umockdev-devel -BuildRequires: systemd -%{?systemd_requires} +%endif %description bolt is a system daemon to manage thunderbolt 3 devices via a D-BUS @@ -37,10 +38,10 @@ boltctl, can be used to control the daemon and perform all the above mentioned tasks. %prep -%forgesetup +%setup -q %build -%meson -Ddb-path=%{_localstatedir}/lib/boltd +%meson -Ddb-name=boltd %meson_build %check @@ -48,8 +49,6 @@ mentioned tasks. %install %meson_install -install -m0755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/boltd - %post %systemd_post %{name}.service @@ -74,9 +73,14 @@ install -m0755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/boltd %{_datadir}/dbus-1/system-services/org.freedesktop.bolt.service %{_mandir}/man1/boltctl.1* %{_mandir}/man8/boltd.8* -%dir %{_localstatedir}/lib/boltd +%ghost %dir %{_localstatedir}/lib/boltd %changelog +* Fri Sep 21 2018 Christian Kellner - 0.5-1 +- bolt 0.5 release +- Remove forge macros again and use gitlab as authorative source +- Testing depedencies are now only pulled in on Fedora + * Thu Jul 12 2018 Fedora Release Engineering - 0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 4ff25be..a3a85a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bolt-0.4.tar.gz) = 3ea6b748768b5d9df60425274ecdb4ccd5ce6599e01f0648a24704643fbbadd7a114d4a1946ee3b7bd8866935758cbfe4494734c26c12ccc508c205a036d5317 +SHA512 (bolt-0.5.tar.gz) = d36f2e39ac53b131fb9607055231a5a205c368547c0db2c3a7537b6e60b156c8b0663d1e5b09c825e1e1a63fbe21087746d0bafde1bd474eb90f1d0cff991246 From 923876d3f54dd1e17fd8c8bb7534282f334468da Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Wed, 28 Nov 2018 14:02:34 +0100 Subject: [PATCH 2/4] bolt 0.6 release This version includes support for the pre-boot access control list. --- .gitignore | 1 + bolt.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9e3fdc3..51f00a9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /bolt-0.3.tar.gz /bolt-0.4.tar.gz /bolt-0.5.tar.gz +/bolt-0.6.tar.gz diff --git a/bolt.spec b/bolt.spec index d2e9e68..e9a61ff 100644 --- a/bolt.spec +++ b/bolt.spec @@ -1,5 +1,5 @@ Name: bolt -Version: 0.5 +Version: 0.6 Release: 1%{?dist} Summary: Thunderbolt device manager License: LGPLv2+ @@ -76,6 +76,9 @@ mentioned tasks. %ghost %dir %{_localstatedir}/lib/boltd %changelog +* Wed Nov 28 2018 Christian Kellner - 0.6-1 +- bolt 0.6 release + * Fri Sep 21 2018 Christian Kellner - 0.5-1 - bolt 0.5 release - Remove forge macros again and use gitlab as authorative source diff --git a/sources b/sources index a3a85a5..acce42a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bolt-0.5.tar.gz) = d36f2e39ac53b131fb9607055231a5a205c368547c0db2c3a7537b6e60b156c8b0663d1e5b09c825e1e1a63fbe21087746d0bafde1bd474eb90f1d0cff991246 +SHA512 (bolt-0.6.tar.gz) = 15124a6c30c6ca2385102545a8aca7b7d65512523b8962384368529e44d71e954f9097a4d7488285ea3dc68b758e92ea2de223aea373f4caf2320b47d1ab8fd1 From c4dccbc7e2a17fc57fc87ef305cdce9f8c8a874e Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Tue, 1 Jan 2019 18:33:59 +0100 Subject: [PATCH 3/4] .gitignore: ignore some tmp files/dirs --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 51f00a9..f891346 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,10 @@ +bolt-*/ +x86_64/ +results_bolt/ +*.log +*.rpm + +#tarballs /bolt-0.1.tar.gz /bolt-0.2.tar.gz /bolt-0.3.tar.gz From d61b1fedc1eec91049c1d9abb33fe0ec0a0cee5a Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Tue, 1 Jan 2019 18:34:30 +0100 Subject: [PATCH 4/4] bolt 0.7 release bolt 0.7 is mostly a bugfix release. --- .gitignore | 1 + bolt.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f891346..3bf8b9c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ results_bolt/ /bolt-0.4.tar.gz /bolt-0.5.tar.gz /bolt-0.6.tar.gz +/bolt-0.7.tar.gz diff --git a/bolt.spec b/bolt.spec index e9a61ff..6d1832d 100644 --- a/bolt.spec +++ b/bolt.spec @@ -1,5 +1,5 @@ Name: bolt -Version: 0.6 +Version: 0.7 Release: 1%{?dist} Summary: Thunderbolt device manager License: LGPLv2+ @@ -76,6 +76,9 @@ mentioned tasks. %ghost %dir %{_localstatedir}/lib/boltd %changelog +* Tue Jan 1 2019 Christian Kellner - 0.7-1 +- bolt 0.7 release + * Wed Nov 28 2018 Christian Kellner - 0.6-1 - bolt 0.6 release diff --git a/sources b/sources index acce42a..d79317f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bolt-0.6.tar.gz) = 15124a6c30c6ca2385102545a8aca7b7d65512523b8962384368529e44d71e954f9097a4d7488285ea3dc68b758e92ea2de223aea373f4caf2320b47d1ab8fd1 +SHA512 (bolt-0.7.tar.gz) = 6786f701501cc2680fac52cda7cdfe37971044abcf058b5c83bfa9f1d0a0381ba00e3377cfc97fcccf53760a2eafc1f8f6d0754f0e121d94201711ad8e40a135