Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package appstream-glib for openSUSE:Factory
checked in at 2022-03-15 19:03:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/appstream-glib (Old)
and /work/SRC/openSUSE:Factory/.appstream-glib.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "appstream-glib"
Tue Mar 15 19:03:46 2022 rev:75 rq:961651 version:0.7.18+31
Changes:
--------
--- /work/SRC/openSUSE:Factory/appstream-glib/appstream-glib.changes
2022-02-17 23:40:50.095700761 +0100
+++ /work/SRC/openSUSE:Factory/.appstream-glib.new.25692/appstream-glib.changes
2022-03-15 19:03:52.452905573 +0100
@@ -1,0 +2,6 @@
+Sun Mar 13 09:46:14 UTC 2022 - bjorn....@gmail.com
+
+- Update to version 0.7.18+31:
+ * Fix extracting relative symlinks (boo#1196459)
+
+-------------------------------------------------------------------
Old:
----
appstream-glib-0.7.18+30.obscpio
New:
----
appstream-glib-0.7.18+31.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ appstream-glib.spec ++++++
--- /var/tmp/diff_new_pack.kVgYUz/_old 2022-03-15 19:03:53.036905968 +0100
+++ /var/tmp/diff_new_pack.kVgYUz/_new 2022-03-15 19:03:53.044905974 +0100
@@ -18,7 +18,7 @@
Name: appstream-glib
-Version: 0.7.18+30
+Version: 0.7.18+31
Release: 0
Summary: AppStream Abstraction Library
License: GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.kVgYUz/_old 2022-03-15 19:03:53.080905998 +0100
+++ /var/tmp/diff_new_pack.kVgYUz/_new 2022-03-15 19:03:53.084906001 +0100
@@ -6,7 +6,7 @@
<param
name="versionrewrite-pattern">appstream_glib_(\d+)_(\d+)_(\d+)(\+0)?(\+[1-9][0-9]*)?</param>
<param name="versionrewrite-replacement">\1.\2.\3\5</param>
<param name="changesgenerate">enable</param>
- <param name="revision">349799ba1d026a18012520b9f2e1901a88ac467b</param>
+ <param name="revision">87e1aa8774dad3e6b504c641938e84490116088f</param>
<!--
<param name="revision">refs/tags/appstream_glib_0_7_18</param>
-->
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.kVgYUz/_old 2022-03-15 19:03:53.108906017 +0100
+++ /var/tmp/diff_new_pack.kVgYUz/_new 2022-03-15 19:03:53.108906017 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/hughsie/appstream-glib.git</param>
- <param
name="changesrevision">349799ba1d026a18012520b9f2e1901a88ac467b</param></service></servicedata>
+ <param
name="changesrevision">87e1aa8774dad3e6b504c641938e84490116088f</param></service></servicedata>
(No newline at EOF)
++++++ appstream-glib-0.7.18+30.obscpio -> appstream-glib-0.7.18+31.obscpio
++++++
Binary files old/appstream-glib-0.7.18+30/data/tests/app-1-1.fc25.x86_64.rpm
and new/appstream-glib-0.7.18+31/data/tests/app-1-1.fc25.x86_64.rpm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/appstream-glib-0.7.18+30/data/tests/app.spec
new/appstream-glib-0.7.18+31/data/tests/app.spec
--- old/appstream-glib-0.7.18+30/data/tests/app.spec 2022-02-16
15:29:56.000000000 +0100
+++ new/appstream-glib-0.7.18+31/data/tests/app.spec 2022-03-09
21:06:59.000000000 +0100
@@ -53,11 +53,13 @@
ln -s %{_datadir}/app/app-48x48.png usr/share/icons/hicolor/48x48/apps/app.png
cd -
-# test decompressing a relative symlink destination
+# test decompressing relative symlink destinations
install -Dp %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/app/app-128x128.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
cd $RPM_BUILD_ROOT
-ln -s ../../../../app/app-128x128.png
usr/share/icons/hicolor/128x128/apps/app.png
+# Test links in the same directory as well as outside
+ln -s ../../../../app/app-128x128.png
usr/share/icons/hicolor/128x128/apps/app-linked.png
+ln -s app-linked.png usr/share/icons/hicolor/128x128/apps/app.png
cd -
install -Dp %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/appdata/app.appdata.xml
@@ -93,6 +95,7 @@
%{_datadir}/app/app-48x48.png
%{_datadir}/app/app-128x128.png
%{_datadir}/icons/hicolor/48x48/apps/app.png
+%{_datadir}/icons/hicolor/128x128/apps/app-linked.png
%{_datadir}/icons/hicolor/128x128/apps/app.png
%files extra
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/appstream-glib-0.7.18+30/libappstream-builder/asb-utils.c
new/appstream-glib-0.7.18+31/libappstream-builder/asb-utils.c
--- old/appstream-glib-0.7.18+30/libappstream-builder/asb-utils.c
2022-02-16 15:29:56.000000000 +0100
+++ new/appstream-glib-0.7.18+31/libappstream-builder/asb-utils.c
2022-03-09 21:06:59.000000000 +0100
@@ -155,32 +155,6 @@
return TRUE;
}
-static guint
-asb_utils_count_directories_deep (const gchar *path)
-{
- guint cnt = 0;
- guint i;
-
- for (i = 0; path[i] != '\0'; i++) {
- if (path[i] != '/')
- continue;
- cnt++;
- }
- return cnt;
-}
-
-static gchar *
-asb_utils_get_back_to_root (guint levels)
-{
- GString *str;
- guint i;
-
- str = g_string_new ("");
- for (i = 0; i < levels; i++)
- g_string_append (str, "../");
- return g_string_free (str, FALSE);
-}
-
static gchar *
asb_utils_sanitise_path (const gchar *path)
{
@@ -243,25 +217,12 @@
archive_entry_update_hardlink_utf8 (entry, buf_link);
}
- /* update symlinks */
+ /* update absolute symlinks */
tmp = archive_entry_symlink (entry);
- if (tmp != NULL) {
- g_autofree gchar *path_link = NULL;
-
- path_link = asb_utils_sanitise_path (tmp);
- if (g_path_is_absolute (path_link)) {
- guint symlink_depth;
- g_autofree gchar *back_up = NULL;
- g_autofree gchar *buf_link = NULL;
-
- symlink_depth = asb_utils_count_directories_deep (path)
- 1;
- back_up = asb_utils_get_back_to_root (symlink_depth);
- buf_link = g_build_filename (back_up, tmp, NULL);
-
- archive_entry_update_symlink_utf8 (entry, buf_link);
- } else {
- archive_entry_update_symlink_utf8 (entry, path_link);
- }
+ if (tmp != NULL && g_path_is_absolute (tmp)) {
+ g_autofree gchar *buf_link = NULL;
+ buf_link = g_build_filename (dir, tmp, NULL);
+ archive_entry_update_symlink_utf8 (entry, buf_link);
}
return TRUE;
}
++++++ appstream-glib.obsinfo ++++++
--- /var/tmp/diff_new_pack.kVgYUz/_old 2022-03-15 19:03:53.368906193 +0100
+++ /var/tmp/diff_new_pack.kVgYUz/_new 2022-03-15 19:03:53.372906196 +0100
@@ -1,5 +1,5 @@
name: appstream-glib
-version: 0.7.18+30
-mtime: 1645021796
-commit: 349799ba1d026a18012520b9f2e1901a88ac467b
+version: 0.7.18+31
+mtime: 1646856419
+commit: 87e1aa8774dad3e6b504c641938e84490116088f
