From bfd8ba8d2a70c35bf58848b5790b1a613be1e5b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Fri, 3 Nov 2017 18:15:32 +0100 Subject: [PATCH] - up to 1.0.0 --- fwupd-its.patch | 65 ------------------------------- fwupd.spec | 101 ++++++++++++++++++++++-------------------------- 2 files changed, 46 insertions(+), 120 deletions(-) delete mode 100644 fwupd-its.patch diff --git a/fwupd-its.patch b/fwupd-its.patch deleted file mode 100644 index 999df1c..0000000 --- a/fwupd-its.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 797e5672e64acd4f90cd52afca3bb192b28b4636 Mon Sep 17 00:00:00 2001 -From: Julian Liu -Date: Fri, 28 Apr 2017 18:09:20 +0800 -Subject: [PATCH] Add polkit's ITS files as Ubuntu doesn't not ship with it. - -Call msgfmt with custom_target for now as data_dir kargs for i18n.merge_file() not merged into master yet. -(https://github.com/mesonbuild/meson/issues/1565) ---- - its/polkit.its | 8 ++++++++ - its/polkit.loc | 6 ++++++ - policy/meson.build | 12 ++++++++---- - 3 files changed, 22 insertions(+), 4 deletions(-) - create mode 100644 its/polkit.its - create mode 100644 its/polkit.loc - -diff --git a/its/polkit.its b/its/polkit.its -new file mode 100644 -index 0000000..1c37e6b ---- /dev/null -+++ b/its/polkit.its -@@ -0,0 +1,8 @@ -+ -+ -+ -+ -+ -diff --git a/its/polkit.loc b/its/polkit.loc -new file mode 100644 -index 0000000..c7427ec ---- /dev/null -+++ b/its/polkit.loc -@@ -0,0 +1,6 @@ -+ -+ -+ -+ -+ -+ -diff --git a/policy/meson.build b/policy/meson.build -index def8976..41da2db 100644 ---- a/policy/meson.build -+++ b/policy/meson.build -@@ -1,11 +1,15 @@ - install_data('org.freedesktop.fwupd.rules', - install_dir : 'share/polkit-1/rules.d') - --i18n.merge_file( -- input: 'org.freedesktop.fwupd.policy.in', -+envbin = find_program('env') -+gettext_data_dir = 'GETTEXTDATADIRS=' + meson.source_root() -+custom_target('org.freedesktop.fwupd.policy', - output: 'org.freedesktop.fwupd.policy', -- type: 'xml', -- po_dir: join_paths(meson.source_root(), 'po'), -+ input: 'org.freedesktop.fwupd.policy.in', -+ command: [envbin, gettext_data_dir, 'msgfmt', '--xml', -+ '--template', '@INPUT@', -+ '-d', join_paths(meson.source_root(), 'po'), -+ '-o', '@OUTPUT@'], - install: true, - install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions') - ) diff --git a/fwupd.spec b/fwupd.spec index cfe3cf5..677d4f6 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -14,13 +14,12 @@ Summary: System daemon for installing device firmware Summary(pl.UTF-8): Demon systemowy do instalowania firmware'u urządzeń Name: fwupd -Version: 0.9.2 +Version: 1.0.0 Release: 1 License: LGPL v2.1+ Group: Applications/System Source0: https://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz -# Source0-md5: 1e424f3d722ac4b4984cf73bd36947b8 -Patch0: %{name}-its.patch +# Source0-md5: 4be8a19aa26f067c5ad65b1e42879587 URL: https://github.com/hughsie/fwupd BuildRequires: appstream-glib-devel >= 0.5.10 %{?with_colorhug:BuildRequires: colord-devel >= 1.2.12} @@ -50,7 +49,9 @@ BuildRequires: meson >= 0.37.0 BuildRequires: ninja >= 1.6 BuildRequires: pkgconfig BuildRequires: polkit-devel >= 0.103 -BuildRequires: rpmbuild(macros) >= 1.644 +BuildRequires: python3-pillow +BuildRequires: python3-pycairo +BuildRequires: rpmbuild(macros) >= 1.726 BuildRequires: sqlite3-devel >= 3 BuildRequires: systemd-units BuildRequires: tar >= 1:1.22 @@ -120,34 +121,21 @@ Dokumentacja API do bibliotek fwupd. %prep %setup -q -%patch0 -p1 %build -CC="%{__cc}" \ -CFLAGS="%{rpmcflags} %{rpmcppflags}" \ -LDFLAGS="%{rpmldflags}" \ -meson build \ - --buildtype=plain \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --libexecdir=%{_libexecdir} \ - --localstatedir=%{_localstatedir} \ - --sysconfdir=%{_sysconfdir} \ +%meson \ -Denable-tests=false \ %{!?with_thunderbolt:-Denable-thunderbolt=false} \ %{!?with_efi:-Denable-uefi=false} \ - %{!?with_efi:-Denable-dell=false} + %{!?with_efi:-Denable-dell=false} \ + . build -ninja -C build -v +%meson_build -C build %install rm -rf $RPM_BUILD_ROOT -DESTDIR=$RPM_BUILD_ROOT \ -ninja -C build -v install - -install -d $RPM_BUILD_ROOT%{_gtkdocdir} -%{__mv} $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/* $RPM_BUILD_ROOT%{_gtkdocdir} +%meson_install -C build %find_lang %{name} @@ -163,75 +151,78 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/dfu-tool %attr(755,root,root) %{_bindir}/fwupdmgr %attr(755,root,root) %{_libexecdir}/fwupd -%dir %{_libdir}/fwupd-plugins-2 -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_altos.so -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_colorhug.so +%dir %{_libdir}/fwupd-plugins-3 +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_altos.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_amt.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_colorhug.so %if %{with efi} -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_dell.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_dell.so %endif -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_dfu.so -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_ebitdo.so -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_raspberrypi.so -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_steelseries.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_dfu.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_ebitdo.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_raspberrypi.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_steelseries.so %if %{with efi} -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_synapticsmst.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_synapticsmst.so %endif -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_test.so %if %{with thunderbolt} -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_thunderbolt.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_thunderbolt.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_thunderbolt_power.so %endif -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_udev.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_udev.so %if %{with efi} -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_uefi.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_uefi.so %endif -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_unifying.so -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_upower.so -%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_usb.so -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd.conf +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_unifying.so +%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_upower.so +%dir %{_sysconfdir}/fwupd +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/daemon.conf +%dir %{_sysconfdir}/fwupd/remotes.d +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/remotes.d/fwupd.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/remotes.d/lvfs-testing.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/remotes.d/lvfs.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/remotes.d/vendor.conf %dir /etc/pki/fwupd /etc/pki/fwupd/GPG-KEY-Hughski-Limited /etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service +/etc/pki/fwupd/LVFS-CA.pem %dir /etc/pki/fwupd-metadata /etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service +/etc/pki/fwupd-metadata/LVFS-CA.pem %{systemdunitdir}/fwupd.service %{systemdunitdir}/fwupd-offline-update.service %{systemdunitdir}/system-update.target.wants/fwupd-offline-update.service /lib/udev/rules.d/90-fwupd-devices.rules /etc/dbus-1/system.d/org.freedesktop.fwupd.conf -# XXX: dir shared with AppStream -%dir %{_datadir}/app-info -%dir %{_datadir}/app-info/xmls -%{_datadir}/app-info/xmls/org.freedesktop.fwupd.xml %{_datadir}/dbus-1/system-services/org.freedesktop.fwupd.service +%dir %{_datadir}/fwupd +%attr(755,root,root) %{_datadir}/fwupd/firmware-packager +%dir %{_datadir}/fwupd/remotes.d +%{_datadir}/fwupd/remotes.d/fwupd +%{_datadir}/fwupd/remotes.d/vendor +%{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml %{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy %{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules %dir /var/lib/fwupd +%dir /var/lib/fwupd/builder +/var/lib/fwupd/builder/README.md %{_mandir}/man1/dfu-tool.1* %{_mandir}/man1/fwupdmgr.1* %files libs %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libdfu.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libdfu.so.1 +%{_libdir}/girepository-1.0/Fwupd-2.0.typelib %attr(755,root,root) %{_libdir}/libfwupd.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libfwupd.so.1 -%{_libdir}/girepository-1.0/Dfu-1.0.typelib -%{_libdir}/girepository-1.0/Fwupd-1.0.typelib +%attr(755,root,root) %ghost %{_libdir}/libfwupd.so.2 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libfwupd.so -%attr(755,root,root) %{_libdir}/libdfu.so -%{_includedir}/dfu.h %{_includedir}/fwupd-1 -%{_includedir}/libdfu -%{_datadir}/gir-1.0/Dfu-1.0.gir -%{_datadir}/gir-1.0/Fwupd-1.0.gir +%{_datadir}/gir-1.0/Fwupd-2.0.gir %{_datadir}/dbus-1/interfaces/org.freedesktop.fwupd.xml -%{_pkgconfigdir}/dfu.pc %{_pkgconfigdir}/fwupd.pc %files apidocs %defattr(644,root,root,755) -%{_gtkdocdir}/libdfu %{_gtkdocdir}/libfwupd -- 2.43.0