$ git diff --patch-with-stat --summary 04e449c5f43880a5d72dba9a7909aec070c5062d..257cb33b707f2fe1da120ff5b040f6168644a18d
.abf.yml | 2 +-
calamares-bug1286.patch | 12 ++++++++++++
calamares.spec | 10 ++++++----
3 files changed, 19 insertions(+), 5 deletions(-)
create mode 100644 calamares-bug1286.patch
diff --git a/.abf.yml b/.abf.yml
index b7fc6de..157394f 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
sources:
OpenMandriva-adverts.tar.xz: d0833604f1ce5bdcc7a1560cc51f4c392a9ed665
- calamares-3.2.16.tar.gz: d46be6790dea77ae327b5fc71e8b0bf85729b759
+ calamares-3.2.17.1.tar.gz: 40b2df513648cde937ecff6257cc790eac1ce5b4
openmandriva-install.svg: a64c8fd2b0e11766cfdcc0c345664b99c4b108b7
diff --git a/calamares-bug1286.patch b/calamares-bug1286.patch
new file mode 100644
index 0000000..612e350
--- /dev/null
+++ b/calamares-bug1286.patch
@@ -0,0 +1,12 @@
+diff -up calamares-3.2.17.1/CMakeLists.txt.omv~ calamares-3.2.17.1/CMakeLists.txt
+--- calamares-3.2.17.1/CMakeLists.txt.omv~ 2019-12-19 01:55:25.761186246 +0100
++++ calamares-3.2.17.1/CMakeLists.txt 2019-12-19 01:55:44.005185361 +0100
+@@ -220,7 +220,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang
+
+ set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
+
+- set( CALAMARES_AUTOMOC_OPTIONS "-butils/moc-warnings.h" )
++ set( CALAMARES_AUTOMOC_OPTIONS --include utils/moc-warnings.h )
+ set( CALAMARES_AUTOUIC_OPTIONS --include utils/moc-warnings.h )
+ else()
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
diff --git a/calamares.spec b/calamares.spec
index aab80d6..c585eb3 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -5,12 +5,12 @@
Summary: Distribution-independent installer framework
Name: calamares
-Version: 3.2.16
+Version: 3.2.17.1
%if "%{git}" != ""
Release: 0.%{git}.1
Source0: calamares-%{version}-%{git}.tar.xz
%else
-Release: 3
+Release: 2
# git archive --format=tar --prefix=calamares-1.1.0-$(date +%Y%m%d)/ HEAD | xz -vf > calamares-1.1.0-$(date +%Y%m%d).tar.xz
#Source0: calamares-%{version}-%{calamdate}.tar.xz
Source0: https://github.com/calamares/calamares/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -60,6 +60,7 @@ Patch6: 0003-disable-lvm.patch
Patch7: calamares-3.2.16-random-seed-location.patch
Patch10: esp-to-boot-flag.patch
Patch11: kpmcore4-api-1.patch
+Patch12: calamares-bug1286.patch
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
@@ -95,6 +96,7 @@ BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Service)
BuildRequires: cmake(KF5Parts)
BuildRequires: cmake(KPMcore) >= 4.0.0
+BuildRequires: cmake(AppStreamQt)
BuildRequires: yaml-cpp-devel
BuildRequires: pkgconfig(python3)
BuildRequires: boost-devel >= 1.54.0
@@ -261,8 +263,8 @@ strings:
bootloaderEntryName: "openmandriva"
productUrl: "$HOME_URL"
supportUrl: "$BUG_REPORT_URL"
- knownIssuesUrl: "https://wiki.openmandriva.org/en/4.0/Errata"
- releaseNotesUrl: "https://wiki.openmandriva.org/en/4.0/Release_Notes"
+ knownIssuesUrl: "https://wiki.openmandriva.org/en/${VERSION_ID}/Errata"
+ releaseNotesUrl: "https://wiki.openmandriva.org/en/${VERSION_ID}/Release_Notes"
images:
productLogo: "%{_iconsdir}/openmandriva.svg"