Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sexp for openSUSE:Factory checked in at 2023-06-23 21:53:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sexp (Old) and /work/SRC/openSUSE:Factory/.sexp.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sexp" Fri Jun 23 21:53:39 2023 rev:3 rq:1094875 version:0.8.6 Changes: -------- --- /work/SRC/openSUSE:Factory/sexp/sexp.changes 2023-06-21 22:41:29.326959610 +0200 +++ /work/SRC/openSUSE:Factory/.sexp.new.15902/sexp.changes 2023-06-23 21:53:46.807019103 +0200 @@ -1,0 +2,8 @@ +Fri Jun 23 12:10:51 UTC 2023 - Andreas Stieger <[email protected]> + +- sexp 0.8.6 + * Explicitly indicate library versioning (SOVERSION) + * Add a manpage for the sexp CLI +- drop sexp-0.8.5-soversion.patch + +------------------------------------------------------------------- Old: ---- sexp-0.8.5-soversion.patch sexp-0.8.5.tar.gz New: ---- sexp-0.8.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sexp.spec ++++++ --- /var/tmp/diff_new_pack.miix7F/_old 2023-06-23 21:53:47.431022679 +0200 +++ /var/tmp/diff_new_pack.miix7F/_new 2023-06-23 21:53:47.439022725 +0200 @@ -19,13 +19,12 @@ %define soversion 0 Name: sexp -Version: 0.8.5 +Version: 0.8.6 Release: 0 Summary: S-expressions parser and generator library License: MIT URL: https://github.com/rnpgp/sexp Source: https://github.com/rnpgp/sexp/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch1: sexp-0.8.5-soversion.patch BuildRequires: c++_compiler BuildRequires: cmake >= 3.14 BuildRequires: gtest >= 1.8.1 @@ -79,10 +78,12 @@ %license LICENSE.md %doc README.adoc %{_bindir}/sexp +%{_mandir}/man1/*.1%{?ext_man} %files -n libsexp%{soversion} %license LICENSE.md %{_libdir}/libsexp.so.%{soversion} +%{_libdir}/libsexp.so.%{soversion}.* %files devel %license LICENSE.md ++++++ sexp-0.8.5.tar.gz -> sexp-0.8.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sexp-0.8.5/CMakeLists.txt new/sexp-0.8.6/CMakeLists.txt --- old/sexp-0.8.5/CMakeLists.txt 2023-06-20 19:52:20.000000000 +0200 +++ new/sexp-0.8.6/CMakeLists.txt 2023-06-22 21:32:24.000000000 +0200 @@ -130,8 +130,20 @@ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include> ) -set_target_properties(sexp PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(sexp PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + +string(REGEX MATCH "^([0-9]+)\\.[0-9]+\\.[0-9]+$" vmatches "${SEXP_VERSION}") +if (NOT vmatches) + message(FATAL_ERROR "Failed to extract major version from SEXP_VERSION (${SEXP_VERSION}).") +endif() +set(SEXP_MAJOR_VERSION "${CMAKE_MATCH_1}") + +set_target_properties(sexp PROPERTIES + POSITION_INDEPENDENT_CODE ON + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" + VERSION "${SEXP_VERSION}" + SOVERSION "${SEXP_MAJOR_VERSION}" + OUTPUT_NAME "sexp" +) if(WITH_SEXP_CLI) add_executable (sexp-cli @@ -257,4 +269,5 @@ install(FILES "${CONFIGURED_PC}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") if(WITH_SEXP_CLI) install(TARGETS sexp-cli DESTINATION "${CMAKE_INSTALL_BINDIR}") + install(FILES man/sexp.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") endif(WITH_SEXP_CLI) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sexp-0.8.5/man/sexp.1 new/sexp-0.8.6/man/sexp.1 --- old/sexp-0.8.5/man/sexp.1 1970-01-01 01:00:00.000000000 +0100 +++ new/sexp-0.8.6/man/sexp.1 2023-06-22 21:32:24.000000000 +0200 @@ -0,0 +1,67 @@ +.TH SEXP "1" "June 2023" "sexp" "User Commands" + +.SH NAME + +sexp - Read, parse, and print out S-expressions + +.SH SYNOPSIS + +.B cat certificate-file | sexp -a -x + +.SH DESCRIPTION + +\fBsexp\fP typically reads an S-expression from standard input and rewrites it to standard output. + +Running without switches implies: -p -a -b -c -x + +.SH INPUT OPTIONS + +.B -i filename +Takes input from file instead of stdin. +.TP +.B -p +Prompts user for console input. +.TP +.B -s +Treat input up to EOF as a single string, instead of parsing. + +.SH CONTROL LOOP + +The main routine typically reads one S-expression, prints it out again, and stops. This may be modified: +.TP +.B -x +Execute main loop repeatedly until end of file. + +.SH OUTPUT OPTIONS + +The output format is normally canonical, but this can be changed. +More than one output format can be requested at once. + +.TP +.B -o filename +Write output to file instead of stdout. +.TP +.B -a +Write output in advanced transport format. +.TP +.B -b +Write output in base-64 output format. +.TP +.B -c +Write output in canonical format. +.TP +.B -l +Suppress linefeeds after output. +.TP +.B -w width +Changes line width to specified width (0 implies no line-width constraint). Default: 75 + +.SH AUTHOR + +The \fBsexp\fP project is maintained by Maxim Samsonov on behalf of Ribose, Inc. +It is based on code from Ron Rivest and Butler Lampson. +This manual page was written by Daniel Kahn Gillmor for the Debian project, but may be used by others. + +.SH SEE ALSO + +https://datatracker.ietf.org/doc/draft-rivest-sexp/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sexp-0.8.5/tests/scripts/tests.sh new/sexp-0.8.6/tests/scripts/tests.sh --- old/sexp-0.8.5/tests/scripts/tests.sh 2023-06-20 19:52:20.000000000 +0200 +++ new/sexp-0.8.6/tests/scripts/tests.sh 2023-06-22 21:32:24.000000000 +0200 @@ -33,16 +33,24 @@ assertTrue "{$1,$2}/$3 was not installed" "[ -f $1/$3 ] || [ -f $2/$3 ]" } +assert_installed_var2() { + assertTrue "$1/{$2,$3} was not installed" "[ -f $1/$2 ] || [ -f $1/$3 ]" +} + # ...................................................................... # Check that sexp is installed as expected test_install_script() { echo "==> Install script test" if [[ "${SHARED_LIB:-}" == "on" ]]; then + version=$(cat "$DIR_ROOT"/version.txt) + version_major="${version:0:1}" case "$OSTYPE" in darwin*) assert_installed "$DIR_INS_B/sexp" assert_installed "$DIR_INS_L/libsexp.dylib" + assert_installed "$DIR_INS_L/libsexp.$version_major.dylib" + assert_installed "$DIR_INS_L/libsexp.$version.dylib" ;; windows ) assert_installed "$DIR_INS_B/sexp.exe" @@ -58,13 +66,15 @@ *) assert_installed "$DIR_INS_B/sexp" assert_installed_var "$DIR_INS_L" "$DIR_INS_L64" "libsexp.so" - ;; + assert_installed_var "$DIR_INS_L" "$DIR_INS_L64" "libsexp.so.$version_major" + assert_installed_var "$DIR_INS_L" "$DIR_INS_L64" "libsexp.so.$version" + ;; esac else case "$OSTYPE" in windows) assert_installed "$DIR_INS_B/sexp.exe" - assert_installed "$DIR_INS_L/sexp.lib" + assert_installed "$DIR_INS_L/sexp.lib" ;; msys) assert_installed "$DIR_INS_B/sexp.exe" @@ -73,11 +83,13 @@ *) assert_installed "$DIR_INS_B/sexp" assert_installed_var "$DIR_INS_L" "$DIR_INS_L64" "libsexp.a" - ;; + ;; esac fi assert_installed_var "$DIR_INS_P" "$DIR_INS_P64" "sexp.pc" + assert_installed_var_2 "$DIR_INS_M/man1" "sexp.1" "sexp.1.gz" + assert_installed "$DIR_INS_I/sexp.h" assert_installed "$DIR_INS_I/sexp-error.h" } @@ -102,6 +114,7 @@ Writing base64 (of canonical) output to certificate.dat EOM export LD_LIBRARY_PATH="$DIR_INS_L":"$DIR_INS_L64" + rm -f input1.dat echo "(aa bb (cc dd))" > input1.dat output=$("$app" -o certificate.dat -p -b < input1.dat) # $expected possibly includes extra EOL at the end -- it depends on OS @@ -140,6 +153,7 @@ Input: EOM + rm -f input2.dat echo "(abc def (ghi jkl))" > input2.dat output=$("$app" < input2.dat) assertContains "$expected" "$output" @@ -153,9 +167,10 @@ # ...................................................................... # main -DIR0="$( cd "$( dirname "$0" )" && pwd )" -DIR1="${DIR_ROOT:="$DIR0/../.."}" -DIR_ROOT="$( cd "$DIR1" && pwd )" +DIR00=$( dirname "$0" ) +DIR0=$( cd "$DIR00" && pwd ) +DIR1="${DIR_ROOT:=$DIR0/../..}" +DIR_ROOT=$( cd "$DIR1" && pwd ) if [[ -z "${DIR_INSTALL:-}" ]]; then DIR_INSTALL="$DIR_ROOT/install" @@ -164,11 +179,12 @@ DIR_INS_B="$DIR_INSTALL/bin" DIR_INS_L="$DIR_INSTALL/lib" DIR_INS_L64="$DIR_INSTALL/lib64" +DIR_INS_M="$DIR_INSTALL/share/man" DIR_INS_P="$DIR_INS_L/pkgconfig" DIR_INS_P64="$DIR_INS_L64/pkgconfig" DIR_INS_I="$DIR_INSTALL/include/sexp" -DIR_TESTS="$( cd "$DIR0/.." && pwd)" +DIR_TESTS=$( cd "$DIR0/.." && pwd) echo "Running sexp additional tests" # shellcheck source=/dev/null
