Release 2021.3

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index d40de48d13fe8c7cd9c5d4458ae0e60aa3a55e29..dd396974064ae6c8107864bad34552bcc5b6e7e6 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 82b9cf32db549a9776092d2107ae8ec6a51c3b82..c3f700ad314ce88748c04bc34263843a60dc0c7d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ m4_define([year_version], [2021])
 m4_define([release_version], [3])
 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 1af5f449244ad20a399c2f4be612b3f210f9a744..e3cd14a4afe56c8312e676914df80f6d08d329e0 100644 (file)
--- a/src/libostree/libostree-devel.sym
+++ b/src/libostree/libostree-devel.sym
@@ -22,14 +22,6 @@
    - uncomment the include in Makefile-libostree.am
 */
 
-LIBOSTREE_2021.3 {
-global:
-  ostree_repo_auto_lock_push;
-  ostree_repo_auto_lock_cleanup;
-  ostree_repo_lock_push;
-  ostree_repo_lock_pop;
-} LIBOSTREE_2021.2;
-
 /* 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 9a45c0d8ac0d80563f348efc0dd8173e87325b8a..becdfc55c14d8585d3c5dd4000e07d4ab22e8bbd 100644 (file)
--- a/src/libostree/libostree-released.sym
+++ b/src/libostree/libostree-released.sym
@@ -653,6 +653,14 @@ global:
   ostree_content_writer_finish;
 } LIBOSTREE_2021.1;
 
+LIBOSTREE_2021.3 {
+global:
+  ostree_repo_auto_lock_push;
+  ostree_repo_auto_lock_cleanup;
+  ostree_repo_lock_push;
+  ostree_repo_lock_pop;
+} LIBOSTREE_2021.2;
+
 /* 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 14adc867ae0a97dda5c0e71c082804a79fdc77aa..89c3eb07d996115b45fba3d9d20dfb34aa08cb68 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
-d42f7000de88e3c7280c2d55ad3a5e2e7a8d968758fe1d66a95863e2f5269d3c  ${released_syms}
+d4eb6d642150d9285b399c7a429603124aeda4215d3f62b92ad3956f04dd2dfe  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt