diff --git a/fwupd.spec b/fwupd.spec index 7888b0c6a901a7eedc54a33bbd09be1dec8585bb..295feb6b1036cb07d47c3bcff454a839c89639cc 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -43,31 +43,31 @@ Name: fwupd Version: 1.8.17 -Release: 6 -License: LGPLv2+ +Release: 7 +License: LGPL-2.1-or-later Summary: Make updating firmware on Linux automatic, safe and reliable URL: https://github.com/fwupd/fwupd -Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz -Source2: http://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.1.tar.xz +Source0: https://github.com/fwupd/fwupd/releases/download/%{version}/%{name}-%{version}.tar.xz +Source2: https://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.1.tar.xz Source3: centos-ca-secureboot.der Source4: centossecureboot001.der Source5: centossecurebootca2.der Source6: centossecureboot203.der -Source7: http://people.redhat.com/rhughes/dbx/DBXUpdate-20100307-x64.cab -Source8: http://people.redhat.com/rhughes/dbx/DBXUpdate-20140413-x64.cab -Source9: http://people.redhat.com/rhughes/dbx/DBXUpdate-20160809-x64.cab -Source10: http://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-aa64.cab -Source11: http://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-ia32.cab -Source12: http://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-x64.cab -Source13: https://sourceforge.net/p/gnu-efi/code/ci/3.0.14/tree/gnuefi/crt0-efi-riscv64.S?format=raw#/crt0-efi-riscv64.S -Source14: https://sourceforge.net/p/gnu-efi/code/ci/3.0.14/tree/gnuefi/elf_riscv64_efi.lds?format=raw#/elf_riscv64_efi.lds -Source15: https://sourceforge.net/p/gnu-efi/code/ci/3.0.18/tree/gnuefi/crt0-efi-loongarch64.S?format=raw#/crt0-efi-loongarch64.S -Source16: https://sourceforge.net/p/gnu-efi/code/ci/3.0.18/tree/gnuefi/elf_loongarch64_efi.lds?format=raw#/elf_loongarch64_efi.lds +Source1001: https://people.redhat.com/rhughes/dbx/DBXUpdate-20100307-x64.cab +Source1002: https://people.redhat.com/rhughes/dbx/DBXUpdate-20140413-x64.cab +Source1003: https://people.redhat.com/rhughes/dbx/DBXUpdate-20160809-x64.cab +Source1004: https://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-aa64.cab +Source1005: https://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-ia32.cab +Source1006: https://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-x64.cab + +Source2001: https://sourceforge.net/p/gnu-efi/code/ci/3.0.14/tree/gnuefi/crt0-efi-riscv64.S?format=raw#/crt0-efi-riscv64.S +Source2002: https://sourceforge.net/p/gnu-efi/code/ci/3.0.14/tree/gnuefi/elf_riscv64_efi.lds?format=raw#/elf_riscv64_efi.lds + +Source3003: https://sourceforge.net/p/gnu-efi/code/ci/3.0.18/tree/gnuefi/crt0-efi-loongarch64.S?format=raw#/crt0-efi-loongarch64.S +Source3004: https://sourceforge.net/p/gnu-efi/code/ci/3.0.18/tree/gnuefi/elf_loongarch64_efi.lds?format=raw#/elf_loongarch64_efi.lds Patch0: fwupd-efi.patch -%ifarch riscv64 Patch1: https://raw.githubusercontent.com/GNOME/gnome-build-meta/37bc8931517261e359e02b2b14bffab0501e79d9/files/fwupd/riscv64.patch -%endif Patch2: fwupd-add-loongarch64-spoort.patch BuildRequires: libcbor libcbor-devel @@ -171,21 +171,21 @@ Man pages and other related documents for fwupd. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 +%patch -P0 -p1 mkdir -p subprojects/fwupd-efi tar xfs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1 %ifarch riscv64 -%patch1 -p1 -cp %{SOURCE13} subprojects/fwupd-efi/efi/crt0 -cp %{SOURCE14} subprojects/fwupd-efi/efi/lds +%patch -P1 -p1 +cp %{S:2001} subprojects/fwupd-efi/efi/crt0 +cp %{S:2002} subprojects/fwupd-efi/efi/lds %endif %ifarch loongarch64 -%patch2 -p1 -cp %{SOURCE15} subprojects/fwupd-efi/efi/crt0 -cp %{SOURCE16} subprojects/fwupd-efi/efi/lds +%patch -P2 -p1 +cp %{S:3001} subprojects/fwupd-efi/efi/crt0 +cp %{S:3002} subprojects/fwupd-efi/efi/lds %endif sed -ri '1s=^#!/usr/bin/(env )?python3=#!%{__python3}=' \ @@ -269,7 +269,7 @@ sed -ri '1s=^#!/usr/bin/(env )?python3=#!%{__python3}=' \ mkdir -p %{buildroot}/%{_datadir}/dbxtool -install %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{buildroot}/%{_datadir}/dbxtool +install %{S:1001} %{S:1002} %{S:1003} %{S:1004} %{S:1005} %{S:1006} %{buildroot}/%{_datadir}/dbxtool # sign fwupd.efi loader %ifarch x86_64 @@ -317,7 +317,6 @@ echo "/usr/share/doc/fwupd/libfwupdplugin/" >> %{buildroot}/etc/ld.so.conf.d/%{n echo "/usr/share/doc/fwupd/libfwupd/" >> %{buildroot}/etc/ld.so.conf.d/%{name}-devel-%{_arch}.conf %post -/sbin/ldconfig %systemd_post fwupd.service # change vendor-installed remotes to use the default keyring type @@ -331,15 +330,8 @@ done %systemd_preun fwupd.service %postun -/sbin/ldconfig %systemd_postun_with_restart fwupd.service -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - %files -f %{name}.lang %doc README.md %license COPYING @@ -480,9 +472,12 @@ done %files help -%{_datadir}/man/man1/* +%{_mandir}/man1/* %changelog +* Fri Aug 16 2024 Funda Wang - 1.8.17-7 +- renumberd sources for ease updating firmware + * Thu Aug 15 2024 xu_ping <707078654@qq.com> - 1.8.17-6 - Remove rpath for libfwupdengine.so and libfwupdutil.so. @@ -505,10 +500,10 @@ done - Fix build on riscv64 - from @jchzhou: skip packaging fwupd-detect-cet if compiled with llvm -* Fri Mar 10 2023 zhouwenpei - 1.8.6-5 +* Fri Mar 10 2023 zhouwenpei - 1.8.6-5 - remove bluez require -* Fri Mar 3 2023 liyanan - 1.8.6-4 +* Fri Mar 3 2023 liyanan - 1.8.6-4 - Remove rpath * Thu Mar 02 2023 yaoxin - 1.8.6-3 @@ -517,7 +512,7 @@ done * Mon Feb 27 2023 liyanan - 1.8.6-2 - Fix fwupd libjcat dbxtool file conflicts -* Tue Nov 1 2022 huyab<1229981468@qq.com> - 1.8.6-1 +* Tue Dec 27 2022 huyab <1229981468@qq.com> - 1.8.6-1 - update version to 1.8.6-1 * Thu Dec 01 2022 yaoxin - 1.5.8-5 @@ -532,7 +527,7 @@ done * Mon Jun 20 2022 fushanqing - 1.5.8-2 - Remove the python installation dependency of fwupd -* Mon Jun 17 2022 lin zhang - 1.5.8-1 +* Thu Jun 16 2022 lin zhang - 1.5.8-1 - Upgrade to 1.5.8 * Thu May 28 2015 Richard Hughes 0.1.3-1