Accepting request 713206 from GNOME:Next
OBS-URL: https://build.opensuse.org/request/show/713206 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/flatpak?expand=0&rev=82
This commit is contained in:
Git OBS Bridge
parent
2cef49ea96
commit
32688e24cf
2
_service
2
_service
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:04027bcefebea169aa0d5b98d03cc502b1ad0cc03d362dbbaac509ab6b029ebc
|
||||
size 902828
|
||||
3
flatpak-1.4.2.tar.xz
Normal file
3
flatpak-1.4.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6cbc17f74541d7286e6502028c672e04cc02c3ad4ba2cf8930536c83e0752659
|
||||
size 903084
|
||||
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
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.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 13 23:13:29 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
31
flatpak.spec
31
flatpak.spec
@ -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: gtk-doc
|
||||
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 @@ more information.
|
||||
%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 @@ NOCONFIGURE=1 ./autogen.sh
|
||||
--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 @@ ln -s service %{buildroot}%{_sbindir}/rcflatpak-system-helper
|
||||
# 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 @@ mv %{buildroot}/%{_datadir}/polkit-1/rules.d/{,60-}org.freedesktop.Flatpak.rules
|
||||
%{_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 @@ mv %{buildroot}/%{_datadir}/polkit-1/rules.d/{,60-}org.freedesktop.Flatpak.rules
|
||||
%{_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.*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user