December 2022 - openSUSE Commits - openSUSE Mailing Lists

commit hamlib for openSUSE:Factory
by Source-Sync 27 Dec '22

27 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hamlib for openSUSE:Factory checked in at 2022-12-27 11:55:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hamlib (Old) and /work/SRC/openSUSE:Factory/.hamlib.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hamlib" Tue Dec 27 11:55:03 2022 rev:14 rq:1045466 version:4.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/hamlib/hamlib.changes 2022-12-10 21:18:53.801931299 +0100 +++ /work/SRC/openSUSE:Factory/.hamlib.new.1563/hamlib.changes 2022-12-27 11:55:14.175372757 +0100 @@ -1,0 +2,19 @@ +Tue Dec 27 08:52:30 UTC 2022 - Wojciech Kazubski <wk(a)ire.pw.edu.pl> + +- Update to version 4.5.2 (2022-12-23) + * Fix PowerSDR ability to do commands while powered off + * Fix TX-500 operations + * Fix FTDX5000 to return to MIC input on closing + * Fix rig.c calling rig_get_mode when backend does not have get_mode + * Fix kenwood_ts890_get_level + * Add Prosistel D elevation CBOX az to fix problem with azimuth + control + * Fix FT736R gpredict usage by adding cached get_freq + * Fix get_powerstat problem with Log4OM/Flex and others + * Fix -R option to not need argument + * Fix -R option to close rig on last rigctld client disconnect + * Add FTDX1200 to rigs that need to ensure PTT is off before + changing frequency + * Add --disable-parallel configure option for mingw builds on Linux + +------------------------------------------------------------------- Old: ---- Hamlib-4.5.1.tar.gz New: ---- Hamlib-4.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hamlib.spec ++++++ --- /var/tmp/diff_new_pack.Tapotq/_old 2022-12-27 11:55:14.683375583 +0100 +++ /var/tmp/diff_new_pack.Tapotq/_new 2022-12-27 11:55:14.691375627 +0100 @@ -18,7 +18,7 @@ %define sover 4 Name: hamlib -Version: 4.5.1 +Version: 4.5.2 Release: 0 Summary: Run-time library to control radio transcievers and receivers License: LGPL-2.1-only ++++++ Hamlib-4.5.1.tar.gz -> Hamlib-4.5.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/NEWS new/Hamlib-4.5.2/NEWS --- old/Hamlib-4.5.1/NEWS 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/NEWS 2022-12-24 00:04:12.000000000 +0100 @@ -14,12 +14,33 @@ Version 4.6 * 2023-11-XX -- Planned for Nov 2023 + * Add --set-conf=tuner_control_pathname=hamlib_tuner_control (default) + If file exists then it will be called with 0/1 (Off/On) argument + with 'U TUNER 0' or 'U TUNER 1" + Default path is for current directory * Add MDS 4710/9710 rigs + * Add FLIR PTU-D48, E46, D100, D300 rotors + * Fix FTDX3000 rig split + +Version 4.5.2 + * 2022-12-23 + * Fix PowerSDR ability to do commands while powered off + * Fix TX-500 operations + * Fix FTDX5000 to return to MIC input on closing + * Fix rig.c calling rig_get_mode when backend does not have get_mode + * Fix kenwood_ts890_get_level + * Add Prosistel D elevation CBOX az to fix problem with azimuth control + * Fix FT736R gpredict usage by adding cached get_freq + * Fix get_powerstat problem with Log4OM/Flex and others + * Fix -R option to not need argument + * Fix -R option to close rig on last rigctld client disconnect + * Add FTDX1200 to rigs that need to ensure PTT is off before changing frequency + * Add --disable-parallel configure option for mingw builds on Linux Version 4.5.1 * 2022-12-08 * FT2000, FTDX3000/D, FT891, FT991, FT950, FTDX5000 now set CAT TOT to 100ms - * Add missing NB2 setting to FT-950, FTDX-1200, FTDX-3000, FTDX-5000, FTDX-9000 + * Add missing NB2 setting to FT-950, FTDX-1200, FT-2000, FTDX-3000, FTDX-5000, FTDX-9000 * Add missing meter reading to TS-890S -- thanks to Geore Baltz N3GB * Fix FT736 VFOB freq and mode set * Added send_raw to rigctl -- see rigctl man page diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/Segfault-award new/Hamlib-4.5.2/Segfault-award --- old/Hamlib-4.5.1/Segfault-award 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/Segfault-award 2022-12-24 00:04:12.000000000 +0100 @@ -7,6 +7,8 @@ Here is the list of the brave fellows: +* Saku Nyland OH1KH v4.5.1, 10/2022, rigctld.c using ptt_type=RTS + * David Kjellquist WB5NHL, v1.1.3, 09/2002, kenwood/ts570.c caught on TS570D backend startup. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/configure.ac new/Hamlib-4.5.2/configure.ac --- old/Hamlib-4.5.1/configure.ac 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/configure.ac 2022-12-24 00:04:12.000000000 +0100 @@ -14,7 +14,7 @@ dnl however, the use of '~' should be fine as apt (others?) will treat dnl it as an earlier version than the actual release. TNX KA6MAL dnl PACKAGE_NAME + " " + PACKAGE_VERSION must not exceed 20 chars! -AC_INIT([Hamlib],[4.5.1],[hamlib-developer@lists.sourceforge.net],[hamlib],[http://www.hamlib.org]) +AC_INIT([Hamlib],[4.5.2],[hamlib-developer@lists.sourceforge.net],[hamlib],[http://www.hamlib.org]) AC_CONFIG_SRCDIR([include/hamlib/rig.h]) AC_CONFIG_MACRO_DIR([macros]) @@ -694,6 +694,15 @@ [cf_with_winradio="yes" AC_DEFINE([HAVE_WINRADIO],[1],[Define if winradio backend is built])]) AC_MSG_RESULT([$cf_with_winradio]) +dnl Parallel port device disable +AC_MSG_CHECKING([whether to build parallel port devices]) +AC_ARG_ENABLE([parallel], + [AS_HELP_STRING([--disable-parallel], + [do not build parallel devices @<:@default=yes@:>@])], + [cf_with_parallel="no"], + [cf_with_parallel="yes" AC_DEFINE([HAVE_PARALLEL],[1],[Define if parallel devices are to be built])]) +AC_MSG_RESULT([$cf_with_parallel]) + DL_LIBS="" AS_IF([test x"${cf_with_winradio}" = "xyes"], @@ -912,6 +921,7 @@ Enable HTML rig feature matrix ${cf_enable_html_matrix} Enable WinRadio ${cf_with_winradio} + Enable Parallel ${cf_with_parallel} Enable USRP ${cf_with_usrp} Enable USB backends ${cf_with_libusb} Enable shared libs ${enable_shared} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/doc/man1/rigctl.1 new/Hamlib-4.5.2/doc/man1/rigctl.1 --- old/Hamlib-4.5.1/doc/man1/rigctl.1 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/doc/man1/rigctl.1 2022-12-24 00:04:12.000000000 +0100 @@ -1289,7 +1289,7 @@ Returns current lock mode status 1=On, 2=Off (only useful when using rigctld) . .TP -.BR send_raw " \(aq" \fITerminator\fP "\(aq \(aq" \fIString\fp \(aq +.BR send_raw " \(aq" \fITerminator\fP "\(aq \(aq" \fIString\fP \(aq .EX Can send ASCII string or 0xnn values -- there can be no spaces in the command string. Possible terminator values are CR, LF, ;, ICOM, 0-100 (bytes to read), or -1 meaning unknown (will timeout on read) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/include/hamlib/rig.h new/Hamlib-4.5.2/include/hamlib/rig.h --- old/Hamlib-4.5.1/include/hamlib/rig.h 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/include/hamlib/rig.h 2022-12-24 00:04:12.000000000 +0100 @@ -3396,6 +3396,7 @@ extern HAMLIB_EXPORT(int) rig_get_vfo_info(RIG *rig, vfo_t vfo, freq_t *freq, rmode_t *mode, pbwidth_t *width, split_t *split, int *satmode); extern HAMLIB_EXPORT(int) rig_get_rig_info(RIG *rig, char *response, int max_response_len); extern HAMLIB_EXPORT(int) rig_get_cache(RIG *rig, vfo_t vfo, freq_t *freq, int * cache_ms_freq, rmode_t *mode, int *cache_ms_mode, pbwidth_t *width, int *cache_ms_width); +extern HAMLIB_EXPORT(int) rig_get_cache_freq(RIG *rig, vfo_t vfo, freq_t *freq, int * cache_ms_freq); extern HAMLIB_EXPORT(int) rig_set_clock(RIG *rig, int year, int month, int day, int hour, int min, int sec, double msec, int utc_offset); extern HAMLIB_EXPORT(int) rig_get_clock(RIG *rig, int *year, int *month, int *day, int *hour, int *min, int *sec, double *msec, int *utc_offset); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/include/hamlib/rotlist.h new/Hamlib-4.5.2/include/hamlib/rotlist.h --- old/Hamlib-4.5.1/include/hamlib/rotlist.h 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/include/hamlib/rotlist.h 2022-12-24 00:04:12.000000000 +0100 @@ -557,6 +557,7 @@ #define ROT_MODEL_PROSISTEL_D_AZ ROT_MAKE_MODEL(ROT_PROSISTEL, 1) #define ROT_MODEL_PROSISTEL_D_EL ROT_MAKE_MODEL(ROT_PROSISTEL, 2) #define ROT_MODEL_PROSISTEL_COMBI_TRACK_AZEL ROT_MAKE_MODEL(ROT_PROSISTEL, 3) +#define ROT_MODEL_PROSISTEL_D_EL_CBOXAZ ROT_MAKE_MODEL(ROT_PROSISTEL, 4) /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/rigs/dummy/netrigctl.c new/Hamlib-4.5.2/rigs/dummy/netrigctl.c --- old/Hamlib-4.5.1/rigs/dummy/netrigctl.c 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/rigs/dummy/netrigctl.c 2022-12-24 00:04:12.000000000 +0100 @@ -2052,14 +2052,22 @@ ret = netrigctl_transaction(rig, cmd, strlen(cmd), buf); - if (ret <= 0) + if (ret == 0) { - return (ret < 0) ? ret : -RIG_EPROTO; + *status = atoi(buf); + } + else + { + // was causing problems with sdr++ since it does not have PS command + // a return of 1 should indicate there is no powerstat command available + // so we fake the ON status + // also a problem with Flex 6xxx and Log4OM not working due to lack of PS command + rig_debug(RIG_DEBUG_VERBOSE, + "%s: PS command failed (ret=%d) so returning RIG_POWER_ON\n", __func__, ret); + *status = RIG_POWER_ON; } - *status = atoi(buf); - - return RIG_OK; + return RIG_OK; // always return RIG_OK } @@ -2726,7 +2734,7 @@ RIG_MODEL(RIG_MODEL_NETRIGCTL), .model_name = "NET rigctl", .mfg_name = "Hamlib", - .version = "20221201.0", + .version = "20221214.0", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_OTHER, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/rigs/kenwood/ts890s.c new/Hamlib-4.5.2/rigs/kenwood/ts890s.c --- old/Hamlib-4.5.1/rigs/kenwood/ts890s.c 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/rigs/kenwood/ts890s.c 2022-12-24 00:04:12.000000000 +0100 @@ -305,7 +305,7 @@ if (rig->caps->swr_cal.size) { - val->f = rig_raw2val_float(val->i, &rig->caps->swr_cal); + val->f = rig_raw2val_float(levelint, &rig->caps->swr_cal); } else { @@ -432,7 +432,7 @@ RIG_MODEL(RIG_MODEL_TS890S), .model_name = "TS-890S", .mfg_name = "Kenwood", - .version = BACKEND_VER ".9", + .version = BACKEND_VER ".10", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/rigs/kenwood/tx500.c new/Hamlib-4.5.2/rigs/kenwood/tx500.c --- old/Hamlib-4.5.1/rigs/kenwood/tx500.c 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/rigs/kenwood/tx500.c 2022-12-24 00:04:12.000000000 +0100 @@ -127,15 +127,15 @@ RIG_MODEL(RIG_MODEL_LAB599_TX500), .model_name = "TX-500", .mfg_name = "Lab599", - .version = BACKEND_VER ".1", + .version = BACKEND_VER ".3", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, .ptt_type = RIG_PTT_RIG, .dcd_type = RIG_DCD_RIG, .port_type = RIG_PORT_SERIAL, - .serial_rate_min = 1200, - .serial_rate_max = 57600, + .serial_rate_min = 9600, + .serial_rate_max = 9600, .serial_data_bits = 8, .serial_stop_bits = 1, .serial_parity = RIG_PARITY_NONE, @@ -318,8 +318,8 @@ .set_channel = ts2000_set_channel, .set_trn = kenwood_set_trn, .get_trn = kenwood_get_trn, - .set_powerstat = kenwood_set_powerstat, - .get_powerstat = kenwood_get_powerstat, + //.set_powerstat = kenwood_set_powerstat, + //.get_powerstat = kenwood_get_powerstat, .get_info = kenwood_get_info, .reset = kenwood_reset, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/rigs/yaesu/ft736.c new/Hamlib-4.5.2/rigs/yaesu/ft736.c --- old/Hamlib-4.5.1/rigs/yaesu/ft736.c 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/rigs/yaesu/ft736.c 2022-12-24 00:04:12.000000000 +0100 @@ -31,6 +31,7 @@ #include "misc.h" #include "yaesu.h" #include "tones.h" +#include "cache.h" @@ -58,6 +59,7 @@ static int ft736_close(RIG *rig); static int ft736_set_freq(RIG *rig, vfo_t vfo, freq_t freq); +static int ft736_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); // cached answer static int ft736_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); static int ft736_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo); @@ -98,7 +100,7 @@ RIG_MODEL(RIG_MODEL_FT736R), .model_name = "FT-736R", .mfg_name = "Yaesu", - .version = "20211271.0", + .version = "20221218.0", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -195,6 +197,7 @@ .rig_close = ft736_close, .set_freq = ft736_set_freq, + .get_freq = ft736_get_freq, .set_mode = ft736_set_mode, .set_ptt = ft736_set_ptt, .get_dcd = ft736_get_dcd, @@ -268,6 +271,7 @@ { unsigned char cmd[YAESU_CMD_LENGTH] = { 0x00, 0x00, 0x00, 0x00, 0x01}; struct ft736_priv_data *priv = (struct ft736_priv_data *)rig->state.priv; + int retval; // we will assume requesting to set VFOB is split mode if (vfo == RIG_VFO_B) { return rig_set_split_freq(rig, vfo, freq); } @@ -286,10 +290,24 @@ cmd[0] = (cmd[0] & 0x0f) | 0xc0; } - /* Frequency set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + retval = write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + + if (retval == RIG_OK) { rig_set_cache_freq(rig, vfo, freq); } + + return retval; } +int ft736_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) +{ + rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); + + if (vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN) { *freq = rig->state.cache.freqMainA; } + else { rig_get_cache_freq(rig, vfo, freq, NULL); } + + return RIG_OK; +} + + #define MD_LSB 0x00 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/rigs/yaesu/newcat.c new/Hamlib-4.5.2/rigs/yaesu/newcat.c --- old/Hamlib-4.5.1/rigs/yaesu/newcat.c 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/rigs/yaesu/newcat.c 2022-12-24 00:04:12.000000000 +0100 @@ -604,12 +604,18 @@ char *cmd = "EX0291;EX029;"; // FT2000/D if (priv->rig_id == NC_RIGID_FT950 || rig->caps->rig_model == RIG_MODEL_FT950) { cmd = "EX0271;EX027;"; } - else if (priv->rig_id == NC_RIGID_FT891 || rig->caps->rig_model == RIG_MODEL_FT891) { cmd = "EX05071;EX0507;"; } - else if (priv->rig_id == NC_RIGID_FT991 || rig->caps->rig_model == RIG_MODEL_FT991) { cmd = "EX0321;EX032;"; } - else if (priv->rig_id == NC_RIGID_FT991A || rig->caps->rig_model == RIG_MODEL_FT991) { cmd = "EX0321;EX032;"; } - else if (priv->rig_id == NC_RIGID_FTDX3000 || rig->caps->rig_model == RIG_MODEL_FTDX3000) { cmd = "EX0391;EX039;"; } - else if (priv->rig_id == NC_RIGID_FTDX3000DM || rig->caps->rig_model == RIG_MODEL_FTDX3000) { cmd = "EX0391;EX039;"; } - else if (priv->rig_id == NC_RIGID_FTDX5000 || rig->caps->rig_model == RIG_MODEL_FTDX5000) { cmd = "EX0331;EX033"; } + else if (priv->rig_id == NC_RIGID_FT891 + || rig->caps->rig_model == RIG_MODEL_FT891) { cmd = "EX05071;EX0507;"; } + else if (priv->rig_id == NC_RIGID_FT991 + || rig->caps->rig_model == RIG_MODEL_FT991) { cmd = "EX0321;EX032;"; } + else if (priv->rig_id == NC_RIGID_FT991A + || rig->caps->rig_model == RIG_MODEL_FT991) { cmd = "EX0321;EX032;"; } + else if (priv->rig_id == NC_RIGID_FTDX3000 + || rig->caps->rig_model == RIG_MODEL_FTDX3000) { cmd = "EX0391;EX039;"; } + else if (priv->rig_id == NC_RIGID_FTDX3000DM + || rig->caps->rig_model == RIG_MODEL_FTDX3000) { cmd = "EX0391;EX039;"; } + else if (priv->rig_id == NC_RIGID_FTDX5000 + || rig->caps->rig_model == RIG_MODEL_FTDX5000) { cmd = "EX0331;EX033"; } SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "%s", cmd); @@ -656,6 +662,14 @@ priv->poweron = 0; } + if (is_ftdx5000) + { + // Ensure FT5000 is back to MIC input + SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX1030;"); + rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str); + newcat_set_cmd(rig); // don't care about the return + } + RETURNFUNC(RIG_OK); } @@ -880,7 +894,7 @@ if (vfo != rig->state.tx_vfo) { return -RIG_ENTARGET; } } - if (is_ftdx3000 || is_ftdx3000dm || is_ftdx5000) + if (is_ftdx3000 || is_ftdx3000dm || is_ftdx5000 || is_ftdx1200) { // we have a few rigs that can't set freq while PTT_ON // so we'll try a few times to see if we just need to wait a bit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/rigs/yaesu/newcat.h new/Hamlib-4.5.2/rigs/yaesu/newcat.h --- old/Hamlib-4.5.1/rigs/yaesu/newcat.h 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/rigs/yaesu/newcat.h 2022-12-24 00:04:12.000000000 +0100 @@ -50,7 +50,7 @@ typedef char ncboolean; /* shared function version */ -#define NEWCAT_VER "20221204" +#define NEWCAT_VER "20221223" /* Hopefully large enough for future use, 128 chars plus '\0' */ #define NEWCAT_DATA_LEN 129 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/rotators/fodtrack/fodtrack.c new/Hamlib-4.5.2/rotators/fodtrack/fodtrack.c --- old/Hamlib-4.5.1/rotators/fodtrack/fodtrack.c 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/rotators/fodtrack/fodtrack.c 2022-12-24 00:04:12.000000000 +0100 @@ -26,9 +26,11 @@ #include <sys/ioctl.h> #endif +#ifdef HAVE_PARALLEL #ifdef HAVE_LINUX_PARPORT_H #include <linux/parport.h> #endif +#endif #include "hamlib/rotator.h" #include "parallel.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/rotators/prosistel/prosistel.c new/Hamlib-4.5.2/rotators/prosistel/prosistel.c --- old/Hamlib-4.5.1/rotators/prosistel/prosistel.c 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/rotators/prosistel/prosistel.c 2022-12-24 00:04:12.000000000 +0100 @@ -379,6 +379,15 @@ }; +// Elevation rotator with Control box D using azimuth logic +static const struct prosistel_rot_priv_caps prosistel_rot_el_cboxaz = +{ + .angle_multiplier = 1.0f, + .stop_angle = 997, + .elevation_id = 'A', +}; + + /* * Prosistel rotator capabilities */ @@ -486,6 +495,43 @@ .get_position = prosistel_rot_get_position, }; + +// Elevation rotator with Control box D using azimuth logic +const struct rot_caps prosistel_d_el_cboxaz_rot_caps = +{ + ROT_MODEL(ROT_MODEL_PROSISTEL_D_EL_CBOXAZ), + .model_name = "D elevation CBOX az", + .mfg_name = "Prosistel", + .version = "20221215.0", + .copyright = "LGPL", + .status = RIG_STATUS_STABLE, + .rot_type = ROT_TYPE_ELEVATION, + .port_type = RIG_PORT_SERIAL, + .serial_rate_min = 9600, + .serial_rate_max = 9600, + .serial_data_bits = 8, + .serial_stop_bits = 1, + .serial_parity = RIG_PARITY_NONE, + .serial_handshake = RIG_HANDSHAKE_NONE, + .write_delay = 0, + .post_write_delay = 0, + .timeout = 3000, + .retry = 3, + + .min_az = 0.0, + .max_az = 0.0, + .min_el = 0.0, + .max_el = 90.0, + + .priv = &prosistel_rot_el_cboxaz, + + .rot_open = prosistel_rot_open, + .stop = prosistel_rot_stop, + .set_position = prosistel_rot_set_position, + .get_position = prosistel_rot_get_position, +}; + + DECLARE_INITROT_BACKEND(prosistel) { rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__); @@ -493,6 +539,7 @@ rot_register(&prosistel_d_az_rot_caps); rot_register(&prosistel_d_el_rot_caps); rot_register(&prosistel_combi_track_azel_rot_caps); + rot_register(&prosistel_d_el_cboxaz_rot_caps); return RIG_OK; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/rotators/prosistel/prosistel.h new/Hamlib-4.5.2/rotators/prosistel/prosistel.h --- old/Hamlib-4.5.1/rotators/prosistel/prosistel.h 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/rotators/prosistel/prosistel.h 2022-12-24 00:04:12.000000000 +0100 @@ -25,5 +25,6 @@ extern const struct rot_caps prosistel_d_az_rot_caps; extern const struct rot_caps prosistel_d_el_rot_caps; extern const struct rot_caps prosistel_combi_track_azel_rot_caps; +extern const struct rot_caps prosistel_d_el_cboxaz_rot_caps; #endif /* _ROT_PROSISTEL_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/simulators/simftdx1200.c new/Hamlib-4.5.2/simulators/simftdx1200.c --- old/Hamlib-4.5.1/simulators/simftdx1200.c 1970-01-01 01:00:00.000000000 +0100 +++ new/Hamlib-4.5.2/simulators/simftdx1200.c 2022-12-24 00:04:12.000000000 +0100 @@ -0,0 +1,309 @@ +// can run this using rigctl/rigctld and socat pty devices +// gcc -o simyaesu simyaesu.c +#define _XOPEN_SOURCE 600 +#include <stdio.h> +#include <stdlib.h> +#include <fcntl.h> +#include <string.h> +#include <unistd.h> +#include "../include/hamlib/rig.h" + +#define BUFSIZE 256 + +float freqA = 14074000; +float freqB = 14074500; +int vfo = 0; +int ft = 0; +int md = 1; +int vs = 0; +int tx = 0; +int ai = 0; +int sh = 25; +int na = 0; +int ex039 = 0; + +// ID 0310 == 310, Must drop leading zero +typedef enum nc_rigid_e +{ + NC_RIGID_NONE = 0, + NC_RIGID_FT450 = 241, + NC_RIGID_FT450D = 244, + NC_RIGID_FT950 = 310, + NC_RIGID_FT891 = 135, + NC_RIGID_FT991 = 135, + NC_RIGID_FT2000 = 251, + NC_RIGID_FT2000D = 252, + NC_RIGID_FTDX1200 = 583, + NC_RIGID_FTDX9000D = 101, + NC_RIGID_FTDX9000Contest = 102, + NC_RIGID_FTDX9000MP = 103, + NC_RIGID_FTDX5000 = 362, + NC_RIGID_FTDX3000 = 460, + NC_RIGID_FTDX101D = 681, + NC_RIGID_FTDX101MP = 682 +} nc_rigid_t; + +int +getmyline(int fd, char *buf) +{ + char c; + int i = 0; + memset(buf, 0, BUFSIZE); + + while (read(fd, &c, 1) > 0) + { + buf[i++] = c; + + if (c == ';') { return strlen(buf); } + } + + return strlen(buf); +} + +#if defined(WIN32) || defined(_WIN32) +int openPort(char *comport) // doesn't matter for using pts devices +{ + int fd; + fd = open(comport, O_RDWR); + + if (fd < 0) + { + perror(comport); + } + + return fd; +} + +#else +int openPort(char *comport) // doesn't matter for using pts devices +{ + int fd = posix_openpt(O_RDWR); + char *name = ptsname(fd); + + if (name == NULL) + { + perror("pstname"); + return -1; + } + + printf("name=%s\n", name); + + if (fd == -1 || grantpt(fd) == -1 || unlockpt(fd) == -1) + { + perror("posix_openpt"); + return -1; + } + + return fd; +} +#endif + + + +int main(int argc, char *argv[]) +{ + char buf[256]; + char *pbuf; + int n; + int fd = openPort(argv[1]); + + while (1) + { + if (getmyline(fd, buf)) + { + printf("Cmd:%s\n", buf); + } + else { continue; } + + if (strcmp(buf, "RM5;") == 0) + { + printf("%s\n", buf); + usleep(50 * 1000); + pbuf = "RM5100000;"; + n = write(fd, pbuf, strlen(pbuf)); + printf("n=%d\n", n); + + if (n <= 0) { perror("RM5"); } + } + + if (strcmp(buf, "AN0;") == 0) + { + printf("%s\n", buf); + usleep(50 * 1000); + pbuf = "AN030;"; + n = write(fd, pbuf, strlen(pbuf)); + printf("n=%d\n", n); + + if (n <= 0) { perror("AN"); } + } + else if (strcmp(buf, "IF;") == 0) + { + printf("%s\n", buf); + usleep(50 * 1000); + pbuf = "IF059014200000+000000700000;"; + n = write(fd, pbuf, strlen(pbuf)); + printf("n=%d\n", n); + + if (n <= 0) { perror("IF"); } + } + else if (strcmp(buf, "ID;") == 0) + { + printf("%s\n", buf); + usleep(50 * 1000); + int id = NC_RIGID_FTDX3000; + SNPRINTF(buf, sizeof(buf), "ID%03d;", id); + n = write(fd, buf, strlen(buf)); + printf("n=%d\n", n); + + if (n <= 0) { perror("ID"); } + } + else if (strcmp(buf, "AI;") == 0) + { + printf("%s\n", buf); + usleep(50 * 1000); + SNPRINTF(buf, sizeof(buf), "AI0;"); + n = write(fd, buf, strlen(buf)); + printf("n=%d\n", n); + + if (n <= 0) { perror("ID"); } + } + +#if 0 + else if (strncmp(buf, "AI", 2) == 0) + { + if (strcmp(buf, "AI;")) + { + printf("%s\n", buf); + usleep(50 * 1000); + n = fprintf(fp, "%s", "AI0;"); + printf("n=%d\n", n); + + if (n <= 0) { perror("AI"); } + } + } + +#endif + else if (strcmp(buf, "VS;") == 0) + { + printf("%s\n", buf); + usleep(50 * 1000); + pbuf = "VS0;"; + n = write(fd, pbuf, strlen(pbuf)); + printf("n=%d\n", n); + + if (n < 0) { perror("VS"); } + } + else if (strcmp(buf, "EX032;") == 0) + { + static int ant = 0; + ant = (ant + 1) % 3; + printf("%s\n", buf); + usleep(50 * 1000); + SNPRINTF(buf, sizeof(buf), "EX032%1d;", ant); + n = write(fd, buf, strlen(buf)); + printf("n=%d\n", n); + + if (n < 0) { perror("EX032"); } + } + + else if (strcmp(buf, "FA;") == 0) + { + SNPRINTF(buf, sizeof(buf), "FA%08.0f;", freqA); + n = write(fd, buf, strlen(buf)); + } + else if (strncmp(buf, "FA", 2) == 0) + { + sscanf(buf, "FA%f", &freqA); + } + else if (strcmp(buf, "FB;") == 0) + { + SNPRINTF(buf, sizeof(buf), "FB%08.0f;", freqB); + n = write(fd, buf, strlen(buf)); + } + else if (strncmp(buf, "FB", 2) == 0) + { + sscanf(buf, "FB%f", &freqB); + } + else if (strcmp(buf, "VS;") == 0) + { + SNPRINTF(buf, sizeof(buf), "VS%c;", vfo == 0 ? '0' : '1'); + n = write(fd, buf, strlen(buf)); + } + else if (strcmp(buf, "FT;") == 0) + { + SNPRINTF(buf, sizeof(buf), "FT%d;", ft); + n = write(fd, buf, strlen(buf)); + } + else if (strcmp(buf, "MD0;") == 0) + { + SNPRINTF(buf, sizeof(buf), "MD0%d;", md); + n = write(fd, buf, strlen(buf)); + } + else if (strcmp(buf, "VS;") == 0) + { + SNPRINTF(buf, sizeof(buf), "VS%d;", vs); + n = write(fd, buf, strlen(buf)); + } + else if (strncmp(buf, "VS", 2) == 0) + { + sscanf(buf, "VS%d", &vs); + } + else if (strcmp(buf, "TX;") == 0) + { + SNPRINTF(buf, sizeof(buf), "TX%d;", tx); + n = write(fd, buf, strlen(buf)); + } + else if (strncmp(buf, "TX", 2) == 0) + { + sscanf(buf, "TX%d", &tx); + } + else if (strcmp(buf, "AI;") == 0) + { + SNPRINTF(buf, sizeof(buf), "AI%d;", ai); + n = write(fd, buf, strlen(buf)); + } + else if (strncmp(buf, "AI", 2) == 0) + { + sscanf(buf, "AI%d", &ai); + } + else if (strcmp(buf, "SH0;") == 0) + { + SNPRINTF(buf, sizeof(buf), "SH0%d;", sh); + n = write(fd, buf, strlen(buf)); + } + else if (strncmp(buf, "SH0", 3) == 0) + { + sscanf(buf, "SH0%d", &sh); + } + else if (strcmp(buf, "NA0;") == 0) + { + SNPRINTF(buf, sizeof(buf), "NA0%d;", na); + n = write(fd, buf, strlen(buf)); + } + else if (strncmp(buf, "NA0", 3) == 0) + { + sscanf(buf, "NA0%d", &na); + } + else if (strcmp(buf, "EX039;") == 0) + { + SNPRINTF(buf, sizeof(buf), "EX039%d;", ex039); + n = write(fd, buf, strlen(buf)); + } + else if (strncmp(buf, "EX039", 3) == 0) + { + sscanf(buf, "EX039%d", &ex039); + } + else if (strcmp(buf,"PS;") == 0) + { + SNPRINTF(buf, sizeof(buf), "PS1;"); + n = write(fd, buf, strlen(buf)); + } + else if (strlen(buf) > 0) + { + fprintf(stderr, "Unknown command: %s\n", buf); + } + + } + + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/simulators/simftdx3000.c new/Hamlib-4.5.2/simulators/simftdx3000.c --- old/Hamlib-4.5.1/simulators/simftdx3000.c 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/simulators/simftdx3000.c 2022-12-24 00:04:12.000000000 +0100 @@ -252,6 +252,11 @@ { sscanf(buf, "MD0%d", &md); } + else if (strcmp(buf, "PS;") == 0) + { + SNPRINTF(buf, sizeof(buf), "PS1;"); + n = write(fd, buf, strlen(buf)); + } else if (strcmp(buf, "VS;") == 0) { SNPRINTF(buf, sizeof(buf), "VS%d;", vs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/src/cache.c new/Hamlib-4.5.2/src/cache.c --- old/Hamlib-4.5.1/src/cache.c 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/src/cache.c 2022-12-24 00:04:12.000000000 +0100 @@ -442,6 +442,41 @@ return RIG_OK; } +/** + * \brief get cached values for a VFO + * \param rig The rig handle + * \param vfo The VFO to get information from + * \param freq The frequency is stored here + * \param cache_ms_freq The age of the last frequency update in ms -- NULL if you don't want it + + * Use this to query the frequency cache and then determine to actually fetch data from + * the rig. + * + * \return RIG_OK if the operation has been successful, otherwise + * a negative value if an error occurred (in which case, cause is + * set appropriately). + * + */ +int rig_get_cache_freq(RIG *rig, vfo_t vfo, freq_t *freq, int *cache_ms_freq_p) +{ + rmode_t mode; + int cache_ms_freq; + int cache_ms_mode; + pbwidth_t width; + int cache_ms_width; + int retval; + retval = rig_get_cache(rig, vfo, freq, &cache_ms_freq, &mode, &cache_ms_mode, + &width, &cache_ms_width); + + if (retval == RIG_OK) + { + if (cache_ms_freq_p) { *cache_ms_freq_p = cache_ms_freq; } + } + + return retval; +} + + void rig_cache_show(RIG *rig, const char *func, int line) { rig_debug(RIG_DEBUG_CACHE, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/src/parallel.h new/Hamlib-4.5.2/src/parallel.h --- old/Hamlib-4.5.1/src/parallel.h 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/src/parallel.h 2022-12-24 00:04:12.000000000 +0100 @@ -26,9 +26,11 @@ #include <hamlib/rig.h> #include "iofunc.h" +#ifdef HAVE_PARALLEL #ifdef HAVE_LINUX_PARPORT_H # include <linux/parport.h> #endif +#endif #ifndef PARPORT_CONTROL_STROBE # define PARPORT_CONTROL_STROBE 0x1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/src/rig.c new/Hamlib-4.5.2/src/rig.c --- old/Hamlib-4.5.1/src/rig.c 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/src/rig.c 2022-12-24 00:04:12.000000000 +0100 @@ -1346,14 +1346,18 @@ rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): Current split=%d, tx_vfo=%s\n", __func__, __LINE__, split, rig_strvfo(tx_vfo)); rmode_t mode; - pbwidth_t width; - rig_get_mode(rig, RIG_VFO_A, &mode, &width); + pbwidth_t width = 2400; // we'll use 2400Hz as default width - if (split) + if (rig->caps->get_mode) { - rig_debug(RIG_DEBUG_VERBOSE, "xxxsplit=%d\n", split); - HAMLIB_TRACE; - rig_get_mode(rig, RIG_VFO_B, &mode, &width); + rig_get_mode(rig, RIG_VFO_A, &mode, &width); + + if (split) + { + rig_debug(RIG_DEBUG_VERBOSE, "xxxsplit=%d\n", split); + HAMLIB_TRACE; + rig_get_mode(rig, RIG_VFO_B, &mode, &width); + } } } } @@ -1516,6 +1520,8 @@ remove_opened_rig(rig); + // zero split so it will allow it to be set again on open for rigctld + rig->state.cache.split = 0; rs->comm_state = 0; rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): %p rs->comm_state==0?=%d\n", __func__, __LINE__, &rs->comm_state, @@ -1802,7 +1808,11 @@ if (retcode != RIG_OK) { RETURNFUNC(retcode); } - rig_set_cache_freq(rig, vfo, (freq_t)0); + // Unidirectional rigs do not reset cache + if (rig->caps->rig_model != RIG_MODEL_FT736R) + { + rig_set_cache_freq(rig, vfo, (freq_t)0); + } #if 0 // this verification seems to be causing bad behavior on some rigs @@ -1893,7 +1903,12 @@ #endif ) { - rig_set_cache_freq(rig, RIG_VFO_ALL, (freq_t)0); + // Unidirectional rigs do not reset cache + if (rig->caps->rig_model != RIG_MODEL_FT736R) + { + rig_set_cache_freq(rig, RIG_VFO_ALL, (freq_t)0); + } + HAMLIB_TRACE; retcode = rig_get_freq(rig, vfo, &freq_new); @@ -2892,8 +2907,9 @@ if (cache_ms < rig->state.cache.timeout_ms) { - rig_debug(RIG_DEBUG_TRACE, "%s: cache hit age=%dms\n", __func__, cache_ms); *vfo = rig->state.cache.vfo; + rig_debug(RIG_DEBUG_TRACE, "%s: cache hit age=%dms, vfo=%s\n", __func__, + cache_ms, rig_strvfo(*vfo)); ELAPSED2; RETURNFUNC(RIG_OK); } @@ -6020,7 +6036,7 @@ if (rig->caps->get_powerstat == NULL) { *status = RIG_POWER_ON; // default to power if not available - RETURNFUNC(-RIG_ENAVAIL); + RETURNFUNC(RIG_OK); } *status = RIG_POWER_OFF; // default now to power off until proven otherwise in get_powerstat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/tests/rigctl_parse.c new/Hamlib-4.5.2/tests/rigctl_parse.c --- old/Hamlib-4.5.1/tests/rigctl_parse.c 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/tests/rigctl_parse.c 2022-12-24 00:04:12.000000000 +0100 @@ -1752,7 +1752,8 @@ && cmd_entry->cmd != '3' // dump_conf && cmd_entry->cmd != 0x8f // dump_state && cmd_entry->cmd != 0xf0 // chk_vfo - && cmd_entry->cmd != 0x87) // set_powerstat + && cmd_entry->cmd != 0x87 // set_powerstat + && my_rig->caps->rig_model != RIG_MODEL_POWERSDR) // some rigs can do stuff when powered off { rig_debug(RIG_DEBUG_WARN, "%s: command %s not allowed when rig is powered off\n", __func__, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Hamlib-4.5.1/tests/rigctld.c new/Hamlib-4.5.2/tests/rigctld.c --- old/Hamlib-4.5.1/tests/rigctld.c 2022-12-08 16:11:46.000000000 +0100 +++ new/Hamlib-4.5.2/tests/rigctld.c 2022-12-24 00:04:12.000000000 +0100 @@ -83,7 +83,7 @@ * keep up to date SHORT_OPTIONS, usage()'s output and man page. thanks. * TODO: add an option to read from a file */ -#define SHORT_OPTIONS "m:r:R:p:d:P:D:s:S:c:T:t:C:W:w:x:z:lLuovhVZMA:n:" +#define SHORT_OPTIONS "m:r:p:d:P:D:s:S:c:T:t:C:W:w:x:z:lLuovhVZMRA:n:" static struct option long_options[] = { {"model", 1, 0, 'm'}, @@ -154,6 +154,8 @@ char resp_sep = '\n'; extern int lock_mode; extern powerstat_t rig_powerstat; +static int rigctld_idle = + 0; // if true then rig will close when no clients are connected #define MAXCONFLEN 1024 @@ -262,8 +264,6 @@ int twiddle_timeout = 0; int twiddle_rit = 0; int uplink = 0; - int rigctld_idle = - 0; // if true then rig will close when no clients are connected char host[NI_MAXHOST]; char serv[NI_MAXSERV]; char rigstartup[1024]; @@ -701,7 +701,9 @@ { my_rig->state.pttport.type.ptt = ptt_type; my_rig->state.pttport_deprecated.type.ptt = ptt_type; - my_rig->caps->ptt_type = ptt_type; + // This causes segfault since backend rig_caps are const + // rigctld will use the rig->state version of this for clients + //my_rig->caps->ptt_type = ptt_type; } if (dcd_type != RIG_DCD_NONE) @@ -1195,7 +1197,7 @@ #ifdef HAVE_PTHREAD mutex_rigctld(1); -// ++client_count; + ++client_count; #if 0 if (!client_count++) @@ -1311,7 +1313,19 @@ } while (!ctrl_c && (retcode == RIG_OK || RIG_IS_SOFT_ERRCODE(-retcode))); + if (rigctld_idle && client_count == 1) + { + rig_close(my_rig); + + if (verbose > RIG_DEBUG_ERR) { printf("Closed rig model %s. Will reopen for new clients\n", my_rig->caps->model_name); } + } + + #ifdef HAVE_PTHREAD + --client_count; + + if (rigctld_idle && client_count > 0) { printf("%d client%s still connected so rig remains open\n", client_count, client_count > 1 ? "s" : ""); } + #if 0 mutex_rigctld(1);

1 0

commit crmsh for openSUSE:Factory
by Source-Sync 27 Dec '22

27 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2022-12-27 11:55:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Tue Dec 27 11:55:02 2022 rev:273 rq:1045457 version:4.4.1+20221227.bd7d326e Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-12-16 17:52:05.608163550 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new.1563/crmsh.changes 2022-12-27 11:55:12.703364570 +0100 @@ -1,0 +2,26 @@ +Tue Dec 27 08:22:09 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20221227.bd7d326e: + * Dev: upgradeutil: do not ask when running in a background process group + +------------------------------------------------------------------- +Tue Dec 27 06:45:10 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20221227.d0ae243b: + * Dev: unittest: Adjust unit test for previous changes + * Fix: bootstrap: Unset SBD_DELAY_START when running 'crm cluster start' (bsc#1202177) + +------------------------------------------------------------------- +Mon Dec 26 14:05:42 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20221226.d38855cb: + * Dev: unittest: Adjust unit test for previous changes + * Dev: qdevice: Adjust qdevice reload policy + +------------------------------------------------------------------- +Mon Dec 26 08:11:33 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20221226.371d6f7a: + * Fix: report: Catch read exception (bsc#1206606) + +------------------------------------------------------------------- Old: ---- crmsh-4.4.1+20221215.752a541a.tar.bz2 New: ---- crmsh-4.4.1+20221227.bd7d326e.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.s0R86t/_old 2022-12-27 11:55:13.231367506 +0100 +++ /var/tmp/diff_new_pack.s0R86t/_new 2022-12-27 11:55:13.235367528 +0100 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0-or-later Group: %{pkg_group} -Version: 4.4.1+20221215.752a541a +Version: 4.4.1+20221227.bd7d326e Release: 0 URL: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.s0R86t/_old 2022-12-27 11:55:13.295367862 +0100 +++ /var/tmp/diff_new_pack.s0R86t/_new 2022-12-27 11:55:13.299367885 +0100 @@ -9,7 +9,7 @@ </service> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">752a541abb58dc5163732042ac2f8120739bc93e</param> + <param name="changesrevision">bd7d326e7b0c684c3f93a95851474fcb263a5689</param> </service> </servicedata> (No newline at EOF) ++++++ crmsh-4.4.1+20221215.752a541a.tar.bz2 -> crmsh-4.4.1+20221227.bd7d326e.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221215.752a541a/crmsh/bootstrap.py new/crmsh-4.4.1+20221227.bd7d326e/crmsh/bootstrap.py --- old/crmsh-4.4.1+20221215.752a541a/crmsh/bootstrap.py 2022-12-15 15:16:07.000000000 +0100 +++ new/crmsh-4.4.1+20221227.bd7d326e/crmsh/bootstrap.py 2022-12-27 09:04:26.000000000 +0100 @@ -727,25 +727,29 @@ Return success node list """ from .sbd import SBDTimeout - pacemaker_start_msg = "Starting pacemaker" # not _context means not in init or join process if not _context and \ utils.package_is_installed("sbd") and \ utils.service_is_enabled("sbd.service") and \ SBDTimeout.is_sbd_delay_start(): - pacemaker_start_msg += "(delaying start of sbd for {}s)".format(SBDTimeout.get_sbd_delay_start_sec_from_sysconfig()) + target_dir = "/run/systemd/system/sbd.service.d/" + cmd1 = "mkdir -p {}".format(target_dir) + target_file = "{}sbd_delay_start_disabled.conf".format(target_dir) + cmd2 = "echo -e '[Service]\nUnsetEnvironment=SBD_DELAY_START' > {}".format(target_file) + cmd3 = "systemctl daemon-reload" + for cmd in [cmd1, cmd2, cmd3]: + parallax.parallax_call(node_list, cmd) - with logger_utils.status_long(pacemaker_start_msg): - # To avoid possible JOIN flood in corosync - if len(node_list) > 5: - for node in node_list[:]: - time.sleep(0.25) - try: - utils.start_service("corosync.service", remote_addr=node) - except ValueError as err: - node_list.remove(node) - logger.error(err) - return utils.start_service("pacemaker.service", enable=enable_flag, node_list=node_list) + # To avoid possible JOIN flood in corosync + if len(node_list) > 5: + for node in node_list[:]: + time.sleep(0.25) + try: + utils.start_service("corosync.service", remote_addr=node) + except ValueError as err: + node_list.remove(node) + logger.error(err) + return utils.start_service("pacemaker.service", enable=enable_flag, node_list=node_list) def install_tmp(tmpfile, to): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221215.752a541a/crmsh/healthcheck.py new/crmsh-4.4.1+20221227.bd7d326e/crmsh/healthcheck.py --- old/crmsh-4.4.1+20221215.752a541a/crmsh/healthcheck.py 2022-12-15 15:16:07.000000000 +0100 +++ new/crmsh-4.4.1+20221227.bd7d326e/crmsh/healthcheck.py 2022-12-27 09:04:26.000000000 +0100 @@ -216,7 +216,7 @@ if args.yes: def ask(msg): return True else: - def ask(msg): return crmsh.utils.ask('Healthcheck: fix: ' + msg) + def ask(msg): return crmsh.utils.ask('Healthcheck: fix: ' + msg, background_wait=False) if args.without_check or not feature_local_check(feature, nodes): feature.fix_local(nodes, ask) return 0 @@ -233,7 +233,7 @@ if args.yes: def ask(msg): return True else: - def ask(msg): return crmsh.utils.ask('Healthcheck: fix: ' + msg) + def ask(msg): return crmsh.utils.ask('Healthcheck: fix: ' + msg, background_wait=False) if args.without_check or not feature_full_check(feature, nodes): feature_fix(feature, nodes, ask) return 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221215.752a541a/crmsh/qdevice.py new/crmsh-4.4.1+20221227.bd7d326e/crmsh/qdevice.py --- old/crmsh-4.4.1+20221215.752a541a/crmsh/qdevice.py 2022-12-15 15:16:07.000000000 +0100 +++ new/crmsh-4.4.1+20221227.bd7d326e/crmsh/qdevice.py 2022-12-27 09:04:26.000000000 +0100 @@ -27,7 +27,7 @@ QDEVICE_RESTART_LATER = 2 -def evaluate_qdevice_quorum_effect(mode, diskless_sbd=False): +def evaluate_qdevice_quorum_effect(mode, diskless_sbd=False, is_stage=False): """ While adding/removing qdevice, get current expected votes and actual total votes, to calculate after adding/removing qdevice, whether cluster has quorum @@ -44,6 +44,9 @@ if utils.calculate_quorate_status(expected_votes, actual_votes) and not diskless_sbd: # safe to use reload return QdevicePolicy.QDEVICE_RELOAD + elif mode == QDEVICE_ADD and not is_stage: + # Add qdevice from init process, safe to restart + return QdevicePolicy.QDEVICE_RESTART elif xmlutil.CrmMonXmlParser.is_any_resource_running(): # will lose quorum, and with RA running # no reload, no restart cluster service @@ -137,6 +140,7 @@ self.cluster_name = cluster_name self.qdevice_reload_policy = QdevicePolicy.QDEVICE_RESTART self.is_stage = is_stage + self.using_diskless_sbd = False @property def qnetd_cacert_on_qnetd(self): @@ -668,10 +672,9 @@ """ from .sbd import SBDManager, SBDTimeout utils.check_all_nodes_reachable() - using_diskless_sbd = SBDManager.is_using_diskless_sbd() - self.qdevice_reload_policy = evaluate_qdevice_quorum_effect(QDEVICE_ADD, using_diskless_sbd) + self.using_diskless_sbd = SBDManager.is_using_diskless_sbd() # add qdevice after diskless sbd started - if using_diskless_sbd: + if self.using_diskless_sbd: res = SBDManager.get_sbd_value_from_config("SBD_WATCHDOG_TIMEOUT") if not res or int(res) < SBDTimeout.SBD_WATCHDOG_TIMEOUT_DEFAULT_WITH_QDEVICE: sbd_watchdog_timeout_qdevice = SBDTimeout.SBD_WATCHDOG_TIMEOUT_DEFAULT_WITH_QDEVICE @@ -688,6 +691,7 @@ with logger_utils.status_long("Qdevice certification process"): self.certificate_process_on_init() self.adjust_sbd_watchdog_timeout_with_qdevice() + self.qdevice_reload_policy = evaluate_qdevice_quorum_effect(QDEVICE_ADD, self.using_diskless_sbd, self.is_stage) self.config_qdevice() self.start_qdevice_service() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221215.752a541a/crmsh/report/utillib.py new/crmsh-4.4.1+20221227.bd7d326e/crmsh/report/utillib.py --- old/crmsh-4.4.1+20221215.752a541a/crmsh/report/utillib.py 2022-12-15 15:16:07.000000000 +0100 +++ new/crmsh-4.4.1+20221227.bd7d326e/crmsh/report/utillib.py 2022-12-27 09:04:26.000000000 +0100 @@ -1541,7 +1541,11 @@ data = None _open = get_open_method(infile) with _open(infile, 'rt', encoding='utf-8', errors='replace') as f: - data = f.read() + try: + data = f.read() + except Exception as err: + logger.error("When reading file \"%s\": %s", infile, str(err)) + return None return crmutils.to_ascii(data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221215.752a541a/crmsh/upgradeutil.py new/crmsh-4.4.1+20221227.bd7d326e/crmsh/upgradeutil.py --- old/crmsh-4.4.1+20221215.752a541a/crmsh/upgradeutil.py 2022-12-15 15:16:07.000000000 +0100 +++ new/crmsh-4.4.1+20221227.bd7d326e/crmsh/upgradeutil.py 2022-12-27 09:04:26.000000000 +0100 @@ -105,7 +105,7 @@ def _upgrade(nodes, seq): def ask(msg: str): - if not crmsh.utils.ask('Upgrade of crmsh configuration: ' + msg): + if not crmsh.utils.ask('Upgrade of crmsh configuration: ' + msg, background_wait=False): raise crmsh.healthcheck.AskDeniedByUser() try: for key in VERSION_FEATURES.keys(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221215.752a541a/crmsh/utils.py new/crmsh-4.4.1+20221227.bd7d326e/crmsh/utils.py --- old/crmsh-4.4.1+20221215.752a541a/crmsh/utils.py 2022-12-15 15:16:07.000000000 +0100 +++ new/crmsh-4.4.1+20221227.bd7d326e/crmsh/utils.py 2022-12-27 09:04:26.000000000 +0100 @@ -211,17 +211,25 @@ return (not options.ask_no) and sys.stdin.isatty() -def ask(msg): - """ - Ask for user confirmation. - If core.force is true, always return true. - If not interactive and core.force is false, always return false. +def ask(msg, background_wait=True): + """Ask for user confirmation. + + Parameters: + * background_wait: When set to False, return False without asking if current process is in background. Otherwise, + block until the process is brought to foreground. + + Global Options: + * core.force: always return true without asking + * options.ask_no: do not ask and return false """ if config.core.force: logger.info("%s [YES]", msg) return True if not can_ask(): return False + if sys.stdin.isatty() and os.tcgetpgrp(sys.stdin.fileno()) != os.getpgrp() and not background_wait: + logger.info("%s [NO]", msg) + return False msg += ' ' if msg.endswith('? '): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221215.752a541a/test/unittests/test_bootstrap.py new/crmsh-4.4.1+20221227.bd7d326e/test/unittests/test_bootstrap.py --- old/crmsh-4.4.1+20221215.752a541a/test/unittests/test_bootstrap.py 2022-12-15 15:16:07.000000000 +0100 +++ new/crmsh-4.4.1+20221227.bd7d326e/test/unittests/test_bootstrap.py 2022-12-27 09:04:26.000000000 +0100 @@ -290,21 +290,32 @@ Global tearDown. """ - @mock.patch('crmsh.log.LoggerUtils.status_long') + @mock.patch('crmsh.parallax.parallax_call') @mock.patch('crmsh.utils.start_service') - @mock.patch('crmsh.sbd.SBDTimeout.get_sbd_delay_start_sec_from_sysconfig') @mock.patch('crmsh.sbd.SBDTimeout.is_sbd_delay_start') @mock.patch('crmsh.utils.service_is_enabled') @mock.patch('crmsh.utils.package_is_installed') - def test_start_pacemaker(self, mock_installed, mock_enabled, mock_delay_start, mock_timeout, mock_start, mock_long): + def test_start_pacemaker(self, mock_installed, mock_enabled, mock_delay_start, mock_start, mock_parallax_call): bootstrap._context = None mock_installed.return_value = True mock_enabled.return_value = True mock_delay_start.return_value = True - mock_timeout.return_value = 60 - bootstrap.start_pacemaker() - mock_long.assert_called_once_with('Starting pacemaker(delaying start of sbd for 60s)') - mock_start.assert_called_once_with('pacemaker.service', enable=False, node_list=[]) + node_list = ["node1", "node2", "node3", "node4", "node5", "node6"] + bootstrap.start_pacemaker(node_list) + mock_start.assert_has_calls([ + mock.call("corosync.service", remote_addr="node1"), + mock.call("corosync.service", remote_addr="node2"), + mock.call("corosync.service", remote_addr="node3"), + mock.call("corosync.service", remote_addr="node4"), + mock.call("corosync.service", remote_addr="node5"), + mock.call("corosync.service", remote_addr="node6"), + mock.call("pacemaker.service", enable=False, node_list=node_list) + ]) + mock_parallax_call.assert_has_calls([ + mock.call(node_list, 'mkdir -p /run/systemd/system/sbd.service.d/'), + mock.call(node_list, "echo -e '[Service]\nUnsetEnvironment=SBD_DELAY_START' > /run/systemd/system/sbd.service.d/sbd_delay_start_disabled.conf"), + mock.call(node_list, "systemctl daemon-reload"), + ]) @mock.patch('crmsh.bootstrap.configure_ssh_key') @mock.patch('crmsh.utils.start_service') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20221215.752a541a/test/unittests/test_qdevice.py new/crmsh-4.4.1+20221227.bd7d326e/test/unittests/test_qdevice.py --- old/crmsh-4.4.1+20221215.752a541a/test/unittests/test_qdevice.py 2022-12-15 15:16:07.000000000 +0100 +++ new/crmsh-4.4.1+20221227.bd7d326e/test/unittests/test_qdevice.py 2022-12-27 09:04:26.000000000 +0100 @@ -18,6 +18,17 @@ @mock.patch('crmsh.utils.calculate_quorate_status') @mock.patch('crmsh.utils.get_quorum_votes_dict') +def test_evaluate_qdevice_quorum_effect_restart(mock_get_dict, mock_quorate): + mock_get_dict.return_value = {'Expected': '1', 'Total': '1'} + mock_quorate.return_value = False + res = qdevice.evaluate_qdevice_quorum_effect(qdevice.QDEVICE_ADD, False, False) + assert res == qdevice.QdevicePolicy.QDEVICE_RESTART + mock_get_dict.assert_called_once_with() + mock_quorate.assert_called_once_with(2, 1) + + +(a)mock.patch('crmsh.utils.calculate_quorate_status') +(a)mock.patch('crmsh.utils.get_quorum_votes_dict') def test_evaluate_qdevice_quorum_effect_reload(mock_get_dict, mock_quorate): mock_get_dict.return_value = {'Expected': '2', 'Total': '2'} mock_quorate.return_value = True @@ -871,9 +882,10 @@ mock_get_value.assert_called_once_with("quorum.device.net.host") mock_warning.assert_called_once_with("Qdevice's vote is 0, which simply means Qdevice can't talk to Qnetd(qnetd-node) for various reasons.") + @mock.patch('crmsh.qdevice.evaluate_qdevice_quorum_effect') @mock.patch('crmsh.log.LoggerUtils.status_long') @mock.patch('crmsh.qdevice.QDevice.remove_qdevice_db') - def test_config_and_start_qdevice(self, mock_rm_db, mock_status_long): + def test_config_and_start_qdevice(self, mock_rm_db, mock_status_long, mock_evaluate): mock_status_long.return_value.__enter__ = mock.Mock() mock_status_long.return_value.__exit__ = mock.Mock() self.qdevice_with_ip.certificate_process_on_init = mock.Mock() @@ -894,13 +906,10 @@ @mock.patch('crmsh.sbd.SBDTimeout.get_stonith_timeout') @mock.patch('crmsh.sbd.SBDManager.update_configuration') @mock.patch('crmsh.sbd.SBDManager.get_sbd_value_from_config') - @mock.patch('crmsh.qdevice.evaluate_qdevice_quorum_effect') @mock.patch('crmsh.sbd.SBDManager.is_using_diskless_sbd') @mock.patch('crmsh.utils.check_all_nodes_reachable') - def test_adjust_sbd_watchdog_timeout_with_qdevice(self, mock_check_reachable, mock_using_diskless_sbd, mock_evaluate, - mock_get_sbd_value, mock_update_config, mock_get_timeout, mock_set_property): + def test_adjust_sbd_watchdog_timeout_with_qdevice(self, mock_check_reachable, mock_using_diskless_sbd, mock_get_sbd_value, mock_update_config, mock_get_timeout, mock_set_property): mock_using_diskless_sbd.return_value = True - mock_evaluate.return_value = qdevice.QdevicePolicy.QDEVICE_RELOAD mock_get_sbd_value.return_value = "" mock_get_timeout.return_value = 100 @@ -908,7 +917,6 @@ mock_check_reachable.assert_called_once_with() mock_using_diskless_sbd.assert_called_once_with() - mock_evaluate.assert_called_once_with(qdevice.QDEVICE_ADD, True) mock_get_sbd_value.assert_called_once_with("SBD_WATCHDOG_TIMEOUT") mock_update_config.assert_called_once_with({"SBD_WATCHDOG_TIMEOUT": str(sbd.SBDTimeout.SBD_WATCHDOG_TIMEOUT_DEFAULT_WITH_QDEVICE)}) mock_set_property.assert_called_once_with("stonith-timeout", 100)

1 0

commit scintilla for openSUSE:Factory
by Source-Sync 27 Dec '22

27 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package scintilla for openSUSE:Factory checked in at 2022-12-27 11:55:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scintilla (Old) and /work/SRC/openSUSE:Factory/.scintilla.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scintilla" Tue Dec 27 11:55:01 2022 rev:35 rq:1045462 version:5.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/scintilla/scintilla.changes 2022-11-01 13:43:45.900278079 +0100 +++ /work/SRC/openSUSE:Factory/.scintilla.new.1563/scintilla.changes 2022-12-27 11:55:11.755359296 +0100 @@ -1,0 +2,24 @@ +Mon Dec 26 06:48:31 UTC 2022 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Update to version 5.3.2: + - Add SCI_REPLACETARGETMINIMAL to change text without causing + unchanged prefix and suffix to be marked as modified in change + history. + - Draw background colour for EOL annotations with standard and + boxed visuals. + - Add SCI_GETSTYLEDTEXTFULL to support 64-bit document positions + on Win32 replacing SCI_GETSTYLEDTEXT which is not safe for + huge documents. Feature #1455. + - Send SCN_AUTOCCOMPLETED for SCI_AUTOCSHOW triggering insertion + because of SCI_AUTOCSETCHOOSESINGLE mode. Feature #1459. + - Change 'paragraph up' commands SCI_PARAUP and SCI_PARAUPEXTEND + to go to the start position of the paragraph containing the + caret. Bug #2363. + - Change release compilation optimization option to favour speed + over space. -O2 for MSVC and -O3 for gcc and clang. + - On Qt, implement SCI_SETRECTANGULARSELECTIONMODIFIER for all + platforms. + - On Qt, allow string form XPM images for SCI_REGISTERIMAGE. +- Minor refreshing of scintilla-shared.patch to apply cleanly. + +------------------------------------------------------------------- Old: ---- scintilla531.tgz New: ---- scintilla532.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scintilla.spec ++++++ --- /var/tmp/diff_new_pack.MW2v8L/_old 2022-12-27 11:55:12.199361766 +0100 +++ /var/tmp/diff_new_pack.MW2v8L/_new 2022-12-27 11:55:12.203361788 +0100 @@ -17,8 +17,8 @@ %define so_ver 5.3 -%define _ver %{so_ver}.1 -%define tar_ver 531 +%define _ver %{so_ver}.2 +%define tar_ver 532 %define libname libscintilla5 Name: scintilla Version: %{_ver} ++++++ scintilla-shared.patch ++++++ --- /var/tmp/diff_new_pack.MW2v8L/_old 2022-12-27 11:55:12.235361967 +0100 +++ /var/tmp/diff_new_pack.MW2v8L/_new 2022-12-27 11:55:12.239361988 +0100 @@ -11,21 +11,15 @@ COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION) vpath %.h $(srcdir) $(basedir)/src $(basedir)/include -@@ -84,12 +84,12 @@ DEFINES += -DNO_CXX11_REGEX +@@ -84,7 +84,7 @@ DEFINES += -DNO_CXX11_REGEX endif DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG) --BASE_FLAGS += $(if $(DEBUG),-g,-Os) +-BASE_FLAGS += $(if $(DEBUG),-g,-O3) +BASE_FLAGS += $(if $(DEBUG),-g) CXX_BASE_FLAGS =--std=c++17 $(BASE_FLAGS) CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) $(CONFIG_FLAGS) - --CONFIG_FLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) -+CONFIG_FLAGS:=$(shell $(PKG_CONFIG) --cflags --libs $(GTK_VERSION)) - CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gmodule-no-export-2.0) - MARSHALLER=scintilla-marshal.o - @@ -164,6 +164,7 @@ GTK_OBJS = \ $(COMPLIB): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER) $(AR) $(ARFLAGS) $@ $^ ++++++ scintilla531.tgz -> scintilla532.tgz ++++++ ++++ 3036 lines of diff (skipped)

1 0

commit scite for openSUSE:Factory
by Source-Sync 27 Dec '22

27 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package scite for openSUSE:Factory checked in at 2022-12-27 11:55:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scite (Old) and /work/SRC/openSUSE:Factory/.scite.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scite" Tue Dec 27 11:55:01 2022 rev:41 rq:1045406 version:5.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/scite/scite.changes 2022-11-01 13:43:43.672266226 +0100 +++ /work/SRC/openSUSE:Factory/.scite.new.1563/scite.changes 2022-12-27 11:55:10.651353156 +0100 @@ -1,0 +2,8 @@ +Mon Dec 26 17:53:34 UTC 2022 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Update to version 5.3.2: + * Change release compilation optimization option to favour speed + over space +- Minor rebase scite-use-system-scintilla.patch for update. + +------------------------------------------------------------------- Old: ---- scite531.tgz New: ---- scite532.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scite.spec ++++++ --- /var/tmp/diff_new_pack.MXnzdw/_old 2022-12-27 11:55:11.127355803 +0100 +++ /var/tmp/diff_new_pack.MXnzdw/_new 2022-12-27 11:55:11.131355826 +0100 @@ -17,10 +17,10 @@ # -%define tar_ver 531 +%define tar_ver 532 Name: scite -Version: 5.3.1 +Version: 5.3.2 Release: 0 Summary: Source Code Editor based on Scintilla License: MIT ++++++ scite-use-system-scintilla.patch ++++++ --- /var/tmp/diff_new_pack.MXnzdw/_old 2022-12-27 11:55:11.163356003 +0100 +++ /var/tmp/diff_new_pack.MXnzdw/_new 2022-12-27 11:55:11.163356003 +0100 @@ -1,7 +1,7 @@ -Index: scite-5.2.2/scite/gtk/makefile +Index: scite-5.3.2/scite/gtk/makefile =================================================================== ---- scite-5.2.2.orig/scite/gtk/makefile -+++ scite-5.2.2/scite/gtk/makefile +--- scite-5.3.2.orig/scite/gtk/makefile ++++ scite-5.3.2/scite/gtk/makefile @@ -8,6 +8,7 @@ srcdir ?= . @@ -51,10 +51,10 @@ rm -f $(DESTDIR)$(libdir)/liblexilla.so rm -rf $(DESTDIR)$(SYSCONF_PATH) ifdef gnomeprefix -Index: scite-5.2.2/lexilla/src/makefile +Index: scite-5.3.2/lexilla/src/makefile =================================================================== ---- scite-5.2.2.orig/lexilla/src/makefile -+++ scite-5.2.2/lexilla/src/makefile +--- scite-5.3.2.orig/lexilla/src/makefile ++++ scite-5.3.2/lexilla/src/makefile @@ -38,6 +38,7 @@ else BASE_FLAGS += -fvisibility=hidden endif @@ -63,18 +63,16 @@ LEXILLA=$(DIR_BIN)/$(SHARED_NAME).$(SHAREDEXTENSION) LIBLEXILLA=$(DIR_BIN)/liblexilla.a -@@ -73,15 +74,13 @@ endif +@@ -75,13 +76,13 @@ RANLIB ?= ranlib - RANLIB ?= ranlib + SCINTILLA_INCLUDE = ../../scintilla/include --SCINTILLA_INCLUDE = ../../scintilla/include -- -vpath %.h ../src ../include ../../scintilla/include ../lexlib +vpath %.h ../src ../include $(SCINTILLA_INCLUDE_DIR) ../lexlib vpath %.cxx ../src ../lexlib ../lexers DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG) - BASE_FLAGS += $(if $(DEBUG),-g,-Os) + BASE_FLAGS += $(if $(DEBUG),-g,-O3) -INCLUDES = -I ../include -I $(SCINTILLA_INCLUDE) -I ../src -I ../lexlib +INCLUDES = -I ../include -I $(SCINTILLA_INCLUDE_DIR) -I ../src -I ../lexlib @@ -82,4 +80,3 @@ BASE_FLAGS += $(WARNINGS) - ++++++ scite531.tgz -> scite532.tgz ++++++ ++++ 5391 lines of diff (skipped)

1 0

commit rdiff-backup for openSUSE:Factory
by Source-Sync 27 Dec '22

27 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rdiff-backup for openSUSE:Factory checked in at 2022-12-27 11:55:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rdiff-backup (Old) and /work/SRC/openSUSE:Factory/.rdiff-backup.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rdiff-backup" Tue Dec 27 11:55:00 2022 rev:6 rq:1045461 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rdiff-backup/rdiff-backup.changes 2020-09-17 15:08:52.756940092 +0200 +++ /work/SRC/openSUSE:Factory/.rdiff-backup.new.1563/rdiff-backup.changes 2022-12-27 11:55:09.735348061 +0100 @@ -1,0 +2,17 @@ +Tue Dec 20 10:11:18 UTC 2022 - Tuukka Pasanen <tuukka.pasanen(a)ilmi.fi> + +- Happy Holidays release v2.2.0 +- Despite all these changes, rdiff-backup 2.2 remains compatible with + rdiff-backup 2.0, but you can, and are encouraged to, use the new API + using --api-version 201, enabling two additional features: + * there is at last a --help parameter + * the CLI (Command Line Interface) has been refurbished and modernized + (the old one is still present but deprecated) + * You can store your parameters in a file, one per line, and call + rdiff-backup @myfile to use them + * Verbosity levels and error codes have been standardized for clearer + interaction with the tool + * Last backup can be regressed even if it isn't failed + * Locking of repositories has been greatly improved + +------------------------------------------------------------------- Old: ---- rdiff-backup-2.0.5.tar.gz New: ---- rdiff-backup-2.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rdiff-backup.spec ++++++ --- /var/tmp/diff_new_pack.dEQhun/_old 2022-12-27 11:55:10.199350641 +0100 +++ /var/tmp/diff_new_pack.dEQhun/_new 2022-12-27 11:55:10.203350664 +0100 @@ -1,7 +1,7 @@ # # spec file for package rdiff-backup # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2020 B1 Systems GmbH, Vohburg, Germany # # All modifications and additions to the file contributed by third parties @@ -19,9 +19,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: rdiff-backup -Version: 2.0.5 +Version: 2.2.0 Release: 0 Summary: Convenient and transparent local/remote incremental mirror/backup License: GPL-2.0-or-later @@ -33,6 +32,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-setuptools_scm +BuildRequires: rubygem(asciidoctor) Recommends: python3-pylibacl Recommends: python3-xattr @@ -63,12 +63,12 @@ rm -rf %{buildroot}%{_datadir}/doc/rdiff-backup %files -%defattr(-, root, root) %license COPYING -%doc CHANGELOG.md docs/FAQ.md docs/examples.md docs/index.md README.md +%doc CHANGELOG.adoc docs/FAQ.adoc docs/examples.adoc docs/index.adoc README.adoc %{_mandir}/*/* %{_bindir}/* %{python3_sitearch}/rdiff_backup +%{python3_sitearch}/rdiffbackup %{python3_sitearch}/*.egg-info %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions ++++++ rdiff-backup-2.0.5.tar.gz -> rdiff-backup-2.2.0.tar.gz ++++++ ++++ 101287 lines of diff (skipped)

1 0

commit yambar for openSUSE:Factory
by Source-Sync 27 Dec '22

27 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yambar for openSUSE:Factory checked in at 2022-12-27 11:54:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yambar (Old) and /work/SRC/openSUSE:Factory/.yambar.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yambar" Tue Dec 27 11:54:59 2022 rev:4 rq:1045445 version:1.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yambar/yambar.changes 2022-12-20 20:21:12.806117109 +0100 +++ /work/SRC/openSUSE:Factory/.yambar.new.1563/yambar.changes 2022-12-27 11:55:09.063344323 +0100 @@ -1,0 +2,6 @@ +Tue Dec 20 04:07:01 UTC 2022 - Soc Virnyl Estela <socvirnyl.estela(a)gmail.com> + +- Fix installation of license and docs. +- Set devel to noarch. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yambar.spec ++++++ --- /var/tmp/diff_new_pack.ZM6Db1/_old 2022-12-27 11:55:09.519346859 +0100 +++ /var/tmp/diff_new_pack.ZM6Db1/_new 2022-12-27 11:55:09.523346882 +0100 @@ -65,6 +65,7 @@ Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} +BuildArch: noarch %description devel Modules for interacting and modifying yambar. @@ -86,9 +87,11 @@ %install %{meson_install} +# We remove this because the docs are supplemented already +# from the doc and license macros +rm -rfv %{buildroot}%{_datadir}/doc/ + %files -%license LICENSE -%doc README.md %{_mandir}/man1/yambar.1%{?ext_man} %{_mandir}/man5/yambar.5%{?ext_man} %{_mandir}/man5/yambar-decorations.5%{?ext_man} @@ -119,6 +122,9 @@ %{_datadir}/applications/yambar.desktop %{_datadir}/zsh/site-functions/_yambar +%license LICENSE +%doc README.md CHANGELOG.md + %files devel %dir %{_includedir}/%{name}/ %dir %{_includedir}/%{name}/bar @@ -136,8 +142,4 @@ %{_includedir}/%{name}/xcb.h %{_includedir}/%{name}/yml.h -%dir %{_datadir}/doc/%{name}/ -%license %{_datadir}/doc/%{name}/LICENSE -%doc %{_datadir}/doc/%{name}/README.md - %changelog

1 0

commit python-notebook for openSUSE:Factory
by Source-Sync 27 Dec '22

27 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-notebook for openSUSE:Factory checked in at 2022-12-27 11:54:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-notebook (Old) and /work/SRC/openSUSE:Factory/.python-notebook.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-notebook" Tue Dec 27 11:54:58 2022 rev:21 rq:1045436 version:6.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-notebook/python-notebook.changes 2022-10-28 19:30:36.938957889 +0200 +++ /work/SRC/openSUSE:Factory/.python-notebook.new.1563/python-notebook.changes 2022-12-27 11:55:08.147339228 +0100 @@ -1,0 +2,11 @@ +Mon Dec 26 22:57:38 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to 6.5.2 + * Ensure custom preload is correctly handled #6580 (@echarles) + * Fix: jQuery-UI 404 Error by updating dependency path in static + template #6578 (@RRosio) + * Depend on nbclassic 0.4.7 #6593 (@echarles) +- Drop upstreamed patch notebook-pr6578+pr6580-404errors.patch +- Drop dependency on jupyter-nbformat, empty subpackage got removed + +------------------------------------------------------------------- Old: ---- notebook-6.5.1.tar.gz notebook-pr6578+pr6580-404errors.patch New: ---- notebook-6.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-notebook.spec ++++++ --- /var/tmp/diff_new_pack.IQRxbS/_old 2022-12-27 11:55:08.583341653 +0100 +++ /var/tmp/diff_new_pack.IQRxbS/_new 2022-12-27 11:55:08.591341697 +0100 @@ -25,8 +25,7 @@ %bcond_with test BuildArch: noarch %endif -%{?!python_module:%define python_module() python3-%{**}} -%define skip_python2 1 + %define plainpython python # %if 0%{?suse_version} > 1500 @@ -35,7 +34,7 @@ %bcond_with libalternatives %endif Name: python-notebook%{psuffix} -Version: 6.5.1 +Version: 6.5.2 Release: 0 Summary: Jupyter Notebook interface License: BSD-3-Clause @@ -43,8 +42,7 @@ URL: https://github.com/jupyter/notebook Source0: https://files.pythonhosted.org/packages/source/n/notebook/notebook-%{versio… Source100: python-notebook-rpmlintrc -# PATCH-FIX-UPSTREAM notebook-pr6578+pr6580-404errors.patch gh#jupyter/notebook#6578 gh#jupyter/notebook#6580 -Patch1: notebook-pr6578+pr6580-404errors.patch +BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module jupyter-packaging >= 0.9} BuildRequires: %{python_module nbclassic >= 0.4.0} BuildRequires: %{python_module setuptools} @@ -57,7 +55,7 @@ Requires: python-ipython_genutils Requires: python-jupyter-client >= 5.3.4 Requires: python-jupyter-core >= 4.6.1 -Requires: python-nbclassic +Requires: python-nbclassic >= 0.4.7 Requires: python-nbconvert >= 5 Requires: python-nbformat Requires: python-prometheus_client @@ -124,7 +122,6 @@ Requires: jupyter-jupyter-client >= 5.3.4 Requires: jupyter-jupyter-core >= 4.6.1 Requires: jupyter-nbconvert -Requires: jupyter-nbformat Requires: jupyter-notebook-filesystem Requires: python3-notebook = %{version} Conflicts: python3-jupyter_notebook < 5.7.8 @@ -167,9 +164,6 @@ %prep %autosetup -p1 -n notebook-%{version} -# unpin nbclassic (see https://github.com/jupyter/notebook/pull/6593) -sed -i 's/nbclassic==/nbclassic>=/' setup.py - # We don't want to run selenium tests rm -rf notebook/tests/selenium ++++++ notebook-6.5.1.tar.gz -> notebook-6.5.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook-6.5.1/CHANGELOG.md new/notebook-6.5.2/CHANGELOG.md --- old/notebook-6.5.1/CHANGELOG.md 2022-10-13 15:58:46.555693600 +0200 +++ new/notebook-6.5.2/CHANGELOG.md 2022-10-30 07:43:50.919678000 +0100 @@ -14,6 +14,27 @@  +## 6.5.2 + +([Full Changelog](https://github.com/jupyter/notebook/compare/v6.5.1...8a00144fa9a…) + +### Bugs fixed + +- Ensure custom preload is correctly handled [#6580](https://github.com/jupyter/notebook/pull/6580) ([@echarles](https://github.com/echarles)) +- Fix: jQuery-UI 404 Error by updating dependency path in static template [#6578](https://github.com/jupyter/notebook/pull/6578) ([@RRosio](https://github.com/RRosio)) + +### Maintenance and upkeep improvements + +- Depend on nbclassic 0.4.7 [#6593](https://github.com/jupyter/notebook/pull/6593) ([@echarles](https://github.com/echarles)) + +### Contributors to this release + +([GitHub contributors page for this release](https://github.com/jupyter/notebook/graphs/contributors?from=2022-…) + +[@bnavigator](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Abnavigator+updated%3A2022-10-13..2022-10-30&type=Issues) | [@echarles](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Aecharles+updated%3A2022-10-13..2022-10-30&type=Issues) | [@fcollonval](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Afcollonval+updated%3A2022-10-13..2022-10-30&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Agithub-actions+updated%3A2022-10-13..2022-10-30&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Ajtpio+updated%3A2022-10-13..2022-10-30&type=Issues) | [@RRosio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3ARRosio+updated%3A2022-10-13..2022-10-30&type=Issues) + + + ## 6.5.1 ([Full Changelog](https://github.com/jupyter/notebook/compare/v6.5.0...67546dad676…) @@ -28,8 +49,6 @@ [@echarles](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Aecharles+updated%3A2022-10-13..2022-10-13&type=Issues) - - ## 6.5.0 ([Full Changelog](https://github.com/jupyter/notebook/compare/v6.5.0rc0...3c7afbdf…) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook-6.5.1/PKG-INFO new/notebook-6.5.2/PKG-INFO --- old/notebook-6.5.1/PKG-INFO 2022-10-13 15:59:36.820293700 +0200 +++ new/notebook-6.5.2/PKG-INFO 2022-10-30 07:44:52.099702000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: notebook -Version: 6.5.1 +Version: 6.5.2 Summary: A web-based notebook environment for interactive computing Home-page: http://jupyter.org Author: Jupyter Development Team diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook-6.5.1/docs/environment.yml new/notebook-6.5.2/docs/environment.yml --- old/notebook-6.5.1/docs/environment.yml 2022-10-13 15:58:46.567693700 +0200 +++ new/notebook-6.5.2/docs/environment.yml 2022-10-30 07:43:50.931678800 +0100 @@ -13,7 +13,7 @@ - sphinx - terminado - myst-parser -- nbclassic==0.4.5 +- nbclassic>=0.4.7 - pip: - nbsphinx - Send2Trash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook-6.5.1/notebook/_version.py new/notebook-6.5.2/notebook/_version.py --- old/notebook-6.5.1/notebook/_version.py 2022-10-13 15:59:12.908018000 +0200 +++ new/notebook-6.5.2/notebook/_version.py 2022-10-30 07:44:20.949666500 +0100 @@ -5,7 +5,7 @@ import re # Version string must appear intact for tbump versioning -__version__ = '6.5.1' +__version__ = '6.5.2' # Build up version_info tuple for backwards compatibility pattern = r'(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook-6.5.1/notebook/templates/page.html new/notebook-6.5.2/notebook/templates/page.html --- old/notebook-6.5.1/notebook/templates/page.html 2022-10-13 15:58:46.607694100 +0200 +++ new/notebook-6.5.2/notebook/templates/page.html 2022-10-30 07:43:50.979682000 +0100 @@ -7,7 +7,7 @@ <title>{% block title %}Jupyter Notebook{% endblock %}</title> {% block favicon %}<link id="favicon" rel="shortcut icon" type="image/x-icon" href="{{static_url("base/images/favicon.ico") }}">{% endblock %} <meta http-equiv="X-UA-Compatible" content="IE=edge" /> - <link rel="stylesheet" href="{{static_url("components/jquery-ui/themes/smoothness/jquery-ui.min.css") }}" type="text/css" /> + <link rel="stylesheet" href="{{static_url("components/jquery-ui/dist/themes/smoothness/jquery-ui.min.css") }}" type="text/css" /> <link rel="stylesheet" href="{{static_url("components/jquery-typeahead/dist/jquery.typeahead.min.css") }}" type="text/css" /> <meta name="viewport" content="width=device-width, initial-scale=1.0"> @@ -39,7 +39,7 @@ text: 'components/requirejs-text/text', bootstrap: 'components/bootstrap/dist/js/bootstrap.min', bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min', - 'jquery-ui': 'components/jquery-ui/jquery-ui.min', + 'jquery-ui': 'components/jquery-ui/dist/jquery-ui.min', moment: 'components/moment/min/moment-with-locales', codemirror: 'components/codemirror', termjs: 'components/xterm.js/xterm', @@ -97,6 +97,18 @@ return {}; } }) + + // error-catching custom-preload.js shim. + define("custom-preload", function (require, exports, module) { + try { + var custom = require('custom/custom-preload'); + console.debug('loaded custom-preload.js'); + return custom; + } catch (e) { + console.error("error loading custom-preload.js", e); + return {}; + } + }) document.nbjs_translations = {{ nbjs_translations|safe }}; document.documentElement.lang = navigator.language.toLowerCase(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook-6.5.1/pyproject.toml new/notebook-6.5.2/pyproject.toml --- old/notebook-6.5.1/pyproject.toml 2022-10-13 15:59:12.908018000 +0200 +++ new/notebook-6.5.2/pyproject.toml 2022-10-30 07:44:20.949666500 +0100 @@ -16,7 +16,7 @@ ignore-glob = ["docs/source/examples/Notebook/Working With Markdown Cells.ipynb", "docs-translations/**/README.md", "docs/source/contributing.rst", "docs/source/examples/Notebook/JavaScript Notebook Extensions.ipynb", "CHANGELOG.md", "notebook/static/components/**/*.*"] [tool.tbump.version] -current = "6.5.1" +current = "6.5.2" regex = ''' (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+) ((?P<channel>a|b|rc|.dev)(?P<release>\d+))? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook-6.5.1/setup.py new/notebook-6.5.2/setup.py --- old/notebook-6.5.1/setup.py 2022-10-13 15:58:46.611694300 +0200 +++ new/notebook-6.5.2/setup.py 2022-10-30 07:43:50.983682400 +0100 @@ -122,7 +122,7 @@ 'Send2Trash>=1.8.0', 'terminado>=0.8.3', 'prometheus_client', - 'nbclassic==0.4.5', + 'nbclassic>=0.4.7', ], extras_require = { 'test': ['pytest', 'coverage', 'requests', 'testpath', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notebook-6.5.1/tools/build-main.js new/notebook-6.5.2/tools/build-main.js --- old/notebook-6.5.1/tools/build-main.js 2022-10-13 15:58:46.611694300 +0200 +++ new/notebook-6.5.2/tools/build-main.js 2022-10-30 07:43:50.983682400 +0100 @@ -60,6 +60,7 @@ exclude: [ "custom/custom", + "custom/custom-preload", ] };

1 0

commit python-nbconvert for openSUSE:Factory
by Source-Sync 27 Dec '22

27 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-nbconvert for openSUSE:Factory checked in at 2022-12-27 11:54:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-nbconvert (Old) and /work/SRC/openSUSE:Factory/.python-nbconvert.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-nbconvert" Tue Dec 27 11:54:57 2022 rev:17 rq:1045434 version:7.2.7 Changes: -------- --- /work/SRC/openSUSE:Factory/python-nbconvert/python-nbconvert.changes 2022-10-26 14:25:50.752279558 +0200 +++ /work/SRC/openSUSE:Factory/.python-nbconvert.new.1563/python-nbconvert.changes 2022-12-27 11:55:06.779331619 +0100 @@ -1,0 +2,15 @@ +Mon Dec 26 23:06:15 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to 7.2.7 + * Fix Hanging Tests on Linux #1924 (@blink1073) +- Release 7.2.6 + * Include all templates in sdist #1916 (@blink1073) +- Release 7.2.5 + * Fix for webpdf print margins #1907 (@JWock82) +- Release 7.2.4 + * Handle jupyter core warning #1905 (@blink1073) + * Add Py-typed marker. #1898 (@Carreau) +- Release 7.2.3 + * clean_html: allow SVG tags and SVG attributes #1890 (@akx) + +------------------------------------------------------------------- Old: ---- nbconvert-7.2.2.tar.gz style.min.css New: ---- nbconvert-7.2.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-nbconvert.spec ++++++ --- /var/tmp/diff_new_pack.sEaexh/_old 2022-12-27 11:55:07.735336936 +0100 +++ /var/tmp/diff_new_pack.sEaexh/_new 2022-12-27 11:55:07.739336959 +0100 @@ -31,15 +31,12 @@ %endif Name: python-nbconvert%{psuffix} -Version: 7.2.2 +Version: 7.2.7 Release: 0 Summary: Conversion of Jupyter Notebooks License: BSD-3-Clause AND MIT URL: https://github.com/jupyter/nbconvert Source0: https://files.pythonhosted.org/packages/source/n/nbconvert/nbconvert-%{vers… -# See hatch_build.py -# License10: MIT -Source10: https://cdn.jupyter.org/notebook/5.4.0/style/style.min.css BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module hatchling >= 0.25} BuildRequires: %{python_module pip} @@ -98,7 +95,6 @@ Summary: Conversion of Jupyter Notebooks Requires: jupyter-ipykernel Requires: jupyter-jupyter-core -Requires: jupyter-nbformat >= 4.4 Requires: python3-nbconvert = %{version} Conflicts: python3-jupyter_nbconvert < 5.5.0 @@ -132,8 +128,6 @@ sed -i -e '/^#!\//, 1d' $f chmod -x $f done -mkdir share/templates/classic/static -cp %{SOURCE10} share/templates/classic/static/style.css sed -i '/addopts/ s/--color=yes//' pyproject.toml %build @@ -153,14 +147,11 @@ %if %{with test} %check export LANG=en_US.UTF-8 -# not test_webpdf: no pyppeteer, not even offline -donttest="test_webpdf" +export PYTHONDONTWRITEBYTECODE=1 # requires modules not installed: https://github.com/jupyter/nbconvert/issues/1846 -donttest="$donttest or test_convert_full_qualified_name or test_post_processor" -# nbformat error -donttest="$donttest or test_empty_code_cell" +donttest="test_convert_full_qualified_name or test_post_processor" %{python_expand # installed package in :test flavor -$python -B -m ipykernel.kernelspec --user +$python -m ipykernel.kernelspec --user pytest-%{$python_bin_suffix} -v -m 'not network' -k "not ($donttest)" --pyargs nbconvert } %endif ++++++ nbconvert-7.2.2.tar.gz -> nbconvert-7.2.7.tar.gz ++++++ ++++ 16086 lines of diff (skipped)

1 0

commit python-metakernel for openSUSE:Factory
by Source-Sync 27 Dec '22

27 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-metakernel for openSUSE:Factory checked in at 2022-12-27 11:54:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-metakernel (Old) and /work/SRC/openSUSE:Factory/.python-metakernel.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-metakernel" Tue Dec 27 11:54:57 2022 rev:14 rq:1045430 version:0.29.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-metakernel/python-metakernel.changes 2022-08-12 16:06:36.419463384 +0200 +++ /work/SRC/openSUSE:Factory/.python-metakernel.new.1563/python-metakernel.changes 2022-12-27 11:55:05.559324834 +0100 @@ -1,0 +2,10 @@ +Mon Dec 26 22:29:07 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to v0.29.4 + * Add back magics tests #261 (@ellert) + * Update tests for widgets 8 #260 (@blink1073) +- Release v0.29.3 + * Maintenance cleanup #257 (@blink1073) + * Use hatch for example projects #256 (@blink1073) + +------------------------------------------------------------------- Old: ---- metakernel-0.29.2.tar.gz New: ---- metakernel-0.29.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-metakernel.spec ++++++ --- /var/tmp/diff_new_pack.kYF3Wp/_old 2022-12-27 11:55:06.559330396 +0100 +++ /var/tmp/diff_new_pack.kYF3Wp/_new 2022-12-27 11:55:06.563330418 +0100 @@ -17,7 +17,7 @@ Name: python-metakernel -Version: 0.29.2 +Version: 0.29.4 Release: 0 Summary: Metakernel for Jupyter License: BSD-3-Clause @@ -60,15 +60,15 @@ %setup -q -n metakernel-%{version} touch ~/.bashrc sed -i s'/--color=yes//' pyproject.toml +chmod -x metakernel/tests/test_process_metakernel.py +sed -i '1{/env python/d}' metakernel/tests/test_expect.py %build %pyproject_wheel %install %pyproject_install -%{python_expand rm -r %{buildroot}%{$python_sitelib}/metakernel/tests/ -%fdupes %{buildroot}%{$python_sitelib} -} +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check %pytest metakernel/tests ++++++ metakernel-0.29.2.tar.gz -> metakernel-0.29.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metakernel-0.29.2/.github/dependabot.yml new/metakernel-0.29.4/.github/dependabot.yml --- old/metakernel-0.29.2/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/metakernel-0.29.4/.github/dependabot.yml 2020-02-02 01:00:00.000000000 +0100 @@ -0,0 +1,8 @@ +version: 2 +updates: + # Set update schedule for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every weekday + interval: "weekly" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metakernel-0.29.2/.github/workflows/check-release.yml new/metakernel-0.29.4/.github/workflows/check-release.yml --- old/metakernel-0.29.2/.github/workflows/check-release.yml 2020-02-02 01:00:00.000000000 +0100 +++ new/metakernel-0.29.4/.github/workflows/check-release.yml 2020-02-02 01:00:00.000000000 +0100 @@ -11,23 +11,15 @@ jobs: check_release: runs-on: ubuntu-latest - strategy: - matrix: - group: [check_release, link_check] - fail-fast: false steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - name: Install Dependencies run: | pip install -e . - name: Check Release - if: ${{ matrix.group == 'check_release' }} - uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1 + uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2 with: token: ${{ secrets.GITHUB_TOKEN }} - - name: Run Link Check - if: ${{ matrix.group == 'link_check' }} - uses: jupyter-server/jupyter_releaser/.github/actions/check-links@v1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metakernel-0.29.2/.github/workflows/tests.yml new/metakernel-0.29.4/.github/workflows/tests.yml --- old/metakernel-0.29.2/.github/workflows/tests.yml 2020-02-02 01:00:00.000000000 +0100 +++ new/metakernel-0.29.4/.github/workflows/tests.yml 2020-02-02 01:00:00.000000000 +0100 @@ -21,14 +21,14 @@ fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.7, 3.8, 3.9, "3.10"] + python-version: [3.7, 3.8, 3.9, "3.10", "3.11"] env: OS: ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 @@ -49,7 +49,7 @@ timeout-minutes: 20 runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 with: @@ -66,17 +66,9 @@ runs-on: ubuntu-latest timeout-minutes: 20 steps: - - uses: actions/checkout@v2 - - name: Base Setup - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - - name: Build SDist - run: | - pip install build - python -m build --sdist - - uses: actions/upload-artifact@v2 - with: - name: "sdist" - path: dist/*.tar.gz + - uses: actions/checkout@v3 + - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - uses: jupyterlab/maintainer-tools/.github/actions/make-sdist@v1 test_sdist: runs-on: ubuntu-latest @@ -84,19 +76,14 @@ name: Install from SDist and Test timeout-minutes: 20 steps: - - name: Base Setup - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - - name: Download sdist - uses: actions/download-artifact@v2 - - name: Install From SDist - run: | - set -ex - cd sdist - mkdir test - tar --strip-components=1 -zxvf *.tar.gz -C ./test - cd test - make install - - name: Run Test - run: | - cd sdist/test - make test + - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - uses: jupyterlab/maintainer-tools/.github/actions/test-sdist@v1 + + link_check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1 + with: + ignore_links: "http://some/file/from/* http://path/to/some/*" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metakernel-0.29.2/CHANGELOG.md new/metakernel-0.29.4/CHANGELOG.md --- old/metakernel-0.29.2/CHANGELOG.md 2020-02-02 01:00:00.000000000 +0100 +++ new/metakernel-0.29.4/CHANGELOG.md 2020-02-02 01:00:00.000000000 +0100 @@ -2,6 +2,39 @@  +## 0.29.4 + +([Full Changelog](https://github.com/Calysto/metakernel/compare/v0.29.3...5ec51d68…) + +### Maintenance and upkeep improvements + +- Add back magics tests [#261](https://github.com/Calysto/metakernel/pull/261) ([@ellert](https://github.com/ellert)) +- Update tests for widgets 8 [#260](https://github.com/Calysto/metakernel/pull/260) ([@blink1073](https://github.com/blink1073)) + +### Contributors to this release + +([GitHub contributors page for this release](https://github.com/Calysto/metakernel/graphs/contributors?from=202…) + +[@blink1073](https://github.com/search?q=repo%3ACalysto%2Fmetakernel+involves%3Ablink1073+updated%3A2022-12-01..2022-12-12&type=Issues) | [@ellert](https://github.com/search?q=repo%3ACalysto%2Fmetakernel+involves%3Aellert+updated%3A2022-12-01..2022-12-12&type=Issues) + + + +## 0.29.3 + +([Full Changelog](https://github.com/Calysto/metakernel/compare/v0.29.2...758c19d0…) + +### Maintenance and upkeep improvements + +- Bump actions/checkout from 2 to 3 [#258](https://github.com/Calysto/metakernel/pull/258) ([@dependabot](https://github.com/dependabot)) +- Maintenance cleanup [#257](https://github.com/Calysto/metakernel/pull/257) ([@blink1073](https://github.com/blink1073)) +- Use hatch for example projects [#256](https://github.com/Calysto/metakernel/pull/256) ([@blink1073](https://github.com/blink1073)) + +### Contributors to this release + +([GitHub contributors page for this release](https://github.com/Calysto/metakernel/graphs/contributors?from=202…) + +[@blink1073](https://github.com/search?q=repo%3ACalysto%2Fmetakernel+involves%3Ablink1073+updated%3A2022-08-08..2022-12-01&type=Issues) | [@dependabot](https://github.com/search?q=repo%3ACalysto%2Fmetakernel+involves%3Adependabot+updated%3A2022-08-08..2022-12-01&type=Issues) + ## 0.29.2 ([Full Changelog](https://github.com/Calysto/metakernel/compare/v0.29.1...dbe3fc91…) @@ -20,8 +53,6 @@ [@blink1073](https://github.com/search?q=repo%3ACalysto%2Fmetakernel+involves%3Ablink1073+updated%3A2022-08-01..2022-08-08&type=Issues) | [@ellert](https://github.com/search?q=repo%3ACalysto%2Fmetakernel+involves%3Aellert+updated%3A2022-08-01..2022-08-08&type=Issues) - - ## 0.29.1 ([Full Changelog](https://github.com/Calysto/metakernel/compare/v0.29.0...68b0da7a…) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metakernel-0.29.2/Makefile new/metakernel-0.29.4/Makefile --- old/metakernel-0.29.2/Makefile 2020-02-02 01:00:00.000000000 +0100 +++ new/metakernel-0.29.4/Makefile 2020-02-02 01:00:00.000000000 +0100 @@ -17,15 +17,7 @@ test: clean ipcluster start -n=3 & - python -m pytest || python -m pytest --lf - ipcluster stop - python metakernel_python/test_metakernel_python.py - make clean - -test_warn: clean - ipcluster start -n=3 & - export PYTHONWARNINGS="all" - python -m pytest || python -m pytest --lf + python -m pytest -W default || python -m pytest -W default --lf ipcluster stop python metakernel_python/test_metakernel_python.py make clean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metakernel-0.29.2/PKG-INFO new/metakernel-0.29.4/PKG-INFO --- old/metakernel-0.29.2/PKG-INFO 2020-02-02 01:00:00.000000000 +0100 +++ new/metakernel-0.29.4/PKG-INFO 2020-02-02 01:00:00.000000000 +0100 @@ -1,8 +1,9 @@ Metadata-Version: 2.1 Name: metakernel -Version: 0.29.2 +Version: 0.29.4 Project-URL: Homepage, https://github.com/Calysto/metakernel Author-email: Metakernel Developers <steven.silvester(a)ieee.org> +License-File: LICENSE.txt Classifier: Framework :: IPython Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: BSD License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metakernel-0.29.2/conftest.py new/metakernel-0.29.4/conftest.py --- old/metakernel-0.29.2/conftest.py 1970-01-01 01:00:00.000000000 +0100 +++ new/metakernel-0.29.4/conftest.py 2020-02-02 01:00:00.000000000 +0100 @@ -0,0 +1,2 @@ +import os +os.environ['JUPYTER_PLATFORM_DIRS'] = '1' \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metakernel-0.29.2/metakernel/__init__.py new/metakernel-0.29.4/metakernel/__init__.py --- old/metakernel-0.29.2/metakernel/__init__.py 2020-02-02 01:00:00.000000000 +0100 +++ new/metakernel-0.29.4/metakernel/__init__.py 2020-02-02 01:00:00.000000000 +0100 @@ -10,4 +10,4 @@ __all__ = ['Magic', 'MetaKernel', 'option'] -__version__ = '0.29.2' +__version__ = '0.29.4' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metakernel-0.29.2/metakernel/magics/tests/test_parallel_magic.py new/metakernel-0.29.4/metakernel/magics/tests/test_parallel_magic.py --- old/metakernel-0.29.2/metakernel/magics/tests/test_parallel_magic.py 2020-02-02 01:00:00.000000000 +0100 +++ new/metakernel-0.29.4/metakernel/magics/tests/test_parallel_magic.py 2020-02-02 01:00:00.000000000 +0100 @@ -2,7 +2,14 @@ from metakernel.tests.utils import get_kernel, get_log_text, EvalKernel import os import time +import pytest +try: + import ipyparallel +except ImportError: + ipyparallel = None + +(a)pytest.mark.skipif(ipyparallel is None, reason="Requires ipyparallel") def test_parallel_magic(): kernel = get_kernel(EvalKernel) # start up an EvalKernel on each node: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metakernel-0.29.2/metakernel_echo/pyproject.toml new/metakernel-0.29.4/metakernel_echo/pyproject.toml --- old/metakernel-0.29.2/metakernel_echo/pyproject.toml 2020-02-02 01:00:00.000000000 +0100 +++ new/metakernel-0.29.4/metakernel_echo/pyproject.toml 2020-02-02 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ [build-system] -requires = ["flit_core >=3.2,<4"] -build-backend = "flit_core.buildapi" +requires = ["hatchling >=1.5"] +build-backend = "hatchling.build" [project] name = "metakernel_echo" @@ -21,3 +21,6 @@ [project.urls] Homepage = "https://github.com/calysto/metakernel/tree/main/metakernel_echo" + +[tool.hatch.version] +path = "metakernel_echo.py" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metakernel-0.29.2/metakernel_python/pyproject.toml new/metakernel-0.29.4/metakernel_python/pyproject.toml --- old/metakernel-0.29.2/metakernel_python/pyproject.toml 2020-02-02 01:00:00.000000000 +0100 +++ new/metakernel-0.29.4/metakernel_python/pyproject.toml 2020-02-02 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ [build-system] -requires = ["flit_core >=3.2,<4"] -build-backend = "flit_core.buildapi" +requires = ["hatchling >= 1.5"] +build-backend = "hatchling.build" [project] name = "metakernel_python" @@ -21,3 +21,6 @@ [project.urls] Homepage = "https://github.com/calysto/metakernel/tree/main/metakernel_python" + +[tool.hatch.version] +path = "metakernel_python.py" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metakernel-0.29.2/pyproject.toml new/metakernel-0.29.4/pyproject.toml --- old/metakernel-0.29.2/pyproject.toml 2020-02-02 01:00:00.000000000 +0100 +++ new/metakernel-0.29.4/pyproject.toml 2020-02-02 01:00:00.000000000 +0100 @@ -46,43 +46,17 @@ "examples", ] -[tool.jupyter-releaser] -skip = ["check-links"] - -[tool.jupyter-releaser.options] -ignore-links = ["http://some/file/from/*", "http://path/to/some/*"] - -[tool.tbump.version] -current = "0.29.2" -regex = ''' - (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+) - ((?P<channel>a|b|rc|.dev)(?P<release>\d+))? -''' - -[tool.tbump.git] -message_template = "Bump to {new_version}" -tag_template = "v{new_version}" - -[[tool.tbump.file]] -src = "metakernel/__init__.py" - [tool.pytest.ini_options] addopts= "-raXs --durations 10 --color=yes --doctest-modules" -norecursedirs = [ - "images", - "metakernel_python", - "metakernel_echo", - "docs" -] +testpaths = ["metakernel/tests", "metakernel/magics/tests"] timeout = 300 # Restore this setting to debug failures # timeout_method = "thread" filterwarnings= [ # Fail on warnings "error", - "ignore:the imp module is deprecated:DeprecationWarning:ipykernel", - "ignore:The distutils package is deprecated:DeprecationWarning:ipykernel", - "ignore:distutils Version classes:DeprecationWarning:ipyparallel", "ignore:unclosed event loop:ResourceWarning", - "ignore:There is no current event loop:DeprecationWarning" + "ignore:There is no current event loop:DeprecationWarning", + # When we run ipcluster and then run the tests we get this warning + "ignore:Widget.* is deprecated:DeprecationWarning", ]

1 0

commit python-nbformat for openSUSE:Factory
by Source-Sync 27 Dec '22

27 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-nbformat for openSUSE:Factory checked in at 2022-12-27 11:54:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-nbformat (Old) and /work/SRC/openSUSE:Factory/.python-nbformat.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-nbformat" Tue Dec 27 11:54:55 2022 rev:15 rq:1045428 version:5.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-nbformat/python-nbformat.changes 2022-10-22 14:14:03.800876820 +0200 +++ /work/SRC/openSUSE:Factory/.python-nbformat.new.1563/python-nbformat.changes 2022-12-27 11:55:03.567313754 +0100 @@ -1,0 +2,9 @@ +Mon Dec 26 22:15:25 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to 5.7.1 + * Expose more attributes for typing #337 (@blink1073) + * Use base setup dependency type #329 (@blink1073) + * Handle warning from jupyter client #322 (@blink1073) +- Remove empty jupyter-nbformat package + +------------------------------------------------------------------- Old: ---- nbformat-5.7.0.tar.gz New: ---- nbformat-5.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-nbformat.spec ++++++ --- /var/tmp/diff_new_pack.MlqE0i/_old 2022-12-27 11:55:04.887321095 +0100 +++ /var/tmp/diff_new_pack.MlqE0i/_new 2022-12-27 11:55:04.891321118 +0100 @@ -16,32 +16,27 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define doc_ver 5.2.0 %bcond_without libalternatives Name: python-nbformat -Version: 5.7.0 +Version: 5.7.1 Release: 0 Summary: The Jupyter Notebook format License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/jupyter/nbformat -# PyPI sdist has only some schema tests, get the full test suite from GitHub sources -Source: https://github.com/jupyter/nbformat/archive/%{version}.tar.gz#/nbformat-%{v… +Source: https://github.com/jupyter/nbformat/releases/download/v%{version}/nbformat-… BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module hatch_nodejs_version} BuildRequires: %{python_module hatchling >= 1.5} BuildRequires: %{python_module pip} -BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: nodejs BuildRequires: python-rpm-macros >= 20210929 -Requires: jupyter-nbformat = %{version} Requires: python-fastjsonschema Requires: python-jsonschema > 2.6 Requires: python-jupyter_core Requires: python-traitlets >= 5.1 -Provides: python-jupyter_nbformat = %{version} +Provides: python-jupyter_nbformat = %{version}-%{release} Obsoletes: python-jupyter_nbformat < %{version} BuildArch: noarch %if %{with libalternatives} @@ -69,21 +64,6 @@ This package provides the python interface. -%package -n jupyter-nbformat -Summary: The Jupyter Notebook format -Group: Development/Languages/Python -Requires: jupyter-jupyter_core -Requires: python3-nbformat = %{version} -Conflicts: python3-jupyter_nbformat < 5.0 -Provides: jupyter-nbformat-doc = %{version} -Obsoletes: jupyter-nbformat-doc < %{version} - -%description -n jupyter-nbformat -This package contains the base implementation of the Jupyter Notebook format, -and Python APIs for working with notebooks. - -This package provides the jupyter components. - %prep %setup -q -n nbformat-%{version} sed -i 's/--color=yes//' pyproject.toml @@ -118,7 +98,4 @@ %{python_sitelib}/nbformat/ %{python_sitelib}/nbformat-%{version}.dist-info/ -%files -n jupyter-nbformat -%license COPYING.md - %changelog ++++++ nbformat-5.7.0.tar.gz -> nbformat-5.7.1.tar.gz ++++++ ++++ 2061 lines of diff (skipped)

1 0