commit grantlee5 for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package grantlee5 for openSUSE:Leap:15.2
checked in at 2020-05-24 18:06:27
Comparing /work/SRC/openSUSE:Leap:15.2/grantlee5 (Old)
and /work/SRC/openSUSE:Leap:15.2/.grantlee5.new.2738 (New)
Package is "grantlee5"
Sun May 24 18:06:27 2020 rev:15 rq:806160 version:5.2.0
Changes:
--- /work/SRC/openSUSE:Leap:15.2/grantlee5/grantlee5.changes2020-04-14
14:19:41.313216605 +0200
+++ /work/SRC/openSUSE:Leap:15.2/.grantlee5.new.2738/grantlee5.changes
2020-05-24 18:06:28.765822317 +0200
@@ -1,0 +2,5 @@
+Thu May 14 20:32:27 UTC 2020 - Fabian Vogt
+
+- Don't ignore the exit code of make test
+
+---
Other differences:
--
++ grantlee5.spec ++
--- /var/tmp/diff_new_pack.LzYDTU/_old 2020-05-24 18:06:29.197823251 +0200
+++ /var/tmp/diff_new_pack.LzYDTU/_new 2020-05-24 18:06:29.201823260 +0200
@@ -76,7 +76,7 @@
%if %{with tests}
%check
export CTEST_OUTPUT_ON_FAILURE=1
-xvfb-run -a make test -C %{__builddir} ||:
+xvfb-run -a make test -C %{__builddir}
%endif
%post -p /sbin/ldconfig
commit grantlee5 for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package grantlee5 for openSUSE:Leap:15.2
checked in at 2020-04-14 14:19:40
Comparing /work/SRC/openSUSE:Leap:15.2/grantlee5 (Old)
and /work/SRC/openSUSE:Leap:15.2/.grantlee5.new.3248 (New)
Package is "grantlee5"
Tue Apr 14 14:19:40 2020 rev:14 rq:791922 version:5.2.0
Changes:
--- /work/SRC/openSUSE:Leap:15.2/grantlee5/grantlee5.changes2020-02-14
17:58:10.246829665 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.grantlee5.new.3248/grantlee5.changes
2020-04-14 14:19:41.313216605 +0200
@@ -1,0 +2,8 @@
+Tue Mar 31 09:18:33 UTC 2020 - Matthias Fehring
+
+- Require cmake(Qt5LinguistTools) for building to enable testing of
+ internationalization
+- Use xvfb-run to run all tests, this obsoletes the following patch:
+ * grantlee-5.2.0-disable-textdocument-tests.patch
+
+---
Old:
grantlee-5.2.0-disable-textdocument-tests.patch
Other differences:
--
++ grantlee5.spec ++
--- /var/tmp/diff_new_pack.l8Yx4Z/_old 2020-04-14 14:19:41.685216883 +0200
+++ /var/tmp/diff_new_pack.l8Yx4Z/_new 2020-04-14 14:19:41.689216886 +0200
@@ -1,7 +1,7 @@
#
# spec file for package grantlee5
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,13 +34,14 @@
Patch0: includes.diff
# PATCH-FIX-OPENSUSE grantlee-5.2.0-fix-ctest-ld-library-path.patch -- set ld
library path for tests
Patch1: grantlee-5.2.0-fix-ctest-ld-library-path.patch
-# PATCH-FIX-OPENSUSE grantlee-5.2.0-fix-ctest-ld-library-path.patch -- disable
tests for now that throwing an exception for some reason
-Patch2: grantlee-5.2.0-disable-textdocument-tests.patch
BuildRequires: cmake >= 3.5
BuildRequires: cmake(Qt5Core) >= 5.3
BuildRequires: cmake(Qt5Gui) >= 5.3
BuildRequires: cmake(Qt5Qml) >= 5.3
%if %{with tests}
+BuildRequires: /usr/bin/Xvfb
+BuildRequires: xvfb-run
+BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: cmake(Qt5Test) >= 5.3
%endif
@@ -74,7 +75,8 @@
%if %{with tests}
%check
-%ctest
+export CTEST_OUTPUT_ON_FAILURE=1
+xvfb-run -a make test -C %{__builddir} ||:
%endif
%post -p /sbin/ldconfig
commit grantlee5 for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package grantlee5 for openSUSE:Leap:15.2
checked in at 2020-02-14 17:58:03
Comparing /work/SRC/openSUSE:Leap:15.2/grantlee5 (Old)
and /work/SRC/openSUSE:Leap:15.2/.grantlee5.new.26092 (New)
Package is "grantlee5"
Fri Feb 14 17:58:03 2020 rev:13 rq:768740 version:5.2.0
Changes:
--- /work/SRC/openSUSE:Leap:15.2/grantlee5/grantlee5.changes2020-01-30
14:49:39.130878586 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.grantlee5.new.26092/grantlee5.changes
2020-02-14 17:58:10.246829665 +0100
@@ -1,0 +2,36 @@
+Thu Dec 19 13:46:39 UTC 2019 - Matthias Fehring
+
+- Enable and run tests
+ * add grantlee-5.2.0-fix-ctest-ld-library-path.patch to set correct
+ld library path as we skip rpath
+ * add grantlee-5.2.0-disable-textdocument-tests.patch to disable
+some tests
+
+---
+Wed Dec 18 23:48:44 UTC 2019 - Matthias Fehring
+
+- Update to 5.2.0
+ * Increase CMake requirement to version 3.5
+ * Port scriptable extensions to QJSEngine provided by QtQml
+ * Support reading properties from Q_GADGETS
+ * Remove TestCocoon integration
+ * Clean up documentation to clarify introspection requirements
+ * Fix mixing of {% include %} and {% extends %} tags
+ * Fix various bugs discovered by fuzzing
+ * Remove use of TR1 library features from unit tests
+ * Remove obsolete build options
+ * Document that loading templates from Qt Resources is possible
+- Remove obsolete patches now included upstream
+ * fix-build-with-Qt-5.13.patch
+ * 0001-Remove-vestigial-ansi-flag.patch
+ * 0002-Fix-mix-of-inclusion-and-extension.patch
+- Rebase pachtes
+ * includes.diff
+
+---
+Mon Dec 9 17:29:52 UTC 2019 - Matthias Fehring
+
+- Add patch to fix segfault when mixing include and extend
+ * 0002-Fix-mix-of-inclusion-and-extension.patch
+
+---
Old:
0001-Remove-vestigial-ansi-flag.patch
fix-build-with-Qt-5.13.patch
grantlee-5.1.0.tar.gz
New:
grantlee-5.2.0-disable-textdocument-tests.patch
grantlee-5.2.0-fix-ctest-ld-library-path.patch
grantlee-5.2.0.tar.gz
Other differences:
--
++ grantlee5.spec ++
--- /var/tmp/diff_new_pack.WsKIvL/_old 2020-02-14 17:58:10.934830077 +0100
+++ /var/tmp/diff_new_pack.WsKIvL/_new 2020-02-14 17:58:10.934830077 +0100
@@ -1,7 +1,7 @@
#
# spec file for package grantlee5
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,27 +16,33 @@
#
+%bcond_without tests
+
+%{?!cmake_build:%global cmake_build() make %{?_smp_mflags} VERBOSE=1}
+%{?!cmake_install:%global cmake_install() DESTDIR=%{buildroot} make install}
+
Name: grantlee5
-Version:5.1.0
+Version:5.2.0
Release:0
Summary:Qt string template library
License:LGPL-2.1-or-later
Group: System/Libraries
URL:http://grantlee.org/
-Source: http://downloads.grantlee.org/grantlee-%{version}.tar.gz
+Source: http://www.grantlee.org/downloads/grantlee-%{version}.tar.gz
Source2:baselibs.conf
-# PATCH-FIX-UPSTREAM includes.diff -- since upstream doesn't provide a way to
install to custom directory, we cheat!
+# PATCH-FIX-OPENSUSE includes.diff -- since upstream doesn't provide a way to
install to custom directory, we cheat!
Patch0: includes.diff
-# PATCH-FIX-UPSTREAM fix-build-with-Qt-5.13.patch
-Patch1: fix-build-with-Qt-5.13.patch
-# PATCH-FIX-UPSTREAM
-Patch2: 0001-Remove-vestigial-ansi-flag.patch
-BuildRequires: cmake >= 3.1
-BuildRequires: doxygen
-BuildRequires: pkgconfig
-BuildRequires: pkgconfig(Qt5Core) >= 5.3
-BuildRequires: pkgconfig(Qt5Gui) >= 5.3
-BuildRequires: pkgconfig(Qt5Script) >= 5.3
+# PATCH-FIX-OPENSUSE grantlee-5.2.0-fix-ctest-ld-library-path.patch -- set ld
library path for tests
+Patch1: grantlee-5.2.0-fix-ctest-ld-library-path.patch
+# PATCH-FIX-OPENSUSE grantlee-5.2.0-fix-ctest-ld-library-path.patch -- disable
tests for now that throwing an exception for some reason
+Patch2: grantlee-5.2.0-disable-textdocument-tests.patch
+BuildRequires: cmake >= 3.5
+BuildRequires: cmake(Qt5Core) >= 5.3
+BuildRequires: cmake(Qt5Gui) >= 5.3
+BuildRequires: cmake(Qt5Qml) >= 5.3
+%if %{with tests}
+BuildRequires: cmake(Qt5Test) >= 5.3
+%endif
%description
Grantlee is a string template engine based on the Django template system and
@@ -46,9 +52,9 @@
Summary:
commit grantlee5 for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package grantlee5 for openSUSE:Leap:15.2
checked in at 2020-01-30 14:48:59
Comparing /work/SRC/openSUSE:Leap:15.2/grantlee5 (Old)
and /work/SRC/openSUSE:Leap:15.2/.grantlee5.new.26092 (New)
Package is "grantlee5"
Thu Jan 30 14:48:59 2020 rev:12 rq:753182 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Leap:15.2/grantlee5/grantlee5.changes2020-01-15
15:08:49.782018887 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.grantlee5.new.26092/grantlee5.changes
2020-01-30 14:49:39.130878586 +0100
@@ -1,0 +2,12 @@
+Wed Jul 31 14:55:56 UTC 2019 - Fabian Vogt
+
+- Add patch to fix build with newer CMake:
+ * 0001-Remove-vestigial-ansi-flag.patch
+
+---
+Wed Apr 10 17:42:44 UTC 2019 - Christophe Giboudeaux
+
+- Add fix-build-with-Qt-5.13.patch
+- Run spec-cleaner
+
+---
New:
0001-Remove-vestigial-ansi-flag.patch
fix-build-with-Qt-5.13.patch
Other differences:
--
++ grantlee5.spec ++
--- /var/tmp/diff_new_pack.EuO3Z1/_old 2020-01-30 14:49:39.518878792 +0100
+++ /var/tmp/diff_new_pack.EuO3Z1/_new 2020-01-30 14:49:39.518878792 +0100
@@ -1,7 +1,7 @@
#
# spec file for package grantlee5
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -20,19 +20,23 @@
Version:5.1.0
Release:0
Summary:Qt string template library
-License:LGPL-2.1+
+License:LGPL-2.1-or-later
Group: System/Libraries
-Url:http://grantlee.org/
+URL:http://grantlee.org/
Source: http://downloads.grantlee.org/grantlee-%{version}.tar.gz
Source2:baselibs.conf
# PATCH-FIX-UPSTREAM includes.diff -- since upstream doesn't provide a way to
install to custom directory, we cheat!
Patch0: includes.diff
+# PATCH-FIX-UPSTREAM fix-build-with-Qt-5.13.patch
+Patch1: fix-build-with-Qt-5.13.patch
+# PATCH-FIX-UPSTREAM
+Patch2: 0001-Remove-vestigial-ansi-flag.patch
BuildRequires: cmake >= 3.1
BuildRequires: doxygen
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(Qt5Core) >= 5.3
BuildRequires: pkgconfig(Qt5Gui) >= 5.3
BuildRequires: pkgconfig(Qt5Script) >= 5.3
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Grantlee is a string template engine based on the Django template system and
@@ -51,49 +55,33 @@
grantlee.
%prep
-%setup -q -n grantlee-%{version}
-%patch0 -p1
+%autosetup -p1 -n grantlee-%{version}
%build
-%if "%{?_lib}" == "lib64"
-SUFFIX="64"
-%else
-SUFFIX=""
-%endif
-mkdir -p build
-pushd build
-cmake .. \
- cmake -DCMAKE_BUILD_TYPE=None \\\
- -DCMAKE_C_FLAGS="%{optflags} -DNDEBUG" \\\
- -DCMAKE_CXX_FLAGS="%{optflags} -DNDEBUG" \\\
- -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined
-Wl,-Bsymbolic-functions" \\\
- -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined
-Wl,-Bsymbolic-functions" \\\
- -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined
-Wl,-Bsymbolic-functions" \\\
- -DCMAKE_VERBOSE_MAKEFILE=ON \\\
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \\\
- -DBUILD_TESTS=OFF \\\
- -DLIB_SUFFIX=$SUFFIX ..
-
- make %{?_smp_mflags} VERBOSE=1
-popd
+%cmake \
+ -DCMAKE_BUILD_TYPE=None \
+ -DBUILD_TESTS=OFF
+
+# Still not available on all leap flavors
+# %%cmake_build
+%make_jobs
%install
-%makeinstall -C build
+%cmake_install
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING* README*
+%license COPYING*
+%doc AUTHORS CHANGELOG README*
%{_libdir}/libGrantlee_TextDocument.so.*
%{_libdir}/libGrantlee_Templates.so.*
%{_libdir}/grantlee/
%files devel
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING* README*
+%license COPYING*
+%doc AUTHORS CHANGELOG README*
%{_includedir}/grantlee5/
%{_libdir}/libGrantlee_TextDocument.so
%{_libdir}/libGrantlee_Templates.so
++ 0001-Remove-vestigial-ansi-flag.patch ++
>From 9c70e731d1498a366172da7b497ea76252ad8267 Mon Sep 17 00:00:00 2001
From: Stephen Kelly
Date: Sun, 21 Jul 2019 16:00:41 +0100
Subject: [PATCH] Remove vestigial -ansi flag
This causes the compiler to
