[gnome-bluetooth/wip/hadess/dbusmock-from-distro: 1/3] Revert "ci: Work-around another libabigail problem"




commit a9b8dd20e680eb176a60e49bdda2f45de100f1a0
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Mar 23 11:19:52 2021 +0100

    Revert "ci: Work-around another libabigail problem"
    
    This reverts commit 8d28555520b2c0e3ebd7a8331c62449f7748b2bf.

 .gitlab-ci.yml | 5 +----
 meson.build    | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 62359969..f1e77167 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
-# See https://sourceware.org/bugzilla/show_bug.cgi?id=27267
-image: fedora:33
+image: fedora:rawhide
 
 variables:
   DEPENDENCIES:
@@ -40,6 +39,4 @@ build_stable:
     - ninja -C _build test
     - ninja -C _build dist
     - dnf install -y $DEPENDENCIES_ABI_CHECK
-    # See https://sourceware.org/bugzilla/show_bug.cgi?id=27269
-    - rpm -Uvh --oldpackage 
https://kojipkgs.fedoraproject.org//packages/libabigail/1.7/2.fc33/x86_64/libabigail-1.7-2.fc33.x86_64.rpm
     - ./.ci/check-abi ${LAST_ABI_BREAK} $(git rev-parse HEAD)
diff --git a/meson.build b/meson.build
index e59e3a35..6df6396b 100644
--- a/meson.build
+++ b/meson.build
@@ -40,7 +40,8 @@ current = 14
 revision = 0
 age = 1
 
-libversion = '@0@.@1@.@2@'.format(current, age, revision)
+lt_soversion = current - age
+libversion = '@0@.@1@.@2@'.format(lt_soversion, age, revision)
 
 gnome = import('gnome')
 i18n = import('i18n')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]