Osmocom Open Build Service

libosmocore.spec Changed

commit_14405799e89c320cae8d3df754234f31681b2fc9.txt Added

commit_e0c63ec8c7233971636c43f00149104b35b3abae.txt Deleted

libosmocore_1.9.0.209.e0c63.dsc -> libosmocore_1.9.0.214.14405.dsc Changed

@@ -2,7 +2,7 @@
 Source: libosmocore
 Binary: libosmocore, libosmocodec4, libosmocodec-doc, libosmocoding0, libosmocoding-doc, libosmocore21, libosmocore-doc, libosmogb14, libosmogb-doc, libosmogsm20, libosmogsm-doc, libosmoisdn0, libosmoisdn-doc, libosmovty13, libosmovty-doc, libosmoctrl0, libosmoctrl-doc, libosmosim2, libosmosim-doc, libosmousb0, libosmousb-doc, libosmocore-dev, libosmocore-utils, libosmocore-dbg
 Architecture: any all
-Version: 1.9.0.209.e0c63
+Version: 1.9.0.214.14405
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmocore
 Standards-Version: 3.9.8
@@ -35,8 +35,8 @@
  libosmovty-doc deb doc optional arch=all
  libosmovty13 deb libs optional arch=any
 Checksums-Sha1:
- 1745f8b7965bc5ae3ae95b2b5dbe65c669e38300 1113304 libosmocore_1.9.0.209.e0c63.tar.xz
+ 3cd31d26e6156c96079536bcdefa0e62614d6bb3 1112828 libosmocore_1.9.0.214.14405.tar.xz
 Checksums-Sha256:
- b13c3236493848cbf8592a19e6d919a3b4f5f099227975a538403469c6ad2bda 1113304 libosmocore_1.9.0.209.e0c63.tar.xz
+ 21374784f1641e0b97eff57170a7afbe65eae507f016d073458123b169f7140c 1112828 libosmocore_1.9.0.214.14405.tar.xz
 Files:
- 4750e44ca75e804e50b1d4a1349c66c8 1113304 libosmocore_1.9.0.209.e0c63.tar.xz
+ 84ef3da50e9497084f2456361e0a2fdb 1112828 libosmocore_1.9.0.214.14405.tar.xz

libosmocore_1.9.0.209.e0c63.tar.xz/.tarball-version -> libosmocore_1.9.0.214.14405.tar.xz/.tarball-version Changed

libosmocore_1.9.0.209.e0c63.tar.xz/debian/changelog -> libosmocore_1.9.0.214.14405.tar.xz/debian/changelog Changed

libosmocore_1.9.0.209.e0c63.tar.xz/osmo-release.mk -> libosmocore_1.9.0.214.14405.tar.xz/osmo-release.mk Changed

libosmocore_1.9.0.209.e0c63.tar.xz/osmo-release.sh -> libosmocore_1.9.0.214.14405.tar.xz/osmo-release.sh Changed

@@ -3,8 +3,17 @@
 REL=$2
 
 if  "z$REL" = "z" ; then
-	echo "No REL value specified, defaulting to 'patch' release"
-	REL="patch"
+	echo "usage: make REL=patch|minor|major release"
+	echo
+	echo "optional environment variables:"
+	echo "  DRY_RUN=1                        run checks but make no modifications"
+	echo "  ALLOW_NO_LIBVERSION_CHANGE=1     skip LIBVERSION in Makefile.am fchecks"
+	echo "  ALLOW_NO_LIBVERSION_DEB_MATCH=1  skip LIBVERSION in debian packaging checks"
+	echo "  ALLOW_NO_LIBVERSION_RPM_MATCH=1  skip LIBVERSION in rpm packaging checks"
+	echo
+	echo "See also:"
+	echo "https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release"
+	exit 1
 fi
 
 ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}"
@@ -13,6 +22,23 @@
 # Test stuff but don't modify stuff:
 DRY_RUN="${DRY_RUN:-0}"
 
+RESET="\0331;0m"
+RED="\0331;31m"
+GREEN="\0331;32m"
+YELLOW="\0331;33m"
+
+ok() {
+	echo "${GREEN}OK:${RESET} $@"
+}
+
+warn() {
+	echo "${YELLOW}WARN:${RESET} $@"
+}
+
+error() {
+	echo "${RED}ERROR:${RESET} $@"
+}
+
 libversion_to_lib_major() {
 	libversion="$1"
 	current="$(echo "$libversion" | cut -d ":" -f 1)"
@@ -43,16 +69,16 @@
 		if  "z$debctrl_match_count" != "z0" ; then
 			#echo "Dependency <$dep, $ver> from configure.ac matched in debian/control! ($debctrl_match_count)"
 			if  "z$debctrl_match_count" != "z1" ; then
-				echo "WARN: configure.ac <$dep, $ver> matches debian/control $debctrl_match_count times, manual check required!"
+				warn "configure.ac <$dep, $ver> matches debian/control $debctrl_match_count times, manual check required!"
 			else # 1 match:
 				parsed_match=$(echo "$debctrl_match" | tr -d "(" | tr -d ")" | tr -d "," | tr -d " " | tr -d "\t" | sed "s/>=/ /g")
 				debctrl_dep=$(echo "$parsed_match" | cut -d " " -f 1 | sed "s/-dev//g")
 				debctrl_ver=$(echo "$parsed_match" | cut -d " " -f 2)
 				if  "z$dep" != "z$debctrl_dep"  ||  "z$ver" != "z$debctrl_ver" ; then
-					echo "ERROR: configure.ac <$dep, $ver> does NOT match debian/control <$debctrl_dep, $debctrl_ver>!"
+					error "configure.ac <$dep, $ver> does NOT match debian/control <$debctrl_dep, $debctrl_ver>!"
 					return_error=1
 				#else
-				#	echo "OK: configure.ac <$dep, $ver> matches debian/control <$debctrl_dep, $debctrl_ver>"
+				#	ok "configure.ac <$dep, $ver> matches debian/control <$debctrl_dep, $debctrl_ver>"
 				fi
 			fi
 		fi
@@ -64,10 +90,10 @@
 
 	# catch and forward exit from pipe subshell "while read":
 	if  $? -ne 0 ; then
-		echo "ERROR: exiting due to previous errors"
+		error "exiting due to previous errors"
 		exit 1
 	fi
-	echo "OK: dependency specific versions in configure.ac and debian/control match"
+	ok "dependency specific versions in configure.ac and debian/control match"
 }
 
 # Make sure that depedency requirement versions match in configure.ac vs contrib/*.spec.in.
@@ -88,16 +114,16 @@
 		if  "z$rpmspecin_match_count" != "z0" ; then
 			#echo "Dependency <$dep, $ver> from configure.ac matched in contrib/*.spec.in! ($rpmspecin_match_count)"
 			if  "z$rpmspecin_match_count" != "z1" ; then
-				echo "WARN: configure.ac <$dep, $ver> matches contrib/*.spec.in $rpmspecin_match_count times, manual check required!"
+				warn "configure.ac <$dep, $ver> matches contrib/*.spec.in $rpmspecin_match_count times, manual check required!"
 			else # 1 match:
 				parsed_match=$(echo "$rpmspecin_match" | tr -d "(" | tr -d ")" | tr -d ":" | tr -d " " | tr -d "\t" | sed "s/BuildRequires//g" | sed "s/pkgconfig//g" |sed "s/>=/ /g")
 				rpmspecin_dep=$(echo "$parsed_match" | cut -d " " -f 1)
 				rpmspecin_ver=$(echo "$parsed_match" | cut -d " " -f 2)
 				if  "z$dep" != "z$rpmspecin_dep"  ||  "z$ver" != "z$rpmspecin_ver" ; then
-					echo "ERROR: configure.ac <$dep, $ver> does NOT match contrib/*.spec.in <$rpmspecin_dep, $rpmspecin_ver>!"
+					error "configure.ac <$dep, $ver> does NOT match contrib/*.spec.in <$rpmspecin_dep, $rpmspecin_ver>!"
 					return_error=1
 				#else
-				#	echo "OK: configure.ac <$dep, $ver> matches contrib/*.spec.in <$debctrl_dep, $debctrl_ver>"
+				#	ok "configure.ac <$dep, $ver> matches contrib/*.spec.in <$debctrl_dep, $debctrl_ver>"
 				fi
 			fi
 		fi
@@ -109,10 +135,10 @@
 
 	# catch and forward exit from pipe subshell "while read":
 	if  $? -ne 0 ; then
-		echo "ERROR: exiting due to previous errors"
+		error "exiting due to previous errors"
 		exit 1
 	fi
-	echo "OK: dependency specific versions in configure.ac and contrib/*.spec.in match"
+	ok "dependency specific versions in configure.ac and contrib/*.spec.in match"
 }
 
 # Make sure that patches under debian/patches/ apply:
@@ -123,10 +149,10 @@
 	for patch in ${GIT_TOPDIR}/debian/patches/*.patch; do
 		git apply --check $patch
 		if  $? -ne 0 ; then
-			echo "ERROR: patch no longer applies! $patch"
+			error "patch no longer applies! $patch"
 			exit 1
 		else
-			echo "OK: patch applies: $patch"
+			ok "patch applies: $patch"
 		fi
 	done
 }
@@ -137,34 +163,34 @@
 		major="$(libversion_to_lib_major "$libversion")"
 		file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)"
 		if  "z$file_matches" = "z0" ; then
-			echo "ERROR: Found no matching debian/lib*$major.install file for LIBVERSION=$libversion"
+			error "Found no matching debian/lib*$major.install file for LIBVERSION=$libversion"
 			exit 1
 		elif  "z$file_matches" = "z1" ; then
-			echo "OK: Found matching debian/lib*$major.install for LIBVERSION=$libversion"
+			ok "Found matching debian/lib*$major.install for LIBVERSION=$libversion"
 		else
-			echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!"
+			warn "Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!"
 		fi
 
 		control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)"
 		if  "z$control_matches" = "z0" ; then
-			echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion"
+			error "Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion"
 			exit 1
 		elif  "z$control_matches" = "z1" ; then
-			echo "OK: Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion"
+			ok "Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion"
 		else
-			echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!"
+			warn "Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!"
 		fi
 
 		dhstrip_lib_total="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | wc -l)"
 		dhstrip_lib_matches="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | grep "$major" | wc -l)"
 		if  "z$dhstrip_lib_total" != "z0" ; then
 			if  "z$dhstrip_lib_matches" = "z0"  ; then
-				echo "ERROR: Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion"
+				error "Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion"
 				exit 1
 			elif  "z$dhstrip_lib_total" = "z1" ; then
-				echo "OK: Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion"
+				ok "Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion"
 			else
-				echo "WARN: Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!"
+				warn "Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!"
 			fi
 		fi
 	done
@@ -187,22 +213,22 @@
 
 		control_matches="$(grep -e "%files" "${GIT_TOPDIR}/contrib/"*.spec.in | grep "lib" | grep "$major$" | wc -l)"
 		if  "z$control_matches" = "z0" ; then
-			echo "ERROR: Found no matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion"
+			error "Found no matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion"
 			exit 1
 		elif  "z$control_matches" = "z1" ; then
-			echo "OK: Found '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion"
+			ok "Found '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion"
 		else
-			echo "WARN: Found $file_matches files matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!"
+			warn "Found $file_matches files matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!"
 		fi
 
 		control_matches="$(grep -e "_libdir" "${GIT_TOPDIR}/contrib/"*.spec.in | grep "/lib" | grep "so.$major" | wc -l)"
 		if  "z$control_matches" = "z0" ; then
-			echo "ERROR: Found no matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion"
+			error "Found no matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion"
 			exit 1
 		elif  "z$control_matches" = "z1" ; then
-			echo "OK: Found '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion"
+			ok "Found '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion"
 		else
-			echo "WARN: Found $file_matches files matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!"
+			warn "Found $file_matches files matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!"
 		fi
 	done
 	# catch and forward exit from pipe subshell "while read":
@@ -211,6 +237,20 @@
 	fi
 }
 
+clean_todo_release() {
+	rm -f TODO-RELEASE
+	echo "# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install" >> TODO-RELEASE
+	echo "# according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release" >> TODO-RELEASE
+	echo "# In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info" >> TODO-RELEASE
+	echo "# LIBVERSION=c:r:a" >> TODO-RELEASE
+	echo "# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a." >> TODO-RELEASE
+	echo "# If any interfaces have been added, removed, or changed since the last update: c + 1:0:a." >> TODO-RELEASE
+	echo "# If any interfaces have been added since the last public release: c:r:a + 1." >> TODO-RELEASE
+	echo "# If any interfaces have been removed or changed since the last public release: c:r:0." >> TODO-RELEASE
+	echo "#library	what			description / commit summary line" >> TODO-RELEASE
+	git add TODO-RELEASE
+}
+
 
 BUMPVER=`command -v bumpversion`
 if  "z$BUMPVER" = "z" ; then
@@ -235,7 +275,7 @@
 
 if  "z$LIBVERS" != "z" ; then
 	if  "z$MAKEMOD" = "z"  &&  "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ; then
-		echo "ERROR: Before releasing, please modify some of the libversions:"
+		error "Before releasing, please modify some of the libversions:"
 		for l in $LIBVERS; do echo "    $l"; done
 		echo "After making changes, add modified file(s) to the index using git-add."
 		echo "You should NOT be doing this unless you've read and understood following article:"
@@ -255,10 +295,9 @@
 fi
 
 set -e
+
 if  -f "TODO-RELEASE" ; then
-	grep '#' TODO-RELEASE > TODO-RELEASE.clean || true
-	mv TODO-RELEASE.clean TODO-RELEASE
-	git add TODO-RELEASE
+	clean_todo_release
 fi
 
 # Add missing epoch (OS#5046)

Changes of Revision 349