Hello community,
here is the log from the commit of package attica-qt5 for openSUSE:Factory checked in at 2019-09-23 12:28:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old)
and /work/SRC/openSUSE:Factory/.attica-qt5.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attica-qt5"
Mon Sep 23 12:28:38 2019 rev:71 rq:732105 version:5.62.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2019-08-19 21:00:08.796942746 +0200
+++ /work/SRC/openSUSE:Factory/.attica-qt5.new.7948/attica-qt5.changes 2019-09-23 12:28:42.245695914 +0200
@@ -1,0 +2,11 @@
+Sat Sep 7 20:36:23 UTC 2019 - Christophe Giboudeaux
+
+- Update to 5.62.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.62.0.php
+- Changes since 5.61.0:
+ * Fix the attica pkgconfig file.
+- Drop 0001-Fix-the-attica-pkgconfig-file.patch, merged upstream.
+
+-------------------------------------------------------------------
Old:
----
0001-Fix-the-attica-pkgconfig-file.patch
attica-5.61.0.tar.xz
attica-5.61.0.tar.xz.sig
New:
----
attica-5.62.0.tar.xz
attica-5.62.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ attica-qt5.spec ++++++
--- /var/tmp/diff_new_pack.mO4gae/_old 2019-09-23 12:28:42.741695832 +0200
+++ /var/tmp/diff_new_pack.mO4gae/_new 2019-09-23 12:28:42.741695832 +0200
@@ -19,7 +19,7 @@
%define sonum 5
%define rname attica
%define _libname KF5Attica
-%define _tar_path 5.61
+%define _tar_path 5.62
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -27,7 +27,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: attica-qt5
-Version: 5.61.0
+Version: 5.62.0
Release: 0
Summary: Open Collaboration Service client library
License: LGPL-2.1-or-later
@@ -39,8 +39,6 @@
Source2: frameworks.keyring
%endif
Source99: baselibs.conf
-# PATCH-FIX-UPSTREAM
-Patch0: 0001-Fix-the-attica-pkgconfig-file.patch
BuildRequires: cmake >= 3.0
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
++++++ attica-5.61.0.tar.xz -> attica-5.62.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.61.0/CMakeLists.txt new/attica-5.62.0/CMakeLists.txt
--- old/attica-5.61.0/CMakeLists.txt 2019-08-03 21:30:09.000000000 +0200
+++ new/attica-5.62.0/CMakeLists.txt 2019-09-07 14:31:47.000000000 +0200
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.61.0") # handled by release scripts
+set(KF5_VERSION "5.62.0") # handled by release scripts
project(Attica VERSION ${KF5_VERSION})
# ECM setup
include(FeatureSummary)
-find_package(ECM 5.61.0 NO_MODULE)
+find_package(ECM 5.62.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.61.0/src/CMakeLists.txt new/attica-5.62.0/src/CMakeLists.txt
--- old/attica-5.61.0/src/CMakeLists.txt 2019-08-03 21:30:09.000000000 +0200
+++ new/attica-5.62.0/src/CMakeLists.txt 2019-09-07 14:31:47.000000000 +0200
@@ -199,6 +199,7 @@
if(NOT WIN32)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/libKF5Attica.pc.cmake
${CMAKE_CURRENT_BINARY_DIR}/libKF5Attica.pc
+ @ONLY
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libKF5Attica.pc
DESTINATION ${KDE_INSTALL_LIBDIR}/pkgconfig
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.61.0/src/atticautils.cpp new/attica-5.62.0/src/atticautils.cpp
--- old/attica-5.61.0/src/atticautils.cpp 2019-08-03 21:30:09.000000000 +0200
+++ new/attica-5.62.0/src/atticautils.cpp 2019-09-07 14:31:47.000000000 +0200
@@ -55,8 +55,8 @@
int hh = 0;
int mm = 0;
int tzsecs = 0;
- if (tz.indexOf(QLatin1String(":")) != -1) {
- QStringList tzlist = tz.split(QStringLiteral(":"));
+ if (tz.indexOf(QLatin1Char(':')) != -1) {
+ QStringList tzlist = tz.split(QLatin1Char(':'));
if (tzlist.count() == 2) {
hh = tzlist[0].toInt();
mm = tzlist[1].toInt();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.61.0/src/cmake/libKF5Attica.pc.cmake new/attica-5.62.0/src/cmake/libKF5Attica.pc.cmake
--- old/attica-5.61.0/src/cmake/libKF5Attica.pc.cmake 2019-08-03 21:30:09.000000000 +0200
+++ new/attica-5.62.0/src/cmake/libKF5Attica.pc.cmake 2019-09-07 14:31:47.000000000 +0200
@@ -1,11 +1,12 @@
-prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${CMAKE_INSTALL_PREFIX}/bin
-libdir=${LIB_INSTALL_DIR}
-includedir=${INCLUDE_INSTALL_DIR}/KF5Attica
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@KDE_INSTALL_FULL_LIBDIR@
+includedir=@KDE_INSTALL_FULL_INCLUDEDIR@
-Name: lib${ATTICA_LIB_SONAME}
+Name: lib@ATTICA_LIB_SONAME@
Description: Qt library to access Open Collaboration Services
-#Requires:
-Version: ${CMAKE_LIBATTICA_VERSION_MAJOR}.${CMAKE_LIBATTICA_VERSION_MINOR}.${CMAKE_LIBATTICA_VERSION_PATCH}
-Libs: -L${LIB_INSTALL_DIR} -l${ATTICA_LIB_SONAME}
-Cflags: -I${INCLUDE_INSTALL_DIR}/KF5Attica
+URL: https://www.kde.org
+Requires: Qt5Core Qt5Network
+Version: @ATTICA_VERSION_STRING@
+Libs: -L@KDE_INSTALL_FULL_LIBDIR@ -l@ATTICA_LIB_SONAME@
+Cflags: -I@KDE_INSTALL_FULL_INCLUDEDIR_KF5@/Attica
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.61.0/src/cmake/libattica.pc.cmake new/attica-5.62.0/src/cmake/libattica.pc.cmake
--- old/attica-5.61.0/src/cmake/libattica.pc.cmake 2019-08-03 21:30:09.000000000 +0200
+++ new/attica-5.62.0/src/cmake/libattica.pc.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${CMAKE_INSTALL_PREFIX}/bin
-libdir=${LIB_INSTALL_DIR}
-includedir=${INCLUDE_INSTALL_DIR}
-
-Name: lib${ATTICA_LIB_SONAME}
-Description: Qt library to access Open Collaboration Services
-#Requires:
-Version: ${CMAKE_LIBATTICA_VERSION_MAJOR}.${CMAKE_LIBATTICA_VERSION_MINOR}.${CMAKE_LIBATTICA_VERSION_PATCH}
-Libs: -L${LIB_INSTALL_DIR} -l${ATTICA_LIB_SONAME}
-Cflags: -I${INCLUDE_INSTALL_DIR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.61.0/src/content.cpp new/attica-5.62.0/src/content.cpp
--- old/attica-5.61.0/src/content.cpp 2019-08-03 21:30:09.000000000 +0200
+++ new/attica-5.62.0/src/content.cpp 2019-09-07 14:31:47.000000000 +0200
@@ -215,18 +215,18 @@
DownloadDescription desc;
Attica::DownloadDescription::Type downloadType = Attica::DownloadDescription::LinkDownload;
- if (attribute(QLatin1String("downloadway") + num) == QLatin1String("0")) {
+ if (attribute(QLatin1String("downloadway") + num) == QLatin1Char('0')) {
downloadType = Attica::DownloadDescription::FileDownload;
- } else if (attribute(QLatin1String("downloadway") + num) == QLatin1String("1")) {
+ } else if (attribute(QLatin1String("downloadway") + num) == QLatin1Char('1')) {
downloadType = Attica::DownloadDescription::LinkDownload;
- } else if (attribute(QLatin1String("downloadway") + num) == QLatin1String("2")) {
+ } else if (attribute(QLatin1String("downloadway") + num) == QLatin1Char('2')) {
downloadType = Attica::DownloadDescription::PackageDownload;
}
desc.setType(downloadType);
desc.setId(number);
desc.setName(attribute(QLatin1String("downloadname") + num));
desc.setDistributionType(attribute(QLatin1String("downloadtype") + num));
- desc.setHasPrice(attribute(QLatin1String("downloadbuy") + num) == QLatin1String("1"));
+ desc.setHasPrice(attribute(QLatin1String("downloadbuy") + num) == QLatin1Char('1'));
desc.setLink(attribute(QLatin1String("downloadlink") + num));
desc.setPriceReason(attribute(QLatin1String("downloadreason") + num));
desc.setPriceAmount(attribute(QLatin1String("downloadprice") + num));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.61.0/src/projectparser.cpp new/attica-5.62.0/src/projectparser.cpp
--- old/attica-5.61.0/src/projectparser.cpp 2019-08-03 21:30:09.000000000 +0200
+++ new/attica-5.62.0/src/projectparser.cpp 2019-09-07 14:31:47.000000000 +0200
@@ -54,7 +54,7 @@
} else if (xml.name() == QLatin1String("specfile")) {
project.setSpecFile(xml.readElementText());
} else if (xml.name() == QLatin1String("developers")) {
- project.setDevelopers(xml.readElementText().split(QStringLiteral("\n")));
+ project.setDevelopers(xml.readElementText().split(QLatin1Char('\n')));
} else if (xml.name() == QLatin1String("projectlist")) {
QXmlStreamReader list_xml(xml.readElementText());
while (!list_xml.atEnd()) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.61.0/src/provider.cpp new/attica-5.62.0/src/provider.cpp
--- old/attica-5.61.0/src/provider.cpp 2019-08-03 21:30:09.000000000 +0200
+++ new/attica-5.62.0/src/provider.cpp 2019-09-07 14:31:47.000000000 +0200
@@ -456,7 +456,7 @@
return nullptr;
}
- QUrl url = createUrl(QStringLiteral("achievements/content/") + contentId + achievementId);
+ QUrl url = createUrl(QLatin1String("achievements/content/") + contentId + achievementId);
QUrlQuery q(url);
q.addQueryItem(QStringLiteral("user_id"), userId);
url.setQuery(q);
@@ -619,7 +619,7 @@
postParameters.insert(QLatin1String("url"), project.url());
}
if (!project.developers().isEmpty()) {
- postParameters.insert(QLatin1String("developers"), project.developers().join(QLatin1String("\n")));
+ postParameters.insert(QLatin1String("developers"), project.developers().join(QLatin1Char('\n')));
}
if (!project.version().isEmpty()) {
postParameters.insert(QLatin1String("version"), project.version());
@@ -1005,7 +1005,7 @@
return nullptr;
}
- QUrl url = createUrl(QStringLiteral("message/") + folder.id());
+ QUrl url = createUrl(QLatin1String("message/") + folder.id());
QUrlQuery q(url);
q.addQueryItem(QStringLiteral("status"), QString::number(status));
url.setQuery(q);
@@ -1101,19 +1101,19 @@
for (const Category &category : categories) {
categoryIds.append(category.id());
}
- q.addQueryItem(QStringLiteral("categories"), categoryIds.join(QLatin1String("x")));
+ q.addQueryItem(QStringLiteral("categories"), categoryIds.join(QLatin1Char('x')));
QStringList distributionIds;
for (const Distribution &distribution : distributions) {
distributionIds.append(QString(distribution.id()));
}
- q.addQueryItem(QStringLiteral("distribution"), distributionIds.join(QLatin1String(",")));
+ q.addQueryItem(QStringLiteral("distribution"), distributionIds.join(QLatin1Char(',')));
QStringList licenseIds;
for (const License &license : licenses) {
licenseIds.append(QString(license.id()));
}
- q.addQueryItem(QStringLiteral("license"), licenseIds.join(QLatin1String(",")));
+ q.addQueryItem(QStringLiteral("license"), licenseIds.join(QLatin1Char(',')));
if (!person.isEmpty()) {
q.addQueryItem(QStringLiteral("user"), person);
@@ -1322,7 +1322,7 @@
return nullptr;
}
- QUrl url = createUrl(QStringLiteral("fan/data/") + contentId);
+ QUrl url = createUrl(QLatin1String("fan/data/") + contentId);
QUrlQuery q(url);
q.addQueryItem(QStringLiteral("contentid"), contentId);
q.addQueryItem(QStringLiteral("page"), QString::number(page));