From 4efc6b86dfeb191cf71f2e515f23fa8d68f9fb6a Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 25 Aug 2016 13:48:14 +0100 Subject: [PATCH] Update to 0.6.9 Remove glib-networking dependency, as it is already pulled in by libsoup. --- .gitignore | 1 + flatpak-0.6.8-add-flatpak-metadata-xml.patch | 344 ------------------- flatpak.spec | 14 +- sources | 2 +- 4 files changed, 7 insertions(+), 354 deletions(-) delete mode 100644 flatpak-0.6.8-add-flatpak-metadata-xml.patch diff --git a/.gitignore b/.gitignore index a1d1760..d8a68fb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /flatpak-0.6.6.tar.xz /flatpak-0.6.7.tar.xz /flatpak-0.6.8.tar.xz +/flatpak-0.6.9.tar.xz diff --git a/flatpak-0.6.8-add-flatpak-metadata-xml.patch b/flatpak-0.6.8-add-flatpak-metadata-xml.patch deleted file mode 100644 index 3fd91c0..0000000 --- a/flatpak-0.6.8-add-flatpak-metadata-xml.patch +++ /dev/null @@ -1,344 +0,0 @@ -diff -urN flatpak-0.6.8.old/doc/flatpak-metadata.xml flatpak-0.6.8/doc/flatpak-metadata.xml ---- flatpak-0.6.8.old/doc/flatpak-metadata.xml 1970-01-01 01:00:00.000000000 +0100 -+++ flatpak-0.6.8/doc/flatpak-metadata.xml 2016-08-01 09:48:56.675097135 +0100 -@@ -0,0 +1,340 @@ -+ -+ -+ -+ -+ -+ -+ flatpak metadata -+ flatpak -+ -+ -+ -+ Developer -+ Alexander -+ Larsson -+ alexl@redhat.com -+ -+ -+ -+ -+ -+ flatpak metadata -+ 5 -+ -+ -+ -+ flatpak-metadata -+ Information about an application or runtime -+ -+ -+ -+ Description -+ -+ -+ Flatpak uses metadata files to describe applications and runtimes. -+ The metadata file for a deployed application or -+ runtime is placed in the toplevel deploy directory. For example, the -+ metadata for the locally installed application org.gnome.Calculator -+ is in -+ ~/.local/share/flatpak/app/org.gnome.Calculator/current/active/metadata. -+ -+ -+ -+ Most aspects of the metadata configuration can be overridden when -+ launching applications, either temporarily via options of the flatpak -+ run command, or permanently with the flatpak override command. -+ -+ -+ -+ A metadata file describing the effective configuration is available -+ inside the running sandbox at /run/user/$UID/flatpak-info. -+ -+ -+ -+ -+ File format -+ -+ -+ The metadata file is using the same .ini file format that is used for -+ systemd unit files or application .desktop files. -+ -+ -+ -+ [Application] or [Runtime] -+ -+ -+ Metadata for applications starts with an [Application] group, -+ metadata for runtimes with a [Runtime] group. -+ -+ -+ The following keys can be present in these groups: -+ -+ -+ -+ (string) -+ The name of the application or runtime. This key is mandatory. -+ -+ -+ (string) -+ The fully qualified name of the runtime that is used by the application. This key is mandatory for applications. -+ -+ -+ (string) -+ The fully qualified name of the sdk that matches the runtime. -+ -+ -+ (string) -+ The command to run. Only relevant for applications. -+ -+ -+ -+ -+ [Context] -+ -+ This group determines various system resources that may be shared -+ with the application when it is run in a flatpak sandbox. -+ -+ -+ All keys in this group (and the group itself) are optional. -+ -+ -+ -+ (list) -+ -+ List of subsystems to share with the host system. -+ Possible subsystems: network, ipc. -+ -+ -+ -+ (list) -+ -+ List of well-known sockets to make available in the sandbox. -+ Possible sockets: x11, wayland, pulseaudio, session-bus, system-bus. -+ When making a socket available, flatpak also sets -+ well-known environment variables like DISPLAY or -+ DBUS_SYSTEM_BUS_ADDRESS to let the application -+ find sockets that are not in a fixed location. -+ -+ -+ -+ (list) -+ -+ List of devices to make available in the sandbox. -+ Possible values: dri, all. -+ -+ -+ -+ (list) -+ -+ List of filesystem subsets to make available to the -+ application. Possible values: home, host, xdg-desktop, -+ xdg-documents, xdg-download xdg-music, xdg-pictures, -+ xdg-public-share, xdg-templates, xdg-videos, xdg-run, -+ an absolute path, or a homedir-relative path like -+ ~/dir or paths relative to the xdg dirs, like -+ xdg-download/subdir. The xdg-* arguments can also -+ specify a subdirectory, such as xdg-pictures/screenshots. -+ Each entry can have a suffix of -+ :ro or :rw to indicate if the path should be shared -+ read-only or read-write (default is read-write). -+ -+ -+ -+ (list) -+ -+ List of homedir-relative paths to make available at -+ the corresponding path in the per-application home directory, -+ allowing the locations to be used for persistent data when -+ the application does not have access to the real homedir. -+ For instance making ".myapp" persistent would make "~/.myapp" -+ in the sandbox a bind mount to "~/.var/app/org.my.App/.myapp", -+ thus allowing an unmodified application to save data in -+ the per-application location. -+ -+ -+ -+ -+ -+ [Session Bus Policy] -+ -+ If the key is not allowing full access -+ to the D-Bus session bus, then flatpak provides filtered access. -+ -+ -+ The default policy for the session bus only allows the -+ application to own its own application ID and -+ subnames. For instance if the app is called -+ "org.my.App", it can only own "org.my.App" and -+ "org.my.App.*". Its also only allowed to talk to the -+ bus itself (org.freedesktop.DBus) and the portal APIs -+ APIs (bus names of the form org.freedesktop.portal.*). -+ -+ -+ Additionally the app is always allowed to reply to -+ messages sent to it, and emit broadcast signals (but -+ these will not reach other sandboxed apps unless they -+ are allowed to talk to your app. -+ -+ -+ If the [Session Bus Policy] group is present, it provides -+ policy for session bus access. -+ -+ -+ Each key in this group has the form of a D-Bus bus name or -+ prefix thereof, for example -+ or -+ -+ -+ The possible values for entry are, in increasing order or -+ access: -+ -+ -+ -+ -+ -+ The bus name or names in question is invisible to the application. -+ -+ -+ -+ -+ -+ The bus name or names can be enumerated by the application. -+ -+ -+ -+ -+ -+ The application can send messages/ and receive replies and signals from the bus name or names. -+ -+ -+ -+ -+ -+ The application can own the bus name or names (as well as all the above). -+ -+ -+ -+ -+ -+ [System Bus Policy] -+ -+ If the key is not allowing full access -+ to the D-Bus system bus, then flatpak does not make the system -+ bus available unless the [System Bus Policy] group is present -+ and provides a policy for filtered access. -+ -+ -+ Entries in this group have the same form as for the [Session Bus Policy] group. -+ However, the app has no permissions by default. -+ -+ -+ -+ [Environment] -+ -+ The [Environment] group specifies environment variables to set -+ when running the application. -+ -+ -+ Entries in this group have the form -+ where is the name of an environment variable -+ to set. -+ -+ -+ -+ [Extension NAME] -+ -+ Runtimes and applications can define extensions, which are optional, -+ additional runtimes to be mounted at a specified location inside -+ the sandbox when they are present on the system. Typical uses for -+ extensions include translations for applications, or debuginfo -+ for sdks. The name of the extension is specified as part of the -+ group heading. -+ -+ -+ -+ (string) -+ -+ The relative path at which the extension will be mounted in -+ the sandbox. If the extension is for an application, the -+ path is relative to /app, otherwise -+ it is relative to /usr. This key -+ is mandatory. -+ -+ -+ -+ (string) -+ -+ The branch to use when looking for the extension. If this is -+ not specified, it defaults to the branch of the application or -+ runtime that the extension is for. -+ -+ -+ -+ (boolean) -+ -+ If this key is set to true, then flatpak will look for -+ extensions whose name is a prefix of the extension name, and -+ mount them at the corresponding name below the subdirectory. -+ -+ -+ -+ (boolean) -+ -+ Whether to automatically download this extension -+ when updating or installing a 'related' application -+ or runtime. -+ -+ -+ -+ (boolean) -+ -+ Whether to automatically delete this extension -+ when deleting a 'related' application or runtime. -+ -+ -+ -+ -+ -+ -+ -+ Example -+ -+[Application] -+name=org.gnome.Calculator -+runtime=org.gnome.Platform/x86_64/3.20 -+sdk=org.gnome.Sdk/x86_64/3.20 -+command=gnome-calculator -+ -+[Context] -+shared=network;ipc; -+sockets=x11;wayland; -+filesystems=xdg-run/dconf;~/.config/dconf:ro; -+ -+[Session Bus Policy] -+ca.desrt.dconf=talk -+ -+[Environment] -+DCONF_USER_CONFIG_DIR=.config/dconf -+ -+[Extension org.gnome.Calculator.Locale] -+directory=share/runtime/locale -+subdirectories=true -+ -+[Extension org.gnome.Calculator.Debug] -+directory=lib/debug -+ -+ -+ -+ -+ See also -+ -+ -+ flatpak1, -+ flatpak-run1, -+ flatpak-override1 -+ -+ -+ -+ -+ diff --git a/flatpak.spec b/flatpak.spec index 1fddd07..126f100 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -1,5 +1,5 @@ Name: flatpak -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} Summary: Application deployment framework for desktop apps @@ -7,18 +7,13 @@ Group: Development/Tools License: LGPLv2+ URL: http://flatpak.org/ Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz -# Until https://github.com/flatpak/flatpak/pull/225 is merged and a new release -# made. -Patch0: flatpak-0.6.8-add-flatpak-metadata-xml.patch -BuildRequires: automake autoconf libtool -BuildRequires: gtk-doc BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.40.0 BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libarchive) >= 2.8.0 BuildRequires: pkgconfig(libelf) >= 0.8.12 -BuildRequires: pkgconfig(libgsystem) >= 2015.1 BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(ostree-1) >= 2016.7 BuildRequires: pkgconfig(polkit-gobject-1) @@ -43,7 +38,6 @@ Requires: kernel >= 4.0.4-202 Requires: /usr/bin/fusermount Requires: /usr/bin/bwrap -Requires: glib-networking # Remove in F27. Provides: xdg-app = %{version}-%{release} @@ -101,7 +95,6 @@ This package contains libflatpak. %prep %setup -q -%patch0 -p1 %build @@ -186,6 +179,9 @@ flatpak remote-list --system %changelog +* Thu Aug 25 2016 David King - 0.6.9-1 +- Update to 0.6.9 + * Mon Aug 01 2016 David King - 0.6.8-1 - Update to 0.6.8 (#1361823) diff --git a/sources b/sources index ae52fa1..32fe765 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f89f9a89a9f112d273b54bc8e6d9ac6 flatpak-0.6.8.tar.xz +65a05ef0340bd3082c98d763d9a42d10 flatpak-0.6.9.tar.xz