openSUSE Commits
Threads by month
- ----- 2024 -----
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
June 2017
- 1 participants
- 2052 discussions
Hello community,
here is the log from the commit of package nvme-cli for openSUSE:Factory checked in at 2017-06-26 15:56:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nvme-cli (Old)
and /work/SRC/openSUSE:Factory/.nvme-cli.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nvme-cli"
Mon Jun 26 15:56:56 2017 rev:15 rq:506236 version:1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/nvme-cli/nvme-cli.changes 2017-06-20 09:39:38.450450936 +0200
+++ /work/SRC/openSUSE:Factory/.nvme-cli.new/nvme-cli.changes 2017-06-26 15:56:59.611639203 +0200
@@ -1,0 +2,11 @@
+Mon Jun 26 08:31:50 UTC 2017 - jthumshirn(a)suse.com
+
+- Create nvme files and directories in /etc/nvme (bsc#1045931 )
+
+-------------------------------------------------------------------
+Mon Jun 26 08:25:16 UTC 2017 - jthumshirn(a)suse.com
+
+- Provide nvme ns-descs subcommand (bsc#1038235)
+ + 0005-nvme-cli-add-ns-descs-subcommand.patch
+
+-------------------------------------------------------------------
New:
----
0005-nvme-cli-add-ns-descs-subcommand.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nvme-cli.spec ++++++
--- /var/tmp/diff_new_pack.qVYF8x/_old 2017-06-26 15:57:00.215554029 +0200
+++ /var/tmp/diff_new_pack.qVYF8x/_new 2017-06-26 15:57:00.219553465 +0200
@@ -25,6 +25,7 @@
Url: https://github.com/linux-nvme/nvme-cli
Source: %{name}-v%{version}.tar.gz
BuildRequires: asciidoc
+BuildRequires: libuuid-devel
BuildRequires: xmlto
BuildRequires: pkgconfig(libudev)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -33,6 +34,7 @@
Patch2: add-missing-nvme_id_crtl-fileds.patch
Patch3: 0003-nvme-cli-show-more-fields-for-id-ctrl.patch
Patch4: 0004-nvme-cli-id-ctrl-display-additional-fields.patch
+Patch5: 0005-nvme-cli-add-ns-descs-subcommand.patch
%description
NVMe is a fast, scalable, direct attached storage interface. The nvme
@@ -45,6 +47,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
echo %{version} > version
@@ -52,8 +55,14 @@
%install
make PREFIX=%{_prefix} DESTDIR=%{buildroot} install-bin install-man %{?_smp_mflags}
+install -m 644 -D /dev/null %{buildroot}%{_sysconfdir}/nvme/hostnqn
install -m 644 -D completions/bash-nvme-completion.sh %{buildroot}%{_sysconfdir}/bash_completion.d/nvme
+%post
+if [ ! -e %{_sysconfdir}/nvme/hostnqn ]; then
+ %{_sbindir}/nvme gen-hostnqn > %{_sysconfdir}/nvme/hostnqn
+fi
+
%files
%defattr(-,root,root)
%doc README.md LICENSE
@@ -61,5 +70,7 @@
%{_mandir}/man1/nvme*.1*
%dir %{_sysconfdir}/bash_completion.d/
%{_sysconfdir}/bash_completion.d/nvme
+%dir %{_sysconfdir}/nvme/
+%ghost %{_sysconfdir}/nvme/hostnqn
%changelog
++++++ 0005-nvme-cli-add-ns-descs-subcommand.patch ++++++
>From 84937e83e86e11328c8931abc60f7655fae44823 Mon Sep 17 00:00:00 2001
From: Johannes Thumshirn <jthumshirn(a)suse.de>
Date: Fri, 23 Jun 2017 09:36:35 +0200
Subject: nvme-cli: add ns-descs subcommand
Git-commit: 84937e83e86e11328c8931abc60f7655fae44823
Patch-mainline: v1.4
References: bsc#1038235
NVMe 1.3 defines the "Namespace Identification Descriptor" command in
NVMe Identify NS. This command returns a list of so called Namespace
Identificastion Descriptors which currently can either be a EUI-64,
a NGUID or a UUID.
Signed-off-by: Johannes Thumshirn <jthumshirn(a)suse.de>
Signed-off-by: Keith Busch <keith.busch(a)intel.com>
---
linux/nvme.h | 14 +++++++
nvme-builtin.h | 1 +
nvme-ioctl.c | 6 +++
nvme-ioctl.h | 1 +
nvme-print.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
nvme-print.h | 2 +
nvme.c | 63 +++++++++++++++++++++++++++++
7 files changed, 209 insertions(+)
diff --git a/linux/nvme.h b/linux/nvme.h
index 08bf0b1..d1a322b 100644
--- a/linux/nvme.h
+++ b/linux/nvme.h
@@ -863,6 +863,20 @@ struct nvme_command {
};
};
+#define NVME_IDENTIFY_CMD_LEN 4096
+#define NVME_ID_CNS_NS_DESC_LIST 0x3
+enum {
+ NVME_NIDT_EUI64 = 0x1,
+ NVME_NIDT_NGUID = 0x2,
+ NVME_NIDT_UUID = 0x3,
+};
+
+struct nvme_ns_id_desc {
+ __u8 nidt;
+ __u8 nidl;
+ __u16 reserved;
+};
+
static inline bool nvme_is_write(struct nvme_command *cmd)
{
/*
diff --git a/nvme-builtin.h b/nvme-builtin.h
index 087fc19..91f361d 100644
--- a/nvme-builtin.h
+++ b/nvme-builtin.h
@@ -11,6 +11,7 @@ COMMAND_LIST(
ENTRY("id-ctrl", "Send NVMe Identify Controller", id_ctrl)
ENTRY("id-ns", "Send NVMe Identify Namespace, display structure", id_ns)
ENTRY("list-ns", "Send NVMe Identify List, display structure", list_ns)
+ ENTRY("ns-descs", "Send NVMe Namespace Descriptor List, display structure", ns_descs)
ENTRY("create-ns", "Creates a namespace with the provided parameters", create_ns)
ENTRY("delete-ns", "Deletes a namespace from the controller", delete_ns)
ENTRY("attach-ns", "Attaches a namespace to requested controller(s)", attach_ns)
diff --git a/nvme-ioctl.c b/nvme-ioctl.c
index a22399a..e3e9af4 100644
--- a/nvme-ioctl.c
+++ b/nvme-ioctl.c
@@ -364,6 +364,12 @@ int nvme_identify_ctrl_list(int fd, __u32 nsid, __u16 cntid, void *data)
return nvme_identify(fd, nsid, (cntid << 16) | cns, data);
}
+int nvme_identify_ns_descs(int fd, __u32 nsid, void *data)
+{
+
+ return nvme_identify(fd, nsid, NVME_ID_CNS_CTRL_LIST, data);
+}
+
int nvme_get_log(int fd, __u32 nsid, __u8 log_id, __u32 data_len, void *data)
{
struct nvme_admin_cmd cmd = {
diff --git a/nvme-ioctl.h b/nvme-ioctl.h
index 3beddf8..8faf345 100644
--- a/nvme-ioctl.h
+++ b/nvme-ioctl.h
@@ -77,6 +77,7 @@ int nvme_identify_ctrl(int fd, void *data);
int nvme_identify_ns(int fd, __u32 nsid, bool present, void *data);
int nvme_identify_ns_list(int fd, __u32 nsid, bool all, void *data);
int nvme_identify_ctrl_list(int fd, __u32 nsid, __u16 cntid, void *data);
+int nvme_identify_ns_descs(int fd, __u32 nsid, void *data);
int nvme_get_log(int fd, __u32 nsid, __u8 log_id, __u32 data_len, void *data);
int nvme_fw_log(int fd, struct nvme_firmware_log_page *fw_log);
diff --git a/nvme-print.c b/nvme-print.c
index 2da5acd..f0f7121 100644
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -3,6 +3,10 @@
#include <string.h>
#include <stdlib.h>
+#ifdef LIBUUID
+#include <uuid/uuid.h>
+#endif
+
#include "nvme-print.h"
#include "json.h"
#include "nvme-models.h"
@@ -599,6 +603,124 @@ void show_nvme_id_ns(struct nvme_id_ns *ns, unsigned int mode)
}
}
+void json_nvme_id_ns_descs(void *data)
+{
+#ifdef LIBUUID
+ uuid_t uuid;
+ char uuid_str[37];
+#endif
+ __u8 eui64_desc[8];
+ __u8 nguid_desc[16];
+ char nguid_str[2 * sizeof(nguid_desc) + 1];
+ char eui64_str[2 * sizeof(eui64_desc) + 1];
+ char *eui64 = eui64_str;
+ char *nguid = nguid_str;
+ struct json_object *root;
+ off_t off;
+ int pos, len = 0;
+ int i;
+
+ root = json_create_object();
+
+ for (pos = 0; pos < NVME_IDENTIFY_CMD_LEN; pos += len) {
+ struct nvme_ns_id_desc *cur = data + pos;
+
+ off = pos + sizeof(*cur);
+
+ if (cur->nidl == 0)
+ break;
+
+ switch (cur->nidt) {
+ case NVME_NIDT_EUI64:
+ memset(eui64, 0, sizeof(eui64_str));
+ memcpy(eui64_desc, data + off, sizeof(eui64_desc));
+ for (i = 0; i < sizeof(eui64); i++)
+ eui64 += sprintf(eui64, "%02x", eui64_desc[i]);
+ len += sizeof(eui64);
+ json_object_add_value_string(root, "eui64", eui64_str);
+ break;
+ case NVME_NIDT_NGUID:
+ memset(nguid, 0, sizeof(nguid_str));
+ memcpy(nguid_desc, data + off, sizeof(nguid_desc));
+ for (i = 0; i < sizeof(nguid); i++)
+ nguid += sprintf(nguid, "%02x", nguid_desc[i]);
+ len += sizeof(nguid);
+ json_object_add_value_string(root, "nguid", nguid_str);
+ break;
+#ifdef LIBUUID
+ case NVME_NIDT_UUID:
+ memcpy(uuid, data + off, 16);
+ uuid_unparse_lower(uuid, uuid_str);
+ len += sizeof(uuid);
+ json_object_add_value_string(root, "uuid", uuid_str);
+ break;
+#endif
+ default:
+ /* Skip unnkown types */
+ len = cur->nidl;
+ break;
+ }
+
+ len += sizeof(*cur);
+ }
+
+ json_print_object(root, NULL);
+ printf("\n");
+ json_free_object(root);
+}
+
+void show_nvme_id_ns_descs(void *data)
+{
+ int pos, len = 0;
+ int i;
+#ifdef LIBUUID
+ uuid_t uuid;
+ char uuid_str[37];
+#endif
+ __u8 eui64[8];
+ __u8 nguid[16];
+
+ for (pos = 0; pos < NVME_IDENTIFY_CMD_LEN; pos += len) {
+ struct nvme_ns_id_desc *cur = data + pos;
+
+ if (cur->nidl == 0)
+ break;
+
+ switch (cur->nidt) {
+ case NVME_NIDT_EUI64:
+ memcpy(eui64, data + pos + sizeof(*cur), sizeof(eui64));
+ printf("eui64 : ");
+ for (i = 0; i < 8; i++)
+ printf("%02x", eui64[i]);
+ printf("\n");
+ len += sizeof(eui64);
+ break;
+ case NVME_NIDT_NGUID:
+ memcpy(nguid, data + pos + sizeof(*cur), sizeof(nguid));
+ printf("nguid : ");
+ for (i = 0; i < 16; i++)
+ printf("%02x", nguid[i]);
+ printf("\n");
+ len += sizeof(nguid);
+ break;
+#ifdef LIBUUID
+ case NVME_NIDT_UUID:
+ memcpy(uuid, data + pos + sizeof(*cur), 16);
+ uuid_unparse_lower(uuid, uuid_str);
+ printf("uuid : %s\n", uuid_str);
+ len += sizeof(uuid);
+ break;
+#endif
+ default:
+ /* Skip unnkown types */
+ len = cur->nidl;
+ break;
+ }
+
+ len += sizeof(*cur);
+ }
+}
+
static void print_ps_power_and_scale(__le16 ctr_power, __u8 scale)
{
__u16 power = le16_to_cpu(ctr_power);
diff --git a/nvme-print.h b/nvme-print.h
index 0502d0d..d39bc63 100644
--- a/nvme-print.h
+++ b/nvme-print.h
@@ -26,6 +26,7 @@ void show_error_log(struct nvme_error_log_page *err_log, int entries, const char
void show_smart_log(struct nvme_smart_log *smart, unsigned int nsid, const char *devname);
void show_fw_log(struct nvme_firmware_log_page *fw_log, const char *devname);
void show_ctrl_registers(void *bar, unsigned int mode);
+void show_nvme_id_ns_descs(void *data);
void nvme_feature_show_fields(__u32 fid, unsigned int result, unsigned char *buf);
char *nvme_status_to_string(__u32 status);
@@ -39,6 +40,7 @@ void json_error_log(struct nvme_error_log_page *err_log, int entries, const char
void json_smart_log(struct nvme_smart_log *smart, unsigned int nsid, const char *devname);
void json_fw_log(struct nvme_firmware_log_page *fw_log, const char *devname);
void json_print_list_items(struct list_item *items, unsigned amnt);
+void json_nvme_id_ns_descs(void *data);
#endif
diff --git a/nvme.c b/nvme.c
index a4e1b71..a2d6e7d 100644
--- a/nvme.c
+++ b/nvme.c
@@ -952,6 +952,69 @@ static int id_ctrl(int argc, char **argv, struct command *cmd, struct plugin *pl
return __id_ctrl(argc, argv, cmd, plugin, NULL);
}
+static int ns_descs(int argc, char **argv, struct command *cmd, struct plugin *plugin)
+{
+ const char *desc = "Send Namespace Identification Descriptoprs commadn to the "\
+ "given device, returns the namespace identifcation descriptors "\
+ "of the specific namespace in either human-readable or binary format.";
+ const char *raw_binary = "show infos in binary format";
+ const char *namespace_id = "identifier of desired namespace";
+ int err, fmt, fd;
+ char *nsdescs[0x1000] = { };
+ struct config {
+ __u32 namespace_id;
+ int raw_binary;
+ char *output_format;
+ };
+
+ struct config cfg = {
+ .namespace_id = 0,
+ .output_format = "normal",
+ };
+
+ const struct argconfig_commandline_options command_line_options[] = {
+ {"namespace-id", 'n', "NUM", CFG_POSITIVE, &cfg.namespace_id, required_argument, namespace_id},
+ {"raw-binary", 'b', "", CFG_NONE, &cfg.raw_binary, no_argument, raw_binary},
+ {"output-format", 'o', "FMT", CFG_STRING, &cfg.output_format, required_argument, output_format },
+ {NULL}
+ };
+
+ if (posix_memalign((void *)&nsdescs, getpagesize(), 0x1000)) {
+ fprintf(stderr, "can not allocate controller list payload\n");
+ return ENOMEM;
+ }
+
+ fd = parse_and_open(argc, argv, desc, command_line_options, &cfg, sizeof(cfg));
+ if (fd < 0)
+ return fd;
+
+ fmt = validate_output_format(cfg.output_format);
+ if (fmt < 0)
+ return fmt;
+ if (cfg.raw_binary)
+ fmt = BINARY;
+ if (!cfg.namespace_id)
+ cfg.namespace_id = get_nsid(fd);
+
+ err = nvme_identify_ns_descs(fd, cfg.namespace_id, &nsdescs);
+ if (!err) {
+ if (fmt == BINARY)
+ d_raw((unsigned char *)&nsdescs, 0x1000);
+ else if (fmt == JSON)
+ json_nvme_id_ns_descs(&nsdescs);
+ else {
+ printf("NVME Namespace Identification Descriptors NS %d:\n", cfg.namespace_id);
+ show_nvme_id_ns_descs(&nsdescs);
+ }
+ }
+ else if (err > 0)
+ fprintf(stderr, "NVMe Status:%s(%x) NSID:%d\n",
+ nvme_status_to_string(err), err, cfg.namespace_id);
+ else
+ perror("identify namespace");
+ return err;
+}
+
static int id_ns(int argc, char **argv, struct command *cmd, struct plugin *plugin)
{
const char *desc = "Send an Identify Namespace command to the "\
1
0
Hello community,
here is the log from the commit of package python-Whoosh for openSUSE:Factory checked in at 2017-06-26 15:56:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Whoosh (Old)
and /work/SRC/openSUSE:Factory/.python-Whoosh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Whoosh"
Mon Jun 26 15:56:54 2017 rev:2 rq:506215 version:2.7.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Whoosh/python-Whoosh.changes 2015-04-27 22:09:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-Whoosh.new/python-Whoosh.changes 2017-06-26 15:56:55.552211728 +0200
@@ -1,0 +2,96 @@
+Mon Jun 26 09:07:38 UTC 2017 - tbechtold(a)suse.com
+
+- convert to singlespec
+- split -doc package
+- use files.pythonhosted.org as Source url
+- update to 2.7.4:
+ * Changed version number to 2.7.0.
+ * Added tag 2.7.0 for changeset 8abeb09483b9
+ * Results.extend() didn't update the cached length.
+ * Fixed VarBytesListColumn and FixedBytesListColumn.
+ * Handle an empty queue exception in mpwriter.
+ * Merging pull request with local commit.
+ * Added test for storing tuples.
+ * Remove caching decorator from VarBytesColumn reader.
+ * Added test for has_deletions() after an optimization.
+ * Try to avoid an UnboundLocalError in the DFA when MultiTerm.matcher() has
+ an empty string.
+ * Don't try to write a vector if the list of items is empty.
+ * Implemented use of score_fn argument to NestedParent.
+ * Don't cache query -> bitset, since this somehow prevents the Searcher from
+ being collected.
+ * Changed README docs link to point to readthedocs.org.
+ * Change uses of dump[s]() to always use protocol 2 instead of -1
+ ("use latest protocol") so indices created with Python 3.x are backwards
+ compatible.
+ * Fix the analyzer in test_vector_unicode() to not lowercase, since this
+ makes the test fail on some Python versions.
+ * Actually use the split_fn passed by the user. Not sure what happened here.
+ * Handle pickled Schema objects that don't have a _subfields attribute.
+ * Added fix and tests for calling expand_prefix() with unicode.
+ * Fix short code for Swedish in language aliases.
+ * Fix missing a consecutive token during highlighting
+ * Added estimate_size() methods to SpanNear2.
+ * Removed reference to "allfields" keyword argument.
+ * Added tests/english-words.10.gz to manifest so it's included in the distribution.
+ * Fix warnings in docs build.
+ * BufferedWriter should call close() instead of commit() when exiting a context.
+ * Reinstate fields.IDLIST's analyzer.
+ * Change the version of my fork to be distinct from the base repo.
+ * Backed out changeset 96255fc8ff17
+ * A typo in `whoosh.fields.KEYWORD` documentation
+ * Created new branch romanian-stemmer
+ * Skip ISO-8859-1 suffixes on Unicode strings
+ * Created new branch spanish-tokenizer
+ * Add sanity check for Spanish stemmer
+ * Fix sample highlight class
+ * Reorder the self._tempstorage.destroy() in SegmentWriter._finish to
+ before the lock is released
+ * IOError from rmdir is ok if the error was ENOENT
+ * Fix reporting of total count in FilterCollector, based on PR #63 by Jannon Frank.
+ * Added a test for pickling a schema with a stemming analyzer.
+ * Initial unfinished, massive checkin of next-gen architecture.
+ * Fix forward-compatibility issue for Python 3.x.
+ * Write offsets in VarBytesColumn when there are more than a certain number of rows.
+ * Replaced porter stemming algorithm implementation with one based on the one in NLTK.
+ * Add IDEA's .cache directory to hgignore.
+ * Add IDEA's .cache directory to hgignore.
+ * Remove docstring chickenscratch.
+ * Fix test accidentally left with assert False at the end.
+ * Removed accidentally committed debug prints.
+ * Bumped version number for bugfix release.
+ * Added tag 2.7.1 for changeset 1bd4b9792eed
+ * Merging Bitbucket and local heads.
+ * Bumped version number.
+ * Added tag 2.7.2 for changeset f6bf123ac708
+ * Fixed logic for checking if floats are all whole in encode_weights.
+ * Change posting storage so the data from individual posts can be pulled
+ out as raw bytes.
+ * Fixed error in CommaSeparatedTokenizer.
+ * Fixed import error.
+ * Minor changes.
+ * Updated VarBytesColumn to store offsets as well as lengths.
+ * Added context protocol to Index class. Store TOC file name in object.
+ * Switched to lighter-weight posting block format.
+ * Forgot to check in pfor.py.
+ * Reduced size of and references to whoosh.compat, in anticipation of
+ using 3to2 for most things.
+ * Remove (object) from class definitions, assuming 3to2 will take care of it.
+ * Fixed problems from compat refactoring.
+ * Fixed problem with calling leaf matcher methods on a MultiMatcher.
+ * Don't encode bytes in _kws_to_query.
+ * Removed typing annotations to prevent circular import.
+ * Cleaned up filename generation/checking, added GC step to saving TOC.
+ * Added header checks in terms and postings files.
+ * Cleaned up storage cleanup, call it in SegmentWriter.cancel().
+ * Added another except clause to catch TypeError, because that's what's raised
+ if you try to pickle a function.
+ * Fixed error that discarded vector metadata when merging segments.
+ * Added ability to specify an analyzer in KEYWORD field constructor.
+ * Bumped version number to 2.7.3.
+ * Added tag 2.7.3 for changeset f5a1508e93fd
+ * Added HyphenFilter to collapse hyphenated words into single tokens.
+ * Have OrGroup.factory() return a real class instead of a function.
+ * Bumped version number.
+
+-------------------------------------------------------------------
Old:
----
Whoosh-2.7.0.tar.gz
New:
----
Whoosh-2.7.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Whoosh.spec ++++++
--- /var/tmp/diff_new_pack.6fuQgj/_old 2017-06-26 15:56:56.524074660 +0200
+++ /var/tmp/diff_new_pack.6fuQgj/_new 2017-06-26 15:56:56.528074096 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-Whoosh
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,26 +16,33 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without test
Name: python-Whoosh
-Version: 2.7.0
+Version: 2.7.4
Release: 0
Url: http://www.turbogears.org
Summary: Fast, pure-Python full text indexing, search, and spell checking library
License: BSD-2-Clause
Group: Development/Languages/Python
-Source: http://pypi.python.org/packages/source/W/Whoosh/Whoosh-%{version}.tar.gz
+Source: https://files.pythonhosted.org/packages/source/W/Whoosh/Whoosh-%{version}.t…
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: python-Sphinx
-BuildRequires: python-devel
-BuildRequires: python-pytest
-BuildRequires: python-setuptools
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
-BuildArch: noarch
+BuildRequires: %{python_module Sphinx}
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module setuptools}
+BuildRequires: python-rpm-macros
+# SECTION the testing dependencies
+%if %{with test}
+BuildRequires: %{python_module pytest}
%endif
+# /SECTION
+BuildArch: noarch
+%ifpython2
Provides: python-whoosh = %{version}
Obsoletes: python-whoosh < %{version}
+%endif
+
+%python_subpackages
%description
Whoosh is a fast, pure-Python indexing and search library. Programmers can use
@@ -45,22 +52,41 @@
fast at indexing and searching. Every part of how Whoosh works can be extended
or replaced to meet your needs exactly.
+%package -n python-Whoosh-doc
+Summary: Documentation for %{name}
+Group: Documentation/Other
+Provides: %{python_module Whoosh-doc = %{version}}
+
+%description -n python-Whoosh-doc
+Whoosh is a fast, pure-Python indexing and search library. Programmers can use
+it to easily add search functionality to their applications and websites.
+Because Whoosh is pure Python, you don't have to compile or install a binary
+support library and/or make Python work with a JVM, yet Whoosh is still very
+fast at indexing and searching. Every part of how Whoosh works can be extended
+or replaced to meet your needs exactly.
+This package contains the documentation.
+
%prep
%setup -q -n Whoosh-%{version}
%build
-python setup.py build
+%python_build
sphinx-build -b html -d docs/build/doctrees docs/source docs/build/html
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%if %{with test}
%check
-python setup.py test
+%python_exec setup.py test
+%endif
-%files
+%files %{python_files}
%defattr(-,root,root,-)
-%doc LICENSE.txt README.txt docs/build/html
+%doc LICENSE.txt README.txt
%{python_sitelib}/*
+%files -n python-Whoosh-doc
+%doc LICENSE.txt docs/build/html
+
%changelog
++++++ Whoosh-2.7.0.tar.gz -> Whoosh-2.7.4.tar.gz ++++++
++++ 1671 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package cinnamon-screensaver for openSUSE:Factory checked in at 2017-06-26 15:56:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-screensaver (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-screensaver.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-screensaver"
Mon Jun 26 15:56:51 2017 rev:9 rq:506202 version:3.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/cinnamon-screensaver/cinnamon-screensaver.changes 2017-05-27 13:14:50.921332639 +0200
+++ /work/SRC/openSUSE:Factory/.cinnamon-screensaver.new/cinnamon-screensaver.changes 2017-06-26 15:56:52.728609957 +0200
@@ -1,0 +2,33 @@
+Mon Jun 26 08:54:15 UTC 2017 - sor.alexei(a)meowr.ru
+
+- Add the missing python3-xapp dependency (boo#1045920).
+
+-------------------------------------------------------------------
+Wed Jun 21 16:11:48 UTC 2017 - sor.alexei(a)meowr.ru
+
+- Update to version 3.4.1:
+ * stage.py: Kill any screensaver plugins when destroying all of
+ the widgets - this will leave unfinished plugin processes.
+ * framedImage: Render images at their native size using the theme
+ value as the maximum size, rather than desired size.
+ This ensures the image displays at its best possible size for
+ quality, but still makes sure an oversize image doesn't break
+ anything.
+ * stage.py: Don't re-allocate the floating widgets unless
+ necessary to prevent obscuring of the unlock widget.
+ This prevents the small jump of the clock when waking the
+ computer, depending on settings.
+ * framedImage: Remove some dead lines, use the correct css
+ property, update commenting.
+ * Fix a typo in the GTK+ 3.20 CSS file.
+ * clock: Update to use new wall-clock api to set the correct
+ update interval depending on the provided date/time format.
+ * Don't lock the screen in live or guest sessions
+ * framedImage.py: Stop using CSS for image size - since we now
+ use the image's native size if it is reasonable to do so,
+ there's no need for a theme to be involved.
+ Just hardcode a sane maximum and keep images that size or less.
+ It is not valid CSS (even though that's what we're using
+ min-height for here).
+
+-------------------------------------------------------------------
Old:
----
cinnamon-screensaver-3.4.0.tar.gz
New:
----
cinnamon-screensaver-3.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.FbwFw1/_old 2017-06-26 15:56:53.272533245 +0200
+++ /var/tmp/diff_new_pack.FbwFw1/_new 2017-06-26 15:56:53.276532680 +0200
@@ -17,7 +17,7 @@
Name: cinnamon-screensaver
-Version: 3.4.0
+Version: 3.4.1
Release: 0
Summary: Cinnamon screensaver and locker
License: GPL-2.0+
@@ -51,6 +51,7 @@
Requires: python3-gobject
Requires: python3-gobject-cairo
Requires: python3-setproctitle
+Requires: python3-xapp
Recommends: cinnamon-translations
Recommends: xscreensaver-data
Suggests: xscreensaver-data-extra
++++++ cinnamon-screensaver-3.4.0.tar.gz -> cinnamon-screensaver-3.4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-3.4.0/configure.ac new/cinnamon-screensaver-3.4.1/configure.ac
--- old/cinnamon-screensaver-3.4.0/configure.ac 2017-05-04 15:02:52.000000000 +0200
+++ new/cinnamon-screensaver-3.4.1/configure.ac 2017-06-20 15:40:52.000000000 +0200
@@ -2,7 +2,7 @@
AC_PREREQ(2.60)
AC_INIT([cinnamon-screensaver],
- [3.4.0],
+ [3.4.1],
[https://github.com/linuxmint/cinnamon-screensaver/issues])
PKG_PROG_PKG_CONFIG([0.26])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-3.4.0/debian/changelog new/cinnamon-screensaver-3.4.1/debian/changelog
--- old/cinnamon-screensaver-3.4.0/debian/changelog 2017-05-04 15:02:52.000000000 +0200
+++ new/cinnamon-screensaver-3.4.1/debian/changelog 2017-06-20 15:40:52.000000000 +0200
@@ -1,3 +1,24 @@
+cinnamon-screensaver (3.4.1) sonya; urgency=medium
+
+ [ Michael Webster ]
+ * stage.py: Kill any screensaver plugins when destroying all of the widgets - this will leave unfinished plugin processes.
+ * framedImage: render images at their native size using the theme value as the maximum size, rather than desired size. This ensures the image displays at its best possible size for quality, but still makes sure an oversize image doesn't break anything.
+ * stage.py: Don't re-allocate the floating widgets unless necessary to prevent obscuring of the unlock widget. This prevents the small jump of the clock when waking the computer, depending on settings.
+ * framedImage: Remove some dead lines, use the correct css property, update commenting.
+ * fix typo in 3.20 css file
+ * clock: Update to use new wall-clock api to set the correct update interval depending on the provided date/time format.
+
+ [ Clement Lefebvre ]
+ * Don't lock the screen in live or guest sessions
+
+ [ Michael Webster ]
+ * framedImage.py: Stop using CSS for image size - since we now use the image's native size if it is reasonable to do so, there's no need for a theme to be involved. Just hardcode a sane maximum and keep images that size or less. is not valid CSS (even though that's what we're using min-height for here)
+
+ [ leigh123linux ]
+ * remove old webkit2-3.0 support
+
+ -- Clement Lefebvre <root(a)linuxmint.com> Tue, 20 Jun 2017 15:39:58 +0200
+
cinnamon-screensaver (3.4.0) sonya; urgency=medium
[ leigh123linux ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-3.4.0/debian/control new/cinnamon-screensaver-3.4.1/debian/control
--- old/cinnamon-screensaver-3.4.0/debian/control 2017-05-04 15:02:52.000000000 +0200
+++ new/cinnamon-screensaver-3.4.1/debian/control 2017-06-20 15:40:52.000000000 +0200
@@ -30,6 +30,7 @@
python3-gi,
python3-gi-cairo,
python3-setproctitle,
+ python3-xapp (>= 1.0.1),
gir1.2-cinnamondesktop-3.0,
gir1.2-gkbd-3.0,
gir1.2-glib-2.0,
@@ -67,7 +68,7 @@
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends: cinnamon-screensaver (>= 3.1.0),
- gir1.2-webkit2-4.0 | gir1.2-webkit2-3.0
+ gir1.2-webkit2-4.0
Description: Webkit plugin for cinnamon-screensaver
Package: libcscreensaver0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-3.4.0/screensavers/webkit(a)cinnamon.org/main new/cinnamon-screensaver-3.4.1/screensavers/webkit(a)cinnamon.org/main
--- old/cinnamon-screensaver-3.4.0/screensavers/webkit(a)cinnamon.org/main 2017-05-04 15:02:52.000000000 +0200
+++ new/cinnamon-screensaver-3.4.1/screensavers/webkit(a)cinnamon.org/main 2017-06-20 15:40:52.000000000 +0200
@@ -2,11 +2,8 @@
import gi
gi.require_version('Gtk', '3.0')
+gi.require_version('WebKit2', '4.0')
-try:
- gi.require_version('WebKit2', '4.0')
-except ValueError:
- gi.require_version('WebKit2', '3.0')
from gi.repository import Gtk, Gdk, GdkX11, WebKit2, Gio, GLib
import sys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-3.4.0/src/cinnamon-screensaver-gtk3.14.css new/cinnamon-screensaver-3.4.1/src/cinnamon-screensaver-gtk3.14.css
--- old/cinnamon-screensaver-3.4.0/src/cinnamon-screensaver-gtk3.14.css 2017-05-04 15:02:52.000000000 +0200
+++ new/cinnamon-screensaver-3.4.1/src/cinnamon-screensaver-gtk3.14.css 2017-06-20 15:40:52.000000000 +0200
@@ -22,8 +22,6 @@
border: 2px solid;
border-color: #eeeeee;
box-shadow: 1px 1px alpha(black, 0.8);
- /* substitute for min-height - replace with min-height in Gtk 3.20+*/
- color: rgba(250, 0, 0, 0);
}
.csstage .toppanel {
@@ -77,12 +75,10 @@
border-radius: 4px;
border: 4px solid;
border-color: @theme_selected_bg_color;
- /* substitute for min-height - replace with min-height in Gtk 3.20+*/
- color: rgba(150, 0, 0, 0);
}
.csstage .albumart {
- color: rgba(300, 0, 0, 0);
+ color: rgba(320, 0, 0, 0);
}
.csstage .passwordentry {
@@ -211,4 +207,4 @@
.csstage GtkViewport {
background-color: transparent;
background-image: none;
-}
\ No newline at end of file
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-3.4.0/src/cinnamon-screensaver-gtk3.18.css new/cinnamon-screensaver-3.4.1/src/cinnamon-screensaver-gtk3.18.css
--- old/cinnamon-screensaver-3.4.0/src/cinnamon-screensaver-gtk3.18.css 2017-05-04 15:02:52.000000000 +0200
+++ new/cinnamon-screensaver-3.4.1/src/cinnamon-screensaver-gtk3.18.css 2017-06-20 15:40:52.000000000 +0200
@@ -22,8 +22,6 @@
border: 2px solid;
border-color: #eeeeee;
box-shadow: 1px 1px alpha(black, 0.8);
- /* substitute for min-height - replace with min-height in Gtk 3.20+*/
- color: rgba(250, 0, 0, 0);
}
.csstage .toppanel {
@@ -77,12 +75,9 @@
border-radius: 4px;
border: 4px solid;
border-color: @theme_selected_bg_color;
- /* substitute for min-height - replace with min-height in Gtk 3.20+*/
- color: rgba(150, 0, 0, 0);
}
.csstage .albumart {
- color: rgba(300, 0, 0, 0);
}
.csstage .passwordentry {
@@ -211,4 +206,4 @@
.csstage GtkViewport {
background-color: transparent;
background-image: none;
-}
\ No newline at end of file
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-3.4.0/src/cinnamon-screensaver-gtk3.20.css new/cinnamon-screensaver-3.4.1/src/cinnamon-screensaver-gtk3.20.css
--- old/cinnamon-screensaver-3.4.0/src/cinnamon-screensaver-gtk3.20.css 2017-05-04 15:02:52.000000000 +0200
+++ new/cinnamon-screensaver-3.4.1/src/cinnamon-screensaver-gtk3.20.css 2017-06-20 15:40:52.000000000 +0200
@@ -60,7 +60,6 @@
background-clip: border-box;
border-color: @theme_selected_bg_color;
box-shadow: 1px 1px alpha(black, 0.8);
- min-height: 150px;
}
.csstage .passwordentry {
@@ -192,4 +191,4 @@
.csstage GtkViewport {
background-color: transparent;
background-image: none;
-}
\ No newline at end of file
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-3.4.0/src/clock.py new/cinnamon-screensaver-3.4.1/src/clock.py
--- old/cinnamon-screensaver-3.4.0/src/clock.py 2017-05-04 15:02:52.000000000 +0200
+++ new/cinnamon-screensaver-3.4.1/src/clock.py 2017-06-20 15:40:52.000000000 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/python3
-from gi.repository import CinnamonDesktop, GLib, Gtk, Gio
+from gi.repository import CinnamonDesktop, CDesktopEnums, GLib, Gtk, Gio
from util import utils, trackers, settings
from baseWindow import BaseWindow
@@ -33,6 +33,7 @@
self.add(self.label)
self.clock_tracker = CinnamonDesktop.WallClock()
+ self.set_clock_interval()
trackers.con_tracker_get().connect(self.clock_tracker,
"notify::clock",
@@ -45,8 +46,33 @@
"changed",
self.on_tz_changed)
+ trackers.con_tracker_get().connect(self,
+ "destroy",
+ self.on_destroy)
+
self.update_clock()
+ def set_clock_interval(self):
+ interval = CDesktopEnums.ClockInterval.SETTING
+
+ if settings.get_use_custom_format():
+ date_format = settings.get_custom_date_format()
+ time_format = settings.get_custom_time_format()
+
+ use_seconds = False
+
+ for token in ("%S", "%c", "%T", "%X"):
+ if token in date_format or token in time_format:
+ use_seconds = True
+ break
+
+ if use_seconds:
+ interval = CDesktopEnums.ClockInterval.SECOND
+ else:
+ interval = CDesktopEnums.ClockInterval.MINUTE
+
+ self.clock_tracker.set_update_interval(interval)
+
def on_clock_changed(self, clock, pspec):
self.update_clock()
@@ -100,5 +126,19 @@
self.away_message = msg
self.update_clock()
+ def on_destroy(self, data=None):
+ trackers.con_tracker_get().disconnect(self.clock_tracker,
+ "notify::clock",
+ self.on_clock_changed)
+
+ trackers.con_tracker_get().disconnect(self.tz_monitor,
+ "changed",
+ self.on_tz_changed)
+
+ trackers.con_tracker_get().disconnect(self,
+ "destroy",
+ self.on_destroy)
+ self.clock_tracker = None
+ self.tz_monitor = None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-3.4.0/src/stage.py new/cinnamon-screensaver-3.4.1/src/stage.py
--- old/cinnamon-screensaver-3.4.0/src/stage.py 2017-05-04 15:02:52.000000000 +0200
+++ new/cinnamon-screensaver-3.4.1/src/stage.py 2017-06-20 15:40:52.000000000 +0200
@@ -707,6 +707,7 @@
Destroy all MonitorViews
"""
for monitor in self.monitors:
+ monitor.kill_plugin()
monitor.destroy()
del monitor
@@ -854,7 +855,13 @@
the left-center. The albumart widget aligns right-center.
"""
unlock_mw, unlock_nw = self.unlock_dialog.get_preferred_width()
- region_w = (monitor_rect.width - unlock_nw) / 2
+ """
+ If, for whatever reason, we need more than 1/3 of the screen to fully display
+ the unlock dialog, reduce our available region width to accomodate it, reducing
+ the allocation for the floating widgets as required.
+ """
+ if (unlock_nw > region_w):
+ region_w = (monitor_rect.width - unlock_nw) / 2
if isinstance(child, ClockWidget):
child.set_halign(Gtk.Align.START)
@@ -885,7 +892,7 @@
ca = ALIGNMENTS[random.randint(0, 2)]
child.set_valign(ca)
- # Restrict the widget size to 1/3 width and height of the current monitor
+ # Restrict the widget size to the allowable region sizes if necessary.
allocation.width = min(nat_rect.width, region_w)
allocation.height = min(nat_rect.height, region_h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-3.4.0/src/unlock.py new/cinnamon-screensaver-3.4.1/src/unlock.py
--- old/cinnamon-screensaver-3.4.0/src/unlock.py 2017-05-04 15:02:52.000000000 +0200
+++ new/cinnamon-screensaver-3.4.1/src/unlock.py 2017-06-20 15:40:52.000000000 +0200
@@ -42,7 +42,6 @@
self.set_halign(Gtk.Align.CENTER)
self.set_valign(Gtk.Align.CENTER)
- self.set_size_request(350, -1)
self.real_name = None
self.user_name = None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-3.4.0/src/util/utils.py new/cinnamon-screensaver-3.4.1/src/util/utils.py
--- old/cinnamon-screensaver-3.4.0/src/util/utils.py 2017-05-04 15:02:52.000000000 +0200
+++ new/cinnamon-screensaver-3.4.1/src/util/utils.py 2017-06-20 15:40:52.000000000 +0200
@@ -4,6 +4,7 @@
import os
import grp
import subprocess
+import xapp.os
import config
import status
@@ -68,6 +69,10 @@
except KeyError:
pass
+ # Don't lock the screensaver in guest or live sessions
+ if xapp.os.is_live_session() or xapp.os.is_guest_session():
+ return False
+
return True
def process_is_running(name):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-3.4.0/src/widgets/framedImage.py new/cinnamon-screensaver-3.4.1/src/widgets/framedImage.py
--- old/cinnamon-screensaver-3.4.0/src/widgets/framedImage.py 2017-05-04 15:02:52.000000000 +0200
+++ new/cinnamon-screensaver-3.4.1/src/widgets/framedImage.py 2017-06-20 15:40:52.000000000 +0200
@@ -8,10 +8,12 @@
from util import utils, trackers
+MAX_IMAGE_SIZE = 320
+
class FramedImage(Gtk.Image):
"""
- Widget to hold the user face image. It can be sized using CSS color.red value
- (up to 255px) in Gtk 3.18, and using the min-height style property in gtk 3.20+.
+ Widget to hold the user face image. It attempts to display an image at
+ its native size, up to a max sane size.
"""
__gsignals__ = {
"pixbuf-changed": (GObject.SignalFlags.RUN_LAST, None, (object,))
@@ -24,24 +26,9 @@
self.file = None
self.path = None
- self.loader = None
-
- self.current_pixbuf = None
- self.next_pixbuf = None
-
- self.min_height = 50
trackers.con_tracker_get().connect(self, "realize", self.on_realized)
- def get_theme_height(self):
- ctx = self.get_style_context()
-
- if utils.have_gtk_version("3.20.0"):
- return ctx.get_property("min-height", Gtk.StateFlags.NORMAL)
- else:
- color = ctx.get_color(Gtk.StateFlags.NORMAL)
- return (color.red * 255) + (color.green * 255) + (color.blue * 255)
-
def on_realized(self, widget):
self.generate_image()
@@ -63,17 +50,34 @@
if self.get_realized():
self.generate_image()
- def generate_image(self):
- self.set_size_request(-1, self.get_theme_height())
+ def set_image_internal(self, path):
+ pixbuf = None
- if self.path:
- try:
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(self.path, -1, self.get_theme_height(), True)
- self.set_from_pixbuf(pixbuf)
- except:
- self.clear_image()
- self.emit("pixbuf-changed", pixbuf)
+ try:
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file(path)
+ except GLib.Error as e:
+ message = "Could not load pixbuf from '%s' for FramedImage: %s" % (path, e.message)
+ error = True
+ if pixbuf != None:
+ if pixbuf.get_height() > MAX_IMAGE_SIZE or pixbuf.get_width() > MAX_IMAGE_SIZE:
+ try:
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(path, MAX_IMAGE_SIZE, MAX_IMAGE_SIZE)
+ except GLib.Error as e:
+ message = "Could not scale pixbuf from '%s' for FramedImage: %s" % (path, e.message)
+ error = True
+
+ if pixbuf:
+ self.set_from_pixbuf(pixbuf)
+ else:
+ print(message)
+ self.clear_image()
+
+ self.emit("pixbuf-changed", pixbuf)
+
+ def generate_image(self):
+ if self.path:
+ self.set_image_internal(self.path)
elif self.file:
if self.cancellable != None:
self.cancellable.cancel()
@@ -103,11 +107,6 @@
def on_file_written(self, file, result, data=None):
try:
if file.replace_contents_finish(result):
- try:
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(file.get_path(), -1, self.get_theme_height(), True)
- self.set_from_pixbuf(pixbuf)
- except:
- self.clear_image()
- self.emit("pixbuf-changed", pixbuf)
+ self.set_image_internal(file.get_path())
except GLib.Error:
- pass
\ No newline at end of file
+ pass
1
0
Hello community,
here is the log from the commit of package nemo for openSUSE:Factory checked in at 2017-06-26 15:56:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nemo (Old)
and /work/SRC/openSUSE:Factory/.nemo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nemo"
Mon Jun 26 15:56:48 2017 rev:14 rq:506200 version:3.4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/nemo/nemo.changes 2017-06-22 10:40:51.297714749 +0200
+++ /work/SRC/openSUSE:Factory/.nemo.new/nemo.changes 2017-06-26 15:56:49.869013263 +0200
@@ -1,0 +2,13 @@
+Mon Jun 26 08:54:15 UTC 2017 - sor.alexei(a)meowr.ru
+
+- Update to version 3.4.4:
+ * nemo-icon-view-grid-container.c: Skip default placement if we
+ are in auto-layout mode. We get false lazy flags on new icons
+ since the original desktop did not use auto-layout. We need to
+ handle this because we both store layout timestamps and provide
+ auto-layout.
+ * nemo-window-slot.c: Initialise cache_bar to NULL, this is
+ checked for in nemo-window-manage-views
+ (nemo_window_slot_check_bad_cache_bar).
+
+-------------------------------------------------------------------
Old:
----
nemo-3.4.3.tar.gz
New:
----
nemo-3.4.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nemo.spec ++++++
--- /var/tmp/diff_new_pack.d2HnZb/_old 2017-06-26 15:56:50.424934858 +0200
+++ /var/tmp/diff_new_pack.d2HnZb/_new 2017-06-26 15:56:50.424934858 +0200
@@ -20,7 +20,7 @@
%define sover 1
%define typelib typelib-1_0-Nemo-3_0
Name: nemo
-Version: 3.4.3
+Version: 3.4.4
Release: 0
Summary: File browser for Cinnamon
License: GPL-2.0+
++++++ nemo-3.4.3.tar.gz -> nemo-3.4.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.4.3/configure.ac new/nemo-3.4.4/configure.ac
--- old/nemo-3.4.3/configure.ac 2017-06-20 15:44:34.000000000 +0200
+++ new/nemo-3.4.4/configure.ac 2017-06-22 15:00:46.000000000 +0200
@@ -18,7 +18,7 @@
m4_define(nemo_extension_current, 5)
m4_define(nemo_extension_revision, 0)
-AC_INIT(nemo, 3.4.3, https://github.com/linuxmint/nemo)
+AC_INIT(nemo, 3.4.4, https://github.com/linuxmint/nemo)
dnl ===========================================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.4.3/debian/changelog new/nemo-3.4.4/debian/changelog
--- old/nemo-3.4.3/debian/changelog 2017-06-20 15:44:34.000000000 +0200
+++ new/nemo-3.4.4/debian/changelog 2017-06-22 15:00:46.000000000 +0200
@@ -1,3 +1,11 @@
+nemo (3.4.4) sonya; urgency=medium
+
+ [ Michael Webster ]
+ * nemo-icon-view-grid-container.c: skip default placement if we're in auto-layout mode. We get false lazy flags on new icons since the original desktop did not use auto-layout. We need to handle this because we both store layout timestamps and provide auto-layout.
+ * nemo-window-slot.c: Initialize cache_bar to NULL, this is checked for in nemo-window-manage-views (nemo_window_slot_check_bad_cache_bar)
+
+ -- Clement Lefebvre <root(a)linuxmint.com> Thu, 22 Jun 2017 15:00:12 +0200
+
nemo (3.4.3) sonya; urgency=medium
[ leigh123linux ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.4.3/libnemo-private/nemo-file-operations.c new/nemo-3.4.4/libnemo-private/nemo-file-operations.c
--- old/nemo-3.4.3/libnemo-private/nemo-file-operations.c 2017-06-20 15:44:34.000000000 +0200
+++ new/nemo-3.4.4/libnemo-private/nemo-file-operations.c 2017-06-22 15:00:46.000000000 +0200
@@ -4338,15 +4338,16 @@
transfer_info->num_files ++;
report_copy_progress (copy_job, source_info, transfer_info);
- if (debuting_files) {
+ if (debuting_files) {
if (target_is_desktop && position) {
nemo_file_changes_queue_schedule_position_set (dest, *position, job->monitor_num);
- } else if (source_is_desktop) {
+ } else if (source_is_desktop && copy_job->is_move) {
nemo_file_changes_queue_schedule_position_remove (dest);
+ }
+
+ g_hash_table_replace (debuting_files, g_object_ref (dest), GINT_TO_POINTER (TRUE));
}
- g_hash_table_replace (debuting_files, g_object_ref (dest), GINT_TO_POINTER (TRUE));
- }
if (copy_job->is_move) {
nemo_file_changes_queue_file_moved (src, dest);
} else {
@@ -5461,22 +5462,11 @@
char *primary, *secondary, *details;
int response;
gboolean handled_invalid_filename;
- gboolean target_is_desktop, source_is_desktop;
+ gboolean target_is_desktop;
target_is_desktop = (job->desktop_location != NULL &&
g_file_equal (job->desktop_location, dest_dir));
- source_is_desktop = FALSE;
-
- if (src != NULL) {
- GFile *parent = g_file_get_parent (src);
-
- if (parent != NULL && g_file_equal (job->desktop_location, parent)) {
- source_is_desktop = TRUE;
- g_object_unref (parent);
- }
- }
-
common = (CommonJob *)job;
count = 0;
@@ -5517,8 +5507,6 @@
if (target_is_desktop && position) {
nemo_file_changes_queue_schedule_position_set (dest, *position, common->monitor_num);
- } else if (source_is_desktop) {
- nemo_file_changes_queue_schedule_position_remove (dest);
}
g_object_unref (dest);
@@ -6254,8 +6242,6 @@
nemo_file_changes_queue_file_added (dest);
if (job->has_position) {
nemo_file_changes_queue_schedule_position_set (dest, job->position, common->monitor_num);
- } else {
- nemo_file_changes_queue_schedule_position_remove (dest);
}
} else {
g_assert (error != NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.4.3/src/nemo-icon-view-grid-container.c new/nemo-3.4.4/src/nemo-icon-view-grid-container.c
--- old/nemo-3.4.3/src/nemo-icon-view-grid-container.c 2017-06-20 15:44:34.000000000 +0200
+++ new/nemo-3.4.4/src/nemo-icon-view-grid-container.c 2017-06-22 15:00:46.000000000 +0200
@@ -1148,7 +1148,8 @@
nemo_icon_container_update_icon (container, icon);
- if (icon->has_lazy_position || nemo_icon_container_icon_is_new_for_monitor (container, icon, current_monitor)) {
+ if (!container->details->auto_layout &&
+ (icon->has_lazy_position || nemo_icon_container_icon_is_new_for_monitor (container, icon, current_monitor))) {
assign_icon_position (container, icon);
semi_position_icons = g_list_prepend (semi_position_icons, icon);
} else if (!assign_icon_position (container, icon)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.4.3/src/nemo-window-slot.c new/nemo-3.4.4/src/nemo-window-slot.c
--- old/nemo-3.4.3/src/nemo-window-slot.c 2017-06-20 15:44:34.000000000 +0200
+++ new/nemo-3.4.4/src/nemo-window-slot.c 2017-06-22 15:00:46.000000000 +0200
@@ -294,6 +294,8 @@
g_signal_connect (slot->floating_bar, "action",
G_CALLBACK (floating_bar_action_cb), slot);
+ slot->cache_bar = NULL;
+
slot->title = g_strdup (_("Loading..."));
}
1
0
Hello community,
here is the log from the commit of package bitlbee for openSUSE:Factory checked in at 2017-06-26 15:56:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bitlbee (Old)
and /work/SRC/openSUSE:Factory/.bitlbee.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bitlbee"
Mon Jun 26 15:56:46 2017 rev:9 rq:506199 version:3.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/bitlbee/bitlbee.changes 2017-03-08 01:16:21.894383835 +0100
+++ /work/SRC/openSUSE:Factory/.bitlbee.new/bitlbee.changes 2017-06-26 15:56:47.621330266 +0200
@@ -1,0 +2,9 @@
+Wed Jun 14 12:05:51 UTC 2017 - tchvatal(a)suse.com
+
+- Drop the xinetd service from the package
+ * We are switching to socket services, on this service it does
+ not make much sense to actually enable it like that thus
+ simply drom the xinetd binding
+- Remove always true version check
+
+-------------------------------------------------------------------
Old:
----
bitlbee.xinetd-suse.in
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bitlbee.spec ++++++
--- /var/tmp/diff_new_pack.LmXNlt/_old 2017-06-26 15:56:48.137257502 +0200
+++ /var/tmp/diff_new_pack.LmXNlt/_new 2017-06-26 15:56:48.137257502 +0200
@@ -1,7 +1,7 @@
#
# spec file for package bitlbee
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2012 Pascal Bleser <pascal.bleser(a)opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@@ -26,7 +26,6 @@
Group: Productivity/Networking/IRC
Url: http://www.bitlbee.org/
Source: http://get.bitlbee.org/src/bitlbee-%{version}.tar.gz
-Source1: %{name}.xinetd-suse.in
Source2: %{name}.service-suse.in
BuildRequires: fdupes
BuildRequires: glibc-devel
@@ -34,6 +33,7 @@
BuildRequires: libgcrypt-devel
BuildRequires: lzo-devel
BuildRequires: pkgconfig
+BuildRequires: util-linux-systemd
BuildRequires: w3m
BuildRequires: xmlto
BuildRequires: pkgconfig(glib-2.0)
@@ -42,12 +42,7 @@
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(zlib)
Requires: logrotate
-Requires: xinetd
Requires(pre): shadow
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1310
-BuildRequires: util-linux-systemd
-%endif
%description
We are both console lovers. But it is annoying to have a few tty's open with
@@ -162,10 +157,6 @@
make DESTDIR=%{buildroot} install install-etc
make DESTDIR=%{buildroot} install-dev
-install -d "%{buildroot}%{_sysconfdir}/xinetd.d"
-sed -e "s+@@BITLBEE@@+%{_sbindir}/bitlbee+g" \
- < "%{SOURCE1}" > "%{buildroot}%{_sysconfdir}/xinetd.d/bitlbee"
-
%fdupes -s
install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
@@ -203,7 +194,6 @@
%files -f %{name}.lang
%defattr(-,root,root)
%doc %dir %{_docdir}/%{name}
-%config(noreplace) %{_sysconfdir}/xinetd.d/bitlbee
%attr(0750,root,bitlbee) %dir %{_sysconfdir}/bitlbee
%{_unitdir}/%{name}.service
%{_sbindir}/rc%{name}
1
0
Hello community,
here is the log from the commit of package weechat for openSUSE:Factory checked in at 2017-06-26 15:56:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/weechat (Old)
and /work/SRC/openSUSE:Factory/.weechat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "weechat"
Mon Jun 26 15:56:45 2017 rev:43 rq:506197 version:1.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/weechat/weechat.changes 2017-05-16 14:46:42.558027865 +0200
+++ /work/SRC/openSUSE:Factory/.weechat.new/weechat.changes 2017-06-26 15:56:45.677604401 +0200
@@ -1,0 +2,17 @@
+Sun Jun 25 20:29:56 UTC 2017 - mimi.vx(a)gmail.com
+
+- update to 1.9
+* improve speed of nicklist bar item callback
+* add auto scroll of buflist bar with new option buflist.look.auto_scroll
+* add option buflist.format.name
+* add variables ${format_name}, ${current_buffer} and ${merged}@@ in buflist
+* display a warning in buflist when the script buffers.pl is loaded
+* add server/channel pointers in trigger IRC callbacks
+* add API functions config_option_get_string and hdata_compare
+* fix bind of Space key
+* many bugs fixed.
+* buflist.format.name
+* buflist.look.auto_scroll
+* F1/F2: scroll buflist bar
+
+-------------------------------------------------------------------
Old:
----
weechat-1.8.tar.xz
weechat-1.8.tar.xz.asc
New:
----
weechat-1.9.tar.xz
weechat-1.9.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ weechat.spec ++++++
--- /var/tmp/diff_new_pack.WVfw2W/_old 2017-06-26 15:56:46.489489897 +0200
+++ /var/tmp/diff_new_pack.WVfw2W/_new 2017-06-26 15:56:46.493489332 +0200
@@ -17,7 +17,7 @@
Name: weechat
-Version: 1.8
+Version: 1.9
Release: 0
Summary: Portable, Fast, Light and Extensible Chat Client
License: GPL-3.0+
++++++ weechat-1.8.tar.xz -> weechat-1.9.tar.xz ++++++
++++ 9818 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package cyrus-imapd for openSUSE:Factory checked in at 2017-06-26 15:56:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
and /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cyrus-imapd"
Mon Jun 26 15:56:43 2017 rev:67 rq:506147 version:2.4.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes 2017-06-22 10:40:49.309995002 +0200
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 2017-06-26 15:56:44.661747673 +0200
@@ -1,0 +2,6 @@
+Sun Jun 25 21:22:24 UTC 2017 - aj(a)ajaissle.de
+
+- Add cyrus-imapd-2.4.19-lmtpd_crash.patch:
+ * lmtpd: fix uninitialised variable crash [boo#1045899]
+
+-------------------------------------------------------------------
New:
----
cyrus-imapd-2.4.19-lmtpd_crash.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cyrus-imapd.spec ++++++
--- /var/tmp/diff_new_pack.0bLgLN/_old 2017-06-26 15:56:45.377646706 +0200
+++ /var/tmp/diff_new_pack.0bLgLN/_new 2017-06-26 15:56:45.381646142 +0200
@@ -62,6 +62,8 @@
Patch28: cyrus-imapd-2.4.19-implicit_definitions.patch
# PATCH-FIX-UPSTREAM -- Outlook 2013-compatible XLIST behaviour
Patch31: cyrus-imapd-2.4.18-D19-Outlook_2013_XLIST.patch
+# PATCH-FIX-UPSTREAM -- lmtpd: fix uninitialised variable crash
+Patch32: cyrus-imapd-2.4.19-lmtpd_crash.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@@ -218,6 +220,7 @@
%patch27 -p1
%patch28 -p1
%patch31 -p1
+%patch32 -p1
# remove executable bit from docs
find doc -type f -name '*.html' -exec chmod -x {} \;
++++++ cyrus-imapd-2.4.19-lmtpd_crash.patch ++++++
>From 129d3aedbba82d6457fc7cbd436e68f278e0628b Mon Sep 17 00:00:00 2001
From: ellie timoney <ellie(a)fastmail.com>
Date: Mon, 22 May 2017 13:06:04 +1000
Subject: [PATCH] lmtpd: fix uninitialised variable crash
---
imap/lmtpd.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/imap/lmtpd.c b/imap/lmtpd.c
index 5fe507a80..7428f72b5 100644
--- a/imap/lmtpd.c
+++ b/imap/lmtpd.c
@@ -712,9 +712,10 @@ int deliver(message_data_t *msgdata, char *authuser,
/* loop through each recipient, attempting delivery for each */
for (n = 0; n < nrcpts; n++) {
- char namebuf[MAX_MAILBOX_BUFFER] = "", *server;
+ char namebuf[MAX_MAILBOX_BUFFER] = "";
char userbuf[MAX_MAILBOX_BUFFER];
const char *rcpt, *user, *domain, *mailbox;
+ char *server = NULL;
int r = 0;
rcpt = msg_getrcptall(msgdata, n);
@@ -954,7 +955,7 @@ static int verify_user(const char *user, const char *domain, char *mailbox,
}
if (!r) {
- char *server, *acl;
+ char *server = NULL, *acl = NULL;
long aclcheck = !user ? ACL_POST : 0;
/*
* check to see if mailbox exists and we can append to it:
@@ -1061,8 +1062,9 @@ FILE *spoolfile(message_data_t *msgdata)
(don't bother if we're only a proxy) */
n = isproxy ? 0 : msg_getnumrcpt(msgdata);
for (i = 0; !f && (i < n); i++) {
- char namebuf[MAX_MAILBOX_BUFFER] = "", *server;
+ char namebuf[MAX_MAILBOX_BUFFER] = "";
const char *user, *domain, *mailbox;
+ char *server = NULL;
int r;
/* build the mailboxname from the recipient address */
1
0
Hello community,
here is the log from the commit of package Rivet for openSUSE:Factory checked in at 2017-06-26 15:56:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/Rivet (Old)
and /work/SRC/openSUSE:Factory/.Rivet.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Rivet"
Mon Jun 26 15:56:41 2017 rev:11 rq:506115 version:2.5.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/Rivet/Rivet.changes 2017-03-12 20:00:21.972607841 +0100
+++ /work/SRC/openSUSE:Factory/.Rivet.new/Rivet.changes 2017-06-26 15:56:41.702165080 +0200
@@ -1,0 +2,213 @@
+Fri Jun 23 20:25:55 UTC 2017 - antoine.belvire(a)opensuse.org
+
+- Update to version 2.5.4:
+ * Fix 8 TeV DY (ATLAS_2016_I1467454), EL/MU bits were bissing.
+ * Add 13 TeV DY (ATLAS_2017_I1514251) and mark
+ ATLAS_2015_CONF_2015_041 obsolete.
+ * Add missing install statement for
+ ATLAS_2016_I1448301.yoda/plot/info leading to segfault.
+ * Slight improvements to Particle constructors.
+ * Improvement to Beam projection: before falling back to
+ barcodes 1 & 2, try a manual search for status=4 particles.
+ Based on a patch from Andrii Verbytskyi.
+ * Add CMS_2016_I1430892: dilepton channel ttbar charge asymmetry
+ analysis.
+ * Add CMS_2016_I1413748: dilepton channel ttbar spin
+ correlations and polarisation analysis.
+ * Add CMS_2017_I1518399: leading jet mass for boosted top
+ quarks at 8 TeV.
+ * Add convenience constructors for ChargedLeptons projection.
+ * Add FinalState and Cut (optional) constructor arguments and
+ usage to DISFinalState. Thanks to Andrii Verbytskyi for the
+ idea and initial patch.
+ * Add ATLAS_2016_I1448301, Z/gamma cross section measurement at
+ 8 TeV.
+ * Add ATLAS_2016_I1426515, WW production at 8 TeV.
+ * Add BELLE measurement of semileptonic B0bar -> D*+ ell nu
+ decays. I took the liberty to correct the data in the sense
+ that I take the bin widths into account in the normalisation.
+ BELLE_2017_I1512299.
+ This is a nice analysis as it probes the hadronic and the
+ leptonic side of the decay so very valuable for model building
+ and of course it is rare as it is an unfolded B measurement.
+ * Add ALEPH measurement of hadronic tau decays,
+ ALEPH_2014_I1267648.
+ * Add ALEPH dimuon invariant mass (OS and SS) analysis,
+ ALEPH_2016_I1492968.
+ * The latter needed GENKTEE FastJet algorithm so I added that
+ FastJets.
+ * Protection against logspace exception in histobooking of
+ MC_JetAnalysis.
+ * Fix compiler complaints about uninitialised variable in
+ OPAL_2004.
+ * Tidy ALEPH_1999 charm fragmentation analysis and normalise to
+ data integral. Added DSTARPLUS and DSTARMINUS to PID.
+ * Add ATLAS_2016_CONF_2016_092, inclusive jet cross sections
+ using early 13 TeV data.
+ * Add ATLAS_2017_I1591327, isolated diphoton + X differential
+ cross-sections.
+ * Add ATLAS_2017_I1589844, ATLAS_2017_I1589844_EL,
+ ATLAS_2017_I1589844_MU: kT splittings in Z events at 8 TeV.
+ * Add ATLAS_2017_I1509919, track-based underlying event at 13
+ TeV in ATLAS.
+ * Add ATLAS_2016_I1492320_2l2j and ATLAS_2016_I1492320_3l, the
+ WWW cross-section at 8 TeV.
+ * Add ATLAS_2016_I1449082, charge asymmetry in top quark pair
+ production in dilepton channel.
+ * Add ATLAS_2015_I1394865, inclusive 4-lepton/ZZ lineshape.
+ * Add ATLAS_2013_I1234228, high-mass Drell-Yan at 7 TeV.
+ * Add CMS_2017_I1519995, search for new physics with dijet
+ angular distributions in proton-proton collisions at
+ sqrt{(s) = 13 TeV.
+ * Add CMS_2017_I1511284, inclusive energy spectrum in the very
+ forward direction in proton-proton collisions at 13 TeV.
+ * Add CMS_2016_I1486238, studies of 2 b-jet + 2 jet production
+ in proton-proton collisions at 7 TeV.
+ * Add CMS_2016_I1454211, boosted ttbar in pp collisions at
+ sqrtS = 8 TeV.
+ * Add CMS_2016_I1421646, CMS azimuthal decorrelations at 8 TeV.
+ * Add CMS_2015_I1380605, per-event yield of the highest
+ transverse momentum charged particle and charged-particle jet.
+ * Add CMS_2015_I1370682_PARTON, a partonic-top version of the CMS
+ 7 TeV pseudotop ttbar differential cross-section analysis.
+ * Adding EHS_1988_I265504 from Felix Riehn: charged-particle
+ production in K+ p, pi+ p and pp interactions at 250 GeV/c.
+ * Fix ALICE_2012_I1116147 for pi0 and Lambda feed-down.
+ * Add protection against leptons from QED FSR photon conversions
+ in assigning PartonicTop decay modes. Thanks to Markus Seidel
+ for the report and suggested fix.
+ * Reimplement FastJets methods in terms of new static helper
+ functions.
+ * Add new mkClusterInputs, mkJet and mkJets static methods to
+ FastJets, to help with direct calls to FastJet where particle
+ lookup for constituents and ghost tags are required.
+ * Fix Doxygen config and Makefile target to allow working with
+ out-of-source builds. Thanks to Christian Holm Christensen.
+ * Improve DISLepton for HERA analyses: thanks to Andrii
+ Verbytskyi for the patch!
+ * Replace non-template Analysis::refData functions with C++11
+ default T=Scatter2D.
+ * Allow yes/no and true/false values for LogX, etc. plot options.
+ * Add --errs as an alias for --mc-errs to rivet-mkhtml and
+ rivet-cmphistos.
+ * Added 6 analyses AMY_1990_I295160, HRS_1986_I18502,
+ JADE_1983_I190818, PLUTO_1980_I154270, TASSO_1989_I277658,
+ TPC_1987_I235694 for charged multiplicity in e+e- at CMS
+ energies below the Z pole.
+ * Added 2 analyses for charged multiplicity at the Z pole
+ DELPHI_1991_I301657, OPAL_1992_I321190.
+ * Updated ALEPH_1991_S2435284 to plot the average charged
+ multiplicity.
+ * Added analyses OPAL_2004_I631361, OPAL_2004_I631361_qq,
+ OPAL_2004_I648738 for gluon jets in e+e-, most need fictitious
+ e+e- > g g process.
+ * Add Cut and functor selection args to HeavyHadrons accessor
+ methods.
+ * bin/rivet-mkanalysis: Add FastJets.hh include by default --
+ it's almost always used.
+ * src/Analyses/CMS_2016_I1473674.cc: Patch from CMS to use
+ partonic tops.
+ * src/Analyses/CMS_2015_I1370682.cc: Patch to inline jet finding
+ from CMS.
+ * Convert DressedLeptons use of fromDecay to instead veto photons
+ that match fromHadron() || fromHadronicTau() -- meaning that
+ electrons and muons from leptonic taus will now be dressed.
+ * Move Particle and Jet std::function aliases to .fhh files, and
+ replace many uses of templates for functor arguments with
+ ParticleSelector meta-types instead.
+ * Move the canonical implementations of hasAncestorWith, etc. and
+ isLastWith, etc. from ParticleUtils.hh into Particle.
+ * Disable the event-to-event beam consistency check if the
+ ignore-beams mode is active.
+ * Add BoolParticleAND, BoolJetOR, etc. functor combiners to
+ Tools/ParticleUtils.hh and Tools/JetUtils.hh.
+ * Mark ATLAS_2016_CONF_2016_078 and CMS_2016_PAS_SUS_16_14
+ analyses as validated, since their cutflows match the
+ documentation.
+ * Add aggregate signal regions to CMS_2016_PAS_SUS_16_14.
+ * Add getEnvParam function, for neater use of environment
+ variable parameters with a required default.
+ * Add HasBTag and HasCTag jet functors, with lower-case aliases.
+ * Use std::function in functor-expanded method signatures on
+ JetAlg.
+ * Convert FinalState particles() accessors to use std::function
+ rather than a template arg for sorting, and add filtering
+ functor support -- including a mix of filtering and sorting
+ functors. Yay for C++11!
+ * Add ParticleEffFilter and JetEffFilter constructors from a
+ double (encoding constant efficiency).
+ * Add Vector3::abseta().
+- Changes from version 2.5.3:
+ * Add cut in BZ calculation in OPAL 4 jet analysis. Paper is not
+ clear about treatment of parallel vectors, leads to division by
+ zero and nan-fill and subsequent YODA RangeError
+ (OPAL_2001_S4553896).
+ * Fix bugs in SmearedJets treatment of b & c tagging rates.
+ * Adding ATLAS_2016_I1467454 analysis (high-mass Drell-Yan at 8
+ TeV).
+ * Tweak to 'convert' call to improve the thumbnail quality from
+ rivet-mkhtml/make-plots.
+ * Require Cython 0.24 or later.
+ * Adding L3_2004_I652683 (LEP 1 & 2 event shapes) and
+ LHCB_2014_I1262703 (Z+jet at 7 TeV).
+ * Adding leading dijet mass plots to MC_JetAnalysis (and all
+ derived classes). Thanks to Chris Gutschow!
+ * Adding CMS_2012_I1298807 (ZZ cross-section at 8 TeV),
+ CMS_2016_I1459051 (inclusive jet cross-sections at 13 TeV) and
+ CMS_PAS_FSQ_12_020 (preliminary 7 TeV leading-track underlying
+ event).
+ * Adding CDF_2015_1388868 (ppbar underlying event at 300, 900,
+ and 1960 GeV).
+ * Adding ATLAS_2016_I1467230 (13 TeV min bias),
+ ATLAS_2016_I1468167 (13 TeV inelastic pp cross-section), and
+ ATLAS_2016_I1479760 (7 TeV pp double-parton scattering with 4
+ jets).
+ * Adding ALICE_2012_I1116147 (eta and pi0 pTs and ratio) and
+ ATLAS_2011_I929691 (7 TeV jet frag).
+ * Fix bash bugs in rivet-buildplugin, including fixing the --cmd
+ mode.
+ * Add LHC Run 2 BSM analyses ATLAS_2016_CONF_2016_037 (3-lepton
+ and same-sign 2-lepton), ATLAS_2016_CONF_2016_054 (1-lepton +
+ jets), ATLAS_2016_CONF_2016_078 (ICHEP jets + MET),
+ ATLAS_2016_CONF_2016_094 (1-lepton + many jets),
+ CMS_2013_I1223519 (alphaT + b-jets), and CMS_2016_PAS_SUS_16_14
+ (jets + MET).
+ * Provide convenience reversed-argument versions of apply and
+ declare methods, to allow presentational choice of declare
+ syntax in situations where the projection argument is very
+ long, and reduce requirements on the user's memory since this
+ is one situation in Rivet where there is no 'most natural'
+ ordering choice.
+ * Adding pTvec() function to 4-vectors and ParticleBase.
+ * Fix --pwd option of the rivet script
+ * Add weights and scaling to Cutflow/s.
+ * Add Et(const ParticleBase&) unbound function.
+ * Fix missing YAML quote mark in rivet-mkanalysis.
+ * Fix constness requirements on ifilter_select() and
+ Particle/JetEffFilter::operator().
+ * src/Analyses/ATLAS_2016_I1458270.cc: Fix inverted particle
+ efficiency filtering.
+ * Add rough ATLAS and CMS photon reco efficiency functions from
+ Delphes (ATLAS and CMS versions are identical, hmmm).
+ * Tidying/fixing make-plots custom z-ticks code. Thanks to Dmitry
+ Kalinkin.
+ * Fix SpiresID -> InspireID in some analyses (show-analysis
+ pointed to non-existing web page).
+ * Add Luminosity_fb to AnalysisInfo.
+ * Added some keywords and Lumi to ATLAS_2016_I1458270.
++++ 16 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/Rivet/Rivet.changes
++++ and /work/SRC/openSUSE:Factory/.Rivet.new/Rivet.changes
Old:
----
Rivet-2.5.2.tar.bz2
New:
----
Rivet-2.5.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Rivet.spec ++++++
--- /var/tmp/diff_new_pack.fLV6vh/_old 2017-06-26 15:56:42.366071446 +0200
+++ /var/tmp/diff_new_pack.fLV6vh/_new 2017-06-26 15:56:42.366071446 +0200
@@ -16,10 +16,10 @@
#
-%define so_name lib%{name}-2_5_2
+%define so_name lib%{name}-2_5_4
Name: Rivet
-Version: 2.5.2
+Version: 2.5.4
Release: 0
Summary: A toolkit for validation of Monte Carlo event generators
License: GPL-2.0
++++++ Rivet-2.5.2.tar.bz2 -> Rivet-2.5.4.tar.bz2 ++++++
++++ 59744 lines of diff (skipped)
++++++ sover.diff ++++++
--- /var/tmp/diff_new_pack.fLV6vh/_old 2017-06-26 15:56:44.465775313 +0200
+++ /var/tmp/diff_new_pack.fLV6vh/_new 2017-06-26 15:56:44.469774749 +0200
@@ -1,59 +1,53 @@
----
- src/Analyses/Makefile.am | 32 ++++++++++++++++----------------
- src/Makefile.am | 2 +-
- src/Tools/Makefile.am | 2 +-
- 3 files changed, 18 insertions(+), 18 deletions(-)
-
-Index: Rivet-2.5.2/src/Analyses/Makefile.am
+Index: Rivet-2.5.4/src/Analyses/Makefile.am
===================================================================
---- Rivet-2.5.2.orig/src/Analyses/Makefile.am
-+++ Rivet-2.5.2/src/Analyses/Makefile.am
-@@ -1,7 +1,7 @@
+--- Rivet-2.5.4.orig/src/Analyses/Makefile.am
++++ Rivet-2.5.4/src/Analyses/Makefile.am
+@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = -Wno-portability
## Flags for building all plugins
AM_LDFLAGS = $(LDFLAGS) -module -avoid-version -L$(FASTJETLIBPATH)
LIBS = $(FASTJETCONFIGLIBADD)
-lib_LTLIBRARIES =
+pkglib_LTLIBRARIES =
- noinst_LTLIBRARIES = libRivetAnalysisTools.la
- libRivetAnalysisTools_la_SOURCES = \
-@@ -12,7 +12,7 @@ libRivetAnalysisTools_la_SOURCES = \
+ BUILT_SOURCES =
+ DISTCLEANFILES =
+@@ -21,7 +21,7 @@ libRivetAnalysisTools_la_SOURCES = \
if ENABLE_ANALYSES
-lib_LTLIBRARIES += RivetALICEAnalyses.la
+pkglib_LTLIBRARIES += RivetALICEAnalyses.la
- RivetALICEAnalyses_la_SOURCES = \
- ALICE_2010_S8624100.cc \
- ALICE_2010_S8625980.cc \
-@@ -24,7 +24,7 @@ RivetALICEAnalyses_la_SOURCES = \
+
+ nodist_RivetALICEAnalyses_la_SOURCES = ALICE__all.cc
+ BUILT_SOURCES += ALICE__all.cc
+@@ -43,7 +43,7 @@ ALICE_ALL = \
ALICE_2015_I1357424.cc
-lib_LTLIBRARIES += RivetATLASAnalyses.la
+pkglib_LTLIBRARIES += RivetATLASAnalyses.la
- RivetATLASAnalyses_la_SOURCES = \
- ATLAS_2010_S8591806.cc \
- ATLAS_2010_S8817804.cc \
-@@ -154,7 +154,7 @@ RivetATLASAnalyses_la_SOURCES += \
+
+ nodist_RivetATLASAnalyses_la_SOURCES = ATLAS_1__all.cc ATLAS_2__all.cc
+ BUILT_SOURCES += ATLAS_1__all.cc ATLAS_2__all.cc
+@@ -207,7 +207,7 @@ ATLAS_ALL_2 += \
ATLAS_2012_I1190891.cc
-lib_LTLIBRARIES += RivetCMSAnalyses.la
+pkglib_LTLIBRARIES += RivetCMSAnalyses.la
- RivetCMSAnalyses_la_SOURCES = \
- CMS_2010_S8547297.cc \
- CMS_2010_S8656010.cc \
-@@ -210,7 +210,7 @@ RivetCMSAnalyses_la_SOURCES += \
- CMS_2012_PAS_QCD_11_010.cc
+
+ nodist_RivetCMSAnalyses_la_SOURCES = CMS__all.cc
+ BUILT_SOURCES += CMS__all.cc
+@@ -289,7 +289,7 @@ CMS_ALL += \
+ CMS_2016_PAS_SUS_16_14.cc
-lib_LTLIBRARIES += RivetLHCbAnalyses.la
+pkglib_LTLIBRARIES += RivetLHCbAnalyses.la
- RivetLHCbAnalyses_la_SOURCES = \
- LHCB_2010_I867355.cc \
- LHCB_2010_S8758301.cc \
-@@ -224,18 +224,18 @@ RivetLHCbAnalyses_la_SOURCES = \
+
+ nodist_RivetLHCbAnalyses_la_SOURCES = LHCb__all.cc
+ BUILT_SOURCES += LHCb__all.cc
+@@ -313,18 +313,18 @@ LHCb_ALL = \
LHCB_2015_I1333223.cc
@@ -72,78 +66,81 @@
-lib_LTLIBRARIES += RivetCDFAnalyses.la
+pkglib_LTLIBRARIES += RivetCDFAnalyses.la
- RivetCDFAnalyses_la_SOURCES = \
- CDF_1988_S1865951.cc \
- CDF_1990_S2089246.cc \
-@@ -278,7 +278,7 @@ RivetCDFAnalyses_la_SOURCES += \
+
+ nodist_RivetCDFAnalyses_la_SOURCES = CDF__all.cc
+ BUILT_SOURCES += CDF__all.cc
+@@ -379,7 +379,7 @@ CDF_ALL += \
CDF_2001_S4563131.cc
-lib_LTLIBRARIES += RivetD0Analyses.la
+pkglib_LTLIBRARIES += RivetD0Analyses.la
- RivetD0Analyses_la_SOURCES = \
- D0_1995_I398175.cc \
- D0_2000_I499943.cc \
-@@ -309,7 +309,7 @@ RivetD0Analyses_la_SOURCES += \
+
+ nodist_RivetD0Analyses_la_SOURCES = D0__all.cc
+ BUILT_SOURCES += D0__all.cc
+@@ -421,7 +421,7 @@ D0_ALL += \
D0_1996_S3324664.cc
-lib_LTLIBRARIES += RivetHERAAnalyses.la
+pkglib_LTLIBRARIES += RivetHERAAnalyses.la
- RivetHERAAnalyses_la_SOURCES = \
- H1_1994_S2919893.cc \
- H1_2000_S4129130.cc
-@@ -319,12 +319,12 @@ RivetHERAAnalyses_la_SOURCES += \
- ZEUS_2001_S4815815.cc
+
+ nodist_RivetHERAAnalyses_la_SOURCES = HERA__all.cc
+ BUILT_SOURCES += HERA__all.cc
+@@ -443,7 +443,7 @@ HERA_ALL += \
+
-lib_LTLIBRARIES += RivetPetraAnalyses.la
+pkglib_LTLIBRARIES += RivetPetraAnalyses.la
- RivetPetraAnalyses_la_SOURCES = \
- JADE_1998_S3612880.cc \
+
+ nodist_RivetPetraAnalyses_la_SOURCES = Petra__all.cc
+ BUILT_SOURCES += Petra__all.cc
+@@ -460,7 +460,7 @@ Petra_ALL = \
+ TASSO_1989_I277658.cc \
TASSO_1990_S2148048.cc
-lib_LTLIBRARIES += RivetLEPAnalyses.la
+pkglib_LTLIBRARIES += RivetLEPAnalyses.la
- RivetLEPAnalyses_la_SOURCES = \
- ALEPH_1991_S2435284.cc \
- ALEPH_1995_I382179.cc \
-@@ -366,7 +366,7 @@ RivetLEPAnalyses_la_SOURCES += \
+
+ nodist_RivetLEPAnalyses_la_SOURCES = LEP__all.cc
+ BUILT_SOURCES += LEP__all.cc
+@@ -521,7 +521,7 @@ LEP_ALL += \
DELPHI_2002_069_CONF_603.cc
-lib_LTLIBRARIES += RivetRHICAnalyses.la
+pkglib_LTLIBRARIES += RivetRHICAnalyses.la
- RivetRHICAnalyses_la_SOURCES = \
- STAR_2006_S6500200.cc \
- STAR_2006_S6860818.cc \
-@@ -380,7 +380,7 @@ RivetRHICAnalyses_la_SOURCES += \
+
+ nodist_RivetRHICAnalyses_la_SOURCES = RHIC__all.cc
+ BUILT_SOURCES += RHIC__all.cc
+@@ -546,7 +546,7 @@ RHIC_ALL += \
STAR_2008_S7993412.cc
-lib_LTLIBRARIES += RivetSPSAnalyses.la
+pkglib_LTLIBRARIES += RivetSPSAnalyses.la
- RivetSPSAnalyses_la_SOURCES = \
- UA1_1990_S2044935.cc \
- UA5_1982_S875503.cc \
-@@ -390,7 +390,7 @@ RivetSPSAnalyses_la_SOURCES = \
+
+ nodist_RivetSPSAnalyses_la_SOURCES = SPS__all.cc
+ BUILT_SOURCES += SPS__all.cc
+@@ -567,7 +567,7 @@ SPS_ALL = \
UA5_1989_S1926373.cc
-lib_LTLIBRARIES += RivetMiscAnalyses.la
+pkglib_LTLIBRARIES += RivetMiscAnalyses.la
- RivetMiscAnalyses_la_SOURCES = \
- E735_1998_S3905616.cc \
- PDG_HADRON_MULTIPLICITIES.cc \
-@@ -419,7 +419,7 @@ RivetMiscAnalyses_la_SOURCES += \
+
+ nodist_RivetMiscAnalyses_la_SOURCES = Misc__all.cc
+ BUILT_SOURCES += Misc__all.cc
+@@ -612,7 +612,7 @@ Misc_ALL += \
SFM_1984_S1178091.cc
-lib_LTLIBRARIES += RivetMCAnalyses.la
+pkglib_LTLIBRARIES += RivetMCAnalyses.la
- RivetMCAnalyses_la_SOURCES = \
- EXAMPLE.cc \
- EXAMPLE_CUTS.cc \
+
+ nodist_RivetMCAnalyses_la_SOURCES = MC__all.cc
+ BUILT_SOURCES += MC__all.cc
Index: Rivet-2.5.2/src/Makefile.am
===================================================================
--- Rivet-2.5.2.orig/src/Makefile.am
@@ -166,3 +163,4 @@
-libRivetTools_la_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_BINRELOC -DDEFAULTDATADIR=\"$(datadir)\" -DDEFAULTLIBDIR=\"$(libdir)\"
+libRivetTools_la_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_BINRELOC -DDEFAULTDATADIR=\"$(datadir)\" -DDEFAULTLIBDIR=\"$(pkglibdir)\"
+
1
0
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
26 Jun '17
Hello community,
here is the log from the commit of package perl-ExtUtils-MakeMaker-CPANfile for openSUSE:Factory checked in at 2017-06-26 15:56:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-ExtUtils-MakeMaker-CPANfile (Old)
and /work/SRC/openSUSE:Factory/.perl-ExtUtils-MakeMaker-CPANfile.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-ExtUtils-MakeMaker-CPANfile"
Mon Jun 26 15:56:36 2017 rev:3 rq:506088 version:0.08
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-ExtUtils-MakeMaker-CPANfile/perl-ExtUtils-MakeMaker-CPANfile.changes 2015-12-16 17:42:25.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.perl-ExtUtils-MakeMaker-CPANfile.new/perl-ExtUtils-MakeMaker-CPANfile.changes 2017-06-26 15:56:40.226373219 +0200
@@ -1,0 +2,10 @@
+Wed Jun 21 05:36:40 UTC 2017 - coolo(a)suse.com
+
+- updated to 0.08
+ see /usr/share/doc/packages/perl-ExtUtils-MakeMaker-CPANfile/Changes
+
+ 0.08 2017/06/18
+ - fixed to convert META_ADD/MERGE properly when 2.0 elements
+ are found (RT-122124)
+
+-------------------------------------------------------------------
Old:
----
ExtUtils-MakeMaker-CPANfile-0.07.tar.gz
New:
----
ExtUtils-MakeMaker-CPANfile-0.08.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-ExtUtils-MakeMaker-CPANfile.spec ++++++
--- /var/tmp/diff_new_pack.NS5n4f/_old 2017-06-26 15:56:41.282224307 +0200
+++ /var/tmp/diff_new_pack.NS5n4f/_new 2017-06-26 15:56:41.286223743 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-ExtUtils-MakeMaker-CPANfile
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,24 @@
Name: perl-ExtUtils-MakeMaker-CPANfile
-Version: 0.07
+Version: 0.08
Release: 0
%define cpan_name ExtUtils-MakeMaker-CPANfile
Summary: Cpanfile Support for Eumm
License: Artistic-1.0 or GPL-1.0+
Group: Development/Libraries/Perl
Url: http://search.cpan.org/dist/ExtUtils-MakeMaker-CPANfile/
-Source0: http://www.cpan.org/authors/id/I/IS/ISHIGAKI/%{cpan_name}-%{version}.tar.gz
+Source0: https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/%{cpan_name}-%{version}.…
Source1: cpanspec.yml
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
+BuildRequires: perl(CPAN::Meta::Converter) >= 2.141170
BuildRequires: perl(Module::CPANfile)
BuildRequires: perl(Test::More) >= 0.88
BuildRequires: perl(version) >= 0.76
+Requires: perl(CPAN::Meta::Converter) >= 2.141170
Requires: perl(Module::CPANfile)
Requires: perl(Test::More) >= 0.88
Requires: perl(version) >= 0.76
@@ -65,6 +67,7 @@
%files -f %{name}.files
%defattr(-,root,root,755)
-%doc Changes LICENSE README.md
+%doc Changes README.md
+%license LICENSE
%changelog
++++++ ExtUtils-MakeMaker-CPANfile-0.07.tar.gz -> ExtUtils-MakeMaker-CPANfile-0.08.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-MakeMaker-CPANfile-0.07/Changes new/ExtUtils-MakeMaker-CPANfile-0.08/Changes
--- old/ExtUtils-MakeMaker-CPANfile-0.07/Changes 2015-12-09 15:20:08.000000000 +0100
+++ new/ExtUtils-MakeMaker-CPANfile-0.08/Changes 2017-06-18 04:47:02.000000000 +0200
@@ -1,5 +1,9 @@
Revision history for Perl extension ExtUtils-MakeMaker-CPANfile
+0.08 2017/06/18
+ - fixed to convert META_ADD/MERGE properly when 2.0 elements
+ are found (RT-122124)
+
0.07 2015/12/09
- supported recommends, suggests, conflicts
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-MakeMaker-CPANfile-0.07/META.json new/ExtUtils-MakeMaker-CPANfile-0.08/META.json
--- old/ExtUtils-MakeMaker-CPANfile-0.07/META.json 2015-12-09 15:20:58.000000000 +0100
+++ new/ExtUtils-MakeMaker-CPANfile-0.08/META.json 2017-06-18 04:47:16.000000000 +0200
@@ -4,13 +4,13 @@
"Kenichi Ishigaki <ishigaki(a)cpan.org>"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.143240",
+ "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.143240",
"license" : [
"perl_5"
],
"meta-spec" : {
"url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
- "version" : "2"
+ "version" : 2
},
"name" : "ExtUtils-MakeMaker-CPANfile",
"no_index" : {
@@ -32,6 +32,7 @@
},
"runtime" : {
"requires" : {
+ "CPAN::Meta::Converter" : "2.141170",
"Cwd" : "0",
"ExtUtils::MakeMaker" : "6.17",
"File::Path" : "0",
@@ -47,5 +48,5 @@
"url" : "https://github.com/charsbar/ExtUtils-MakeMaker-CPANfile"
}
},
- "version" : "0.07"
+ "version" : "0.08"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-MakeMaker-CPANfile-0.07/META.yml new/ExtUtils-MakeMaker-CPANfile-0.08/META.yml
--- old/ExtUtils-MakeMaker-CPANfile-0.07/META.yml 2015-12-09 15:20:58.000000000 +0100
+++ new/ExtUtils-MakeMaker-CPANfile-0.08/META.yml 2017-06-18 04:47:16.000000000 +0200
@@ -7,7 +7,7 @@
configure_requires:
ExtUtils::MakeMaker: '0'
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.143240'
+generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.143240'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -18,6 +18,7 @@
- t
- inc
requires:
+ CPAN::Meta::Converter: '2.141170'
Cwd: '0'
ExtUtils::MakeMaker: '6.17'
File::Path: '0'
@@ -26,4 +27,4 @@
version: '0.76'
resources:
repository: https://github.com/charsbar/ExtUtils-MakeMaker-CPANfile
-version: '0.07'
+version: '0.08'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-MakeMaker-CPANfile-0.07/Makefile.PL new/ExtUtils-MakeMaker-CPANfile-0.08/Makefile.PL
--- old/ExtUtils-MakeMaker-CPANfile-0.07/Makefile.PL 2013-09-22 10:59:52.000000000 +0200
+++ new/ExtUtils-MakeMaker-CPANfile-0.08/Makefile.PL 2017-06-18 04:42:55.000000000 +0200
@@ -13,6 +13,7 @@
'Cwd' => '0',
'File::Path' => '0',
'Module::CPANfile' => '0',
+ 'CPAN::Meta::Converter' => '2.141170',
'Test::More' => '0.88',
'version' => '0.76',
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-MakeMaker-CPANfile-0.07/lib/ExtUtils/MakeMaker/CPANfile.pm new/ExtUtils-MakeMaker-CPANfile-0.08/lib/ExtUtils/MakeMaker/CPANfile.pm
--- old/ExtUtils-MakeMaker-CPANfile-0.07/lib/ExtUtils/MakeMaker/CPANfile.pm 2015-12-09 15:19:15.000000000 +0100
+++ new/ExtUtils-MakeMaker-CPANfile-0.08/lib/ExtUtils/MakeMaker/CPANfile.pm 2017-06-18 04:43:05.000000000 +0200
@@ -7,7 +7,7 @@
use Module::CPANfile;
use version;
-our $VERSION = "0.07";
+our $VERSION = "0.08";
sub import {
my $class = shift;
@@ -81,7 +81,29 @@
}
}
if ($requires_2_0) { # for better recommends support
- $params{META_MERGE}{"meta-spec"} ||= {version => 2};
+ # stash prereqs, which is already converted
+ my $tmp_prereqs = delete $params{META_MERGE}{prereqs};
+
+ require CPAN::Meta::Converter;
+ for my $key (qw/META_ADD META_MERGE/) {
+ next unless %{$params{$key} || {}};
+ my $converter = CPAN::Meta::Converter->new($params{$key}, default_version => 1.4);
+ $params{$key} = $converter->upgrade_fragment;
+ }
+
+ if ($params{META_MERGE}{prereqs}) {
+ require CPAN::Meta::Requirements;
+ for my $phase (keys %{$tmp_prereqs || {}}) {
+ for my $rel (keys %{$tmp_prereqs->{$phase} || {}}) {
+ my $req1 = CPAN::Meta::Requirements->from_string_hash($tmp_prereqs->{$phase}{$rel});
+ my $req2 = CPAN::Meta::Requirements->from_string_hash($params{META_MERGE}{prereqs}{$phase}{$rel});
+ $req1->add_requirements($req2);
+ $params{META_MERGE}{prereqs}{$phase} = $req1->as_string_hash;
+ }
+ }
+ } else {
+ $params{META_MERGE}{prereqs} = $tmp_prereqs;
+ }
}
# XXX: better to use also META_MERGE when applicable?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ExtUtils-MakeMaker-CPANfile-0.07/t/01_basic.t new/ExtUtils-MakeMaker-CPANfile-0.08/t/01_basic.t
--- old/ExtUtils-MakeMaker-CPANfile-0.07/t/01_basic.t 2013-09-22 10:59:52.000000000 +0200
+++ new/ExtUtils-MakeMaker-CPANfile-0.08/t/01_basic.t 2017-06-18 04:42:55.000000000 +0200
@@ -35,18 +35,18 @@
{ # generate cpanfile
open my $fh, '>', "$testdir/cpanfile" or die;
print $fh <<'CF_END';
- requires 'ExtUtils::MakeMaker', 6.17;
+ requires 'ExtUtils::MakeMaker', '6.17';
on configure => sub {
- requires 'ExtUtils::MakeMaker', 6.30;
+ requires 'ExtUtils::MakeMaker', '6.30';
};
on build => sub {
- requires 'Test::More', 0.47;
+ requires 'Test::More', '0.47';
};
on test => sub {
- requires 'Test::More', 0.88;
+ requires 'Test::More', '0.88';
};
CF_END
}
@@ -64,6 +64,7 @@
ok $makefile && $makefile =~ /(?:_REQUIRES|PREREQ_PM)\s*=>\s*{\s*[^{]*ExtUtils::MakeMaker\s*=>\s*q\[/, "EUMM is listed as some kind of prereqs";
ok $makefile && $makefile =~ /(?:_REQUIRES|PREREQ_PM)\s*=>\s*{\s*[^{]*Test::More\s*=>\s*q\[/, "Test::More is listed as some kind of prereqs";
+note do { local $/; open my $fh, '<', "$testdir/MYMETA.json"; <$fh> };
done_testing;
END {
1
0
Hello community,
here is the log from the commit of package perl-RDF-Trine for openSUSE:Factory checked in at 2017-06-26 15:56:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-RDF-Trine (Old)
and /work/SRC/openSUSE:Factory/.perl-RDF-Trine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-RDF-Trine"
Mon Jun 26 15:56:32 2017 rev:7 rq:506085 version:1.018
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-RDF-Trine/perl-RDF-Trine.changes 2017-06-12 15:33:08.726321157 +0200
+++ /work/SRC/openSUSE:Factory/.perl-RDF-Trine.new/perl-RDF-Trine.changes 2017-06-26 15:56:35.866988005 +0200
@@ -1,0 +2,18 @@
+Wed Jun 21 06:17:22 UTC 2017 - coolo(a)suse.com
+
+- updated to 1.018
+ see /usr/share/doc/packages/perl-RDF-Trine/Changes.ttl
+
+ <http://kasei.us/code/files/RDF-Trine-1.018.tar.gz>
+ dcterms:isVersionOf <http://kasei.us/code/rdf-trine/#project> ;
+ dcterms:replaces <http://kasei.us/code/files/RDF-Trine-1.017.tar.gz> ;
+
+ doap:Version [
+ doap:revision "1.018" ;
+ doap:created "2017-06-20" ;
+ ];
+ asc:changes [
+ asc:update "Fix API inconsistency in RDF::Trine::Store::SPARQL (#149, #150 from @minusdavid)." ;
+ ] .
+
+-------------------------------------------------------------------
Old:
----
RDF-Trine-1.017.tar.gz
New:
----
RDF-Trine-1.018.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-RDF-Trine.spec ++++++
--- /var/tmp/diff_new_pack.Qmqzit/_old 2017-06-26 15:56:37.082816553 +0200
+++ /var/tmp/diff_new_pack.Qmqzit/_new 2017-06-26 15:56:37.086815990 +0200
@@ -17,7 +17,7 @@
Name: perl-RDF-Trine
-Version: 1.017
+Version: 1.018
Release: 0
%define cpan_name RDF-Trine
Summary: An RDF Framework for Perl
++++++ RDF-Trine-1.017.tar.gz -> RDF-Trine-1.018.tar.gz ++++++
++++ 1916 lines of diff (skipped)
1
0