commit e4c842d29512596af2891a94a70ef36e27bafa1e
Author: Jakub Bogusz <[email protected]>
Date: Thu Apr 18 21:30:05 2024 +0200
- updated to 1.4.3
flatpak-builder-reqs.patch | 24 +++++++++++++++++++++---
flatpak-builder.spec | 13 ++++++++-----
2 files changed, 29 insertions(+), 8 deletions(-)
---
diff --git a/flatpak-builder.spec b/flatpak-builder.spec
index f0b0115..e28de43 100644
--- a/flatpak-builder.spec
+++ b/flatpak-builder.spec
@@ -1,24 +1,24 @@
Summary: Tool for building flatpaks from sources
Summary(pl.UTF-8): Narzędzie do budowania pakietów flatpak ze źródeł.
Name: flatpak-builder
-Version: 1.2.0
+Version: 1.4.3
Release: 1
License: LGPL v2.1+
Group: Applications
#Source0Download: https://github.com/flatpak/flatpak-builder/releases
Source0:
https://github.com/flatpak/flatpak-builder/releases/download/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 2b3b604c938805da6515e15ac9552d49
+# Source0-md5: fd19632cc2fe89a2a155b0453ec3cd1c
Patch0: %{name}-reqs.patch
URL: https://github.com/flatpak/flatpak-builder
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.13.4
BuildRequires: curl-devel
-BuildRequires: docbook-dtd412-xml
+BuildRequires: docbook-dtd43-xml
BuildRequires: docbook-style-xsl-nons
-# libdw >= 0.172 or system debugedit, libelf from elfutils or libelf-devel >=
0.8.12
+# libdw >= 0.172 or system debugedit >= 5.0, libelf from elfutils or
libelf-devel >= 0.8.12
BuildRequires: elfutils-devel >= 0.172
BuildRequires: gettext-tools >= 0.18.2
-BuildRequires: glib2-devel >= 1:2.44
+BuildRequires: glib2-devel >= 1:2.66
BuildRequires: json-glib-devel
BuildRequires: libcap-devel
BuildRequires: libsoup-devel >= 2.4
@@ -30,7 +30,9 @@ BuildRequires: tar >= 1:1.22
BuildRequires: xmlto
BuildRequires: xz
BuildRequires: yaml-devel >= 0.1
+Requires: AppStream-compose >= 0.15.0
Requires: flatpak >= 0.99.1
+Requires: glib2 >= 1:2.66
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -50,6 +52,7 @@ Flatpak-builder to narzędzie do budowania pakietów flatpak ze
źródeł.
%{__autoheader}
%{__automake}
%configure \
+ APPSTREAMCLI=%{_bindir}/appstreamcli \
FLATPAK=%{_bindir}/flatpak \
--disable-silent-rules
%{__make}
diff --git a/flatpak-builder-reqs.patch b/flatpak-builder-reqs.patch
index 0f23399..a675f46 100644
--- a/flatpak-builder-reqs.patch
+++ b/flatpak-builder-reqs.patch
@@ -1,6 +1,6 @@
---- flatpak-builder-1.0.9/configure.ac.orig 2019-09-13 15:46:44.000000000
+0200
-+++ flatpak-builder-1.0.9/configure.ac 2019-11-25 15:40:55.463307280 +0100
-@@ -45,7 +45,7 @@
+--- flatpak-builder-1.4.3/configure.ac.orig 2024-04-18 20:54:09.385267515
+0200
++++ flatpak-builder-1.4.3/configure.ac 2024-04-18 21:07:28.140940284 +0200
+@@ -38,7 +38,7 @@ if test "x$FLATPAK" = xfalse; then
else
FLATPAK_VERSION=`$FLATPAK --version | sed 's,.*\
\([0-9]*\.[0-9]*\.[0-9]*\)$,\1,'`
AX_COMPARE_VERSION([$FLATPAK_REQS],[gt],[$FLATPAK_VERSION],
@@ -8,4 +8,22 @@
+ [AC_MSG_WARN([You need at least version $FLATPAK_REQS
of flatpak, your version is $FLATPAK_VERSION])])
fi
+ AC_CHECK_PROG([APPSTREAMCLI], [appstreamcli], [appstreamcli], [false])
+@@ -46,7 +46,7 @@ if test "x$APPSTREAMCLI" = xfalse; then
+ AC_MSG_ERROR([You need appstreamcli installed])
+ APPSTREAMCLI_VERSION=`$APPSTREAMCLI --version | sed 's,.*\
\([0-9]*\.[0-9]*\.[0-9]*\)$,\1,'`
+ AX_COMPARE_VERSION([$APPSTREAMCLI_REQS],[gt],[$APPSTREAMCLI_VERSION],
+- [AC_MSG_ERROR([You need at least version
$APPSTREAMCLI_REQS of appstreamcli, your version is $APPSTREAMCLI_VERSION])])
++ [AC_MSG_WARN([You need at least version
$APPSTREAMCLI_REQS of appstreamcli, your version is $APPSTREAMCLI_VERSION])])
+ fi
+
+ AC_MSG_CHECKING([whether appstreamcli has compose support])
+@@ -54,7 +54,7 @@ AS_IF([appstreamcli compose --help >/dev
+ [AC_MSG_RESULT(yes)],
+ [
+ AC_MSG_RESULT(no)
+- AC_MSG_ERROR([appstreamcli must have compose support enabled and
installed])
++ AC_MSG_WARN([appstreamcli must have compose support enabled and
installed])
+ ])
+ LT_PREREQ([2.2.6])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/flatpak-builder.git/commitdiff/e4c842d29512596af2891a94a70ef36e27bafa1e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
