Release 2021.5

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index d40de48d13fe8c7cd9c5d4458ae0e60aa3a55e29..6b94f76f591c15ae523ce9025fc52b279490c3fe 100644 (file)
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -173,9 +173,9 @@ endif # USE_GPGME
 symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym
 
 # Uncomment this include when adding new development symbols.
-if BUILDOPT_IS_DEVEL_BUILD
-symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym
-endif
+# if BUILDOPT_IS_DEVEL_BUILD
+# symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym
+# endif
 
 # http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html
 wl_versionscript_arg = -Wl,--version-script=

diff --git a/configure.ac b/configure.ac
index 5678145a0cb510d607d695de89a99150b315e7e2..b5a3c82abe435ddd259f54085771a0cfd4be0f21 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ m4_define([year_version], [2021])
 m4_define([release_version], [5])
 m4_define([package_version], [year_version.release_version])
 AC_INIT([libostree], [package_version], [walters@verbum.org])
-is_release_build=no
+is_release_build=yes
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([buildutil])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
index 6b6b5c6c98e335f6e1a3368c586c15cd1b7e35c9..e3cd14a4afe56c8312e676914df80f6d08d329e0 100644 (file)
--- a/src/libostree/libostree-devel.sym
+++ b/src/libostree/libostree-devel.sym
@@ -22,12 +22,6 @@
    - uncomment the include in Makefile-libostree.am
 */
 
-LIBOSTREE_2021.5 {
-global:
-  ostree_sepolicy_new_from_commit;
-  ostree_mutable_tree_new_from_commit;
-} LIBOSTREE_2021.4;
-
 /* Stub section for the stable release *after* this development one; don't
  * edit this other than to update the year.  This is just a copy/paste
  * source.  Replace $LASTSTABLE with the last stable version, and $NEWVERSION

diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym
index 1e359bfb32ca612b55d4f72f33749d8d4c73e350..d38362bad1859f6e1ceecc663b8928dfb267b816 100644 (file)
--- a/src/libostree/libostree-released.sym
+++ b/src/libostree/libostree-released.sym
@@ -668,6 +668,12 @@ global:
   ostree_repo_signature_verify_commit_data;
 } LIBOSTREE_2021.3;
 
+LIBOSTREE_2021.5 {
+global:
+  ostree_sepolicy_new_from_commit;
+  ostree_mutable_tree_new_from_commit;
+} LIBOSTREE_2021.4;
+
 /* NOTE: Only add more content here in release commits!  See the
  * comments at the top of this file.
  */

diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh
index 0de87be4a21a8ec697724221945aa47b4f16a8a1..a094a944cb6b11ee049a3a9497d3b7db94410718 100755 (executable)
--- a/tests/test-symbols.sh
+++ b/tests/test-symbols.sh
@@ -56,7 +56,7 @@ echo 'ok documented symbols'
 
 # ONLY update this checksum in release commits!
 cat > released-sha256.txt <<EOF
-9d020c9696a6df66b32714dc1ef37d06bb90b4adf8b248558b5838f9ee18729a  ${released_syms}
+b28728cc162642b66ca7d9c4333b8e63dedf6321b29a3a019037d8c0c609e00d  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt