Hello community, here is the log from the commit of package flatpak for openSUSE:Factory checked in at 2019-07-08 15:02:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flatpak (Old) and /work/SRC/openSUSE:Factory/.flatpak.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flatpak" Mon Jul 8 15:02:38 2019 rev:33 rq:713230 version:1.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/flatpak/flatpak.changes 2019-06-22 11:21:05.669187161 +0200 +++ /work/SRC/openSUSE:Factory/.flatpak.new.4615/flatpak.changes 2019-07-08 15:02:39.618682910 +0200 @@ -1,0 +2,22 @@ +Wed Jul 3 08:27:20 UTC 2019 - Antonio Larrosa <alarrosa@suse.com> + +- Update to version 1.4.2: + * Support extra_data in extensions. + * Handle double slashes ("//") in XDG_DATA_DIRS. + * Fix detection of local related refs. + +------------------------------------------------------------------- +Thu Jun 14 09:33:16 UTC 2019 - Antonio Larrosa <alarrosa@suse.com> + +- Add a _dbusconfigdir variable in the spec file so we install the + flatpak-system-helper config file in a location actually read by + dbus, which didn't support having config files in /usr/share + until 1.9.18 (first introduced in SLE15). +- Remove the systemd environment generator if building with + systemd < 233 which doesn't support environment generators. +- Rename the libflapak-doc.xml file which has a typo in the name + upstream. +- BuildRequire libgpgme-devel, not libqgpgme-devel which is not + really needed. + +------------------------------------------------------------------- Old: ---- flatpak-1.4.1.tar.xz New: ---- flatpak-1.4.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flatpak.spec ++++++ --- /var/tmp/diff_new_pack.eFVWbe/_old 2019-07-08 15:02:40.142683702 +0200 +++ /var/tmp/diff_new_pack.eFVWbe/_new 2019-07-08 15:02:40.142683702 +0200 @@ -16,9 +16,23 @@ # +# dbus only used config files in /etc until 1.9.18 +%if %{pkg_vcmp dbus-1 < 1.9.18} +%define _dbusconfigdir %{_sysconfdir}/dbus-1/system.d +%else +%define _dbusconfigdir %{_datadir}/dbus-1/system.d +%endif + +# systemd only supports environment generators since version 233 +%if %{pkg_vcmp systemd < 233} +%define support_environment_generators 0 +%else +%define support_environment_generators 1 +%endif + %define libname libflatpak0 Name: flatpak -Version: 1.4.1 +Version: 1.4.2 Release: 0 Summary: OSTree based application bundles management License: LGPL-2.1-or-later @@ -33,7 +47,7 @@ BuildRequires: intltool >= 0.35.0 BuildRequires: libcap-devel BuildRequires: libdwarf-devel -BuildRequires: libqgpgme-devel >= 1.1.8 +BuildRequires: libgpgme-devel >= 1.1.8 BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: xsltproc @@ -118,6 +132,9 @@ %patch0 -p1 sed -i -e '1s,#!%{_bindir}/env python3,#!%{_bindir}/python3,' scripts/flatpak-* +# UPSTREAM: https://github.com/flatpak/flatpak/pull/2963 +mv doc/reference/libflapak-docs.xml doc/reference/libflatpak-docs.xml + %build %define _lto_cflags %{nil} NOCONFIGURE=1 ./autogen.sh @@ -127,7 +144,7 @@ --disable-document-portal \ --with-system-bubblewrap \ --with-priv-mode=none \ - --with-dbus-config-dir=%{_datadir}/dbus-1/system.d + --with-dbus-config-dir=%{_dbusconfigdir} make %{?_smp_mflags} %install @@ -142,6 +159,10 @@ # w/o password entry. mv %{buildroot}/%{_datadir}/polkit-1/rules.d/{,60-}org.freedesktop.Flatpak.rules +%if !%{support_environment_generators} +rm -Rf %{buildroot}%{_libexecdir}/systemd/user-environment-generators/ +%endif + %find_lang %{name} %post -n %{libname} -p /sbin/ldconfig @@ -179,7 +200,7 @@ %{_datadir}/dbus-1/services/org.freedesktop.Flatpak.service %{_datadir}/dbus-1/services/org.freedesktop.portal.Flatpak.service %{_datadir}/dbus-1/system-services/org.freedesktop.Flatpak.SystemHelper.service -%{_datadir}/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf +%{_dbusconfigdir}/org.freedesktop.Flatpak.SystemHelper.conf # policykit rules %{_datadir}/polkit-1/actions/org.freedesktop.Flatpak.policy %{_datadir}/polkit-1/rules.d/60-org.freedesktop.Flatpak.rules @@ -200,7 +221,9 @@ %{_userunitdir}/flatpak-session-helper.service %{_userunitdir}/flatpak-portal.service %ghost %dir %{_localstatedir}/lib/flatpak +%if %{support_environment_generators} %{_libexecdir}/systemd/user-environment-generators/60-flatpak +%endif %files -n %{libname} %{_libdir}/libflatpak.so.* ++++++ _service ++++++ --- /var/tmp/diff_new_pack.eFVWbe/_old 2019-07-08 15:02:40.182683763 +0200 +++ /var/tmp/diff_new_pack.eFVWbe/_new 2019-07-08 15:02:40.182683763 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/flatpak/flatpak.git</param> <param name="scm">git</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">refs/tags/1.4.1</param> + <param name="revision">refs/tags/1.4.2</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.eFVWbe/_old 2019-07-08 15:02:40.202683794 +0200 +++ /var/tmp/diff_new_pack.eFVWbe/_new 2019-07-08 15:02:40.206683799 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/flatpak/flatpak.git</param> - <param name="changesrevision">2bfa0060b089a20de5fbf18d018f8f1b108d2480</param></service></servicedata> + <param name="changesrevision">f70978b4ad892cca6837153a3a1f7bc33ac347e8</param></service></servicedata> ++++++ flatpak-1.4.1.tar.xz -> flatpak-1.4.2.tar.xz ++++++ ++++ 9495 lines of diff (skipped)