diff --git a/gcab-1.1.tar.xz b/gcab-1.1.tar.xz deleted file mode 100644 index fa09a88..0000000 --- a/gcab-1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:192b2272c2adfde43595e5c62388854bca8a404bc796585b638e81774dd62950 -size 76132 diff --git a/gcab-1.2.tar.xz b/gcab-1.2.tar.xz new file mode 100644 index 0000000..82ec148 --- /dev/null +++ b/gcab-1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a2d96fe7e69e42d363c31cf2370d7afa3bb69cec984d4128322ea40e62c100d +size 76088 diff --git a/gcab-fix-installing-the-includes.patch b/gcab-fix-installing-the-includes.patch deleted file mode 100644 index d57e9f6..0000000 --- a/gcab-fix-installing-the-includes.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 150c330de1e65036250a2788a51245e37c7de0f7 Mon Sep 17 00:00:00 2001 -From: Timo Gurr -Date: Thu, 1 Feb 2018 16:16:21 +0100 -Subject: [PATCH] build-sys: fix installing the includes - -https://bugzilla.gnome.org/show_bug.cgi?id=793388 ---- - libgcab/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcab/meson.build b/libgcab/meson.build -index 6ff8801..f939617 100644 ---- a/libgcab/meson.build -+++ b/libgcab/meson.build -@@ -9,7 +9,7 @@ enums = gnome.mkenums( - c_template : 'gcab-enums.c.etemplate', - h_template : 'gcab-enums.h.etemplate', - install_header : true, -- install_dir : 'include/libgcab-1.0/libgcab', -+ install_dir : join_paths(get_option('includedir'), 'libgcab-1.0/libgcab'), - symbol_prefix : 'gcab', - identifier_prefix : 'GCab', - ) --- -libgit2 0.27.0 diff --git a/gcab-revert-git-dep.patch b/gcab-revert-git-dep.patch deleted file mode 100644 index 650c31c..0000000 --- a/gcab-revert-git-dep.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b9972fb3329c2b170132a51694b06d0d8189efd5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Tue, 13 Feb 2018 11:48:02 +0100 -Subject: build-sys: don't require git to build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Check git is available before running it. - -Fixes: -https://bugzilla.gnome.org/show_bug.cgi?id=793406 - -Signed-off-by: Marc-André Lureau ---- - meson.build | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index f2ae0d2..861df60 100644 ---- a/meson.build -+++ b/meson.build -@@ -5,7 +5,11 @@ project('gcab', 'c', - default_options : ['warning_level=2', 'c_std=c99'], - ) - --git_version = run_command(['git', 'describe', '--abbrev=4', 'HEAD']).stdout().strip().split('-') -+git_version = [] -+git = find_program('git', required: false) -+if git.found() -+ git_version = run_command(git, 'describe', '--abbrev=4', 'HEAD').stdout().strip().split('-') -+endif - - # libtool versioning - lt_current = '0' --- -cgit v0.12 - diff --git a/gcab.changes b/gcab.changes index 877a594..d0e4662 100644 --- a/gcab.changes +++ b/gcab.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Dec 9 19:56:55 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 1.2: + + build-sys: + - Fix installing the includes. + - Don't require git to build. + + gcab: Fix regression. Apparently, rewinding should reset the + CDATA state. + + Updated translations. +- Drop gcab-fix-installing-the-includes.patch and + gcab-revert-git-dep.patch: Fixed upstream. + ------------------------------------------------------------------- Fri May 25 17:57:52 UTC 2018 - bjorn.lie@gmail.com diff --git a/gcab.spec b/gcab.spec index 598a92d..052218c 100644 --- a/gcab.spec +++ b/gcab.spec @@ -12,22 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: gcab -Version: 1.1 +Version: 1.2 Release: 0 Summary: Cabinet file library and tool License: LGPL-2.1-or-later Group: Productivity/Archiving/Compression Url: http://ftp.gnome.org/pub/GNOME/sources/gcab -Source0: http://download.gnome.org/sources/gcab/1.1/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gcab-revert-git-dep.patch bgo#793406 bjorn.lie@gmail.com -- Revert git dependency -Patch0: gcab-revert-git-dep.patch -# PATCH-FIX-UPSTREAM gcab-fix-installing-the-includes.patch bgo#793388 -- build-sys: fix installing the includes -Patch1: gcab-fix-installing-the-includes.patch +Source0: http://download.gnome.org/sources/gcab/1.2/%{name}-%{version}.tar.xz + BuildRequires: gtk-doc BuildRequires: meson BuildRequires: pkgconfig