commit grantlee5 for openSUSE:Factory
Hello community,
here is the log from the commit of package grantlee5 for openSUSE:Factory
checked in at 2020-05-16 22:26:30
Comparing /work/SRC/openSUSE:Factory/grantlee5 (Old)
and /work/SRC/openSUSE:Factory/.grantlee5.new.2738 (New)
Package is "grantlee5"
Sat May 16 22:26:30 2020 rev:8 rq:805835 version:5.2.0
Changes:
--- /work/SRC/openSUSE:Factory/grantlee5/grantlee5.changes 2020-04-05
20:51:54.721088868 +0200
+++ /work/SRC/openSUSE:Factory/.grantlee5.new.2738/grantlee5.changes
2020-05-16 22:26:37.761309452 +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.WIyqHc/_old 2020-05-16 22:26:38.357310675 +0200
+++ /var/tmp/diff_new_pack.WIyqHc/_new 2020-05-16 22:26:38.357310675 +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:Factory
Hello community,
here is the log from the commit of package grantlee5 for openSUSE:Factory
checked in at 2020-04-05 20:51:54
Comparing /work/SRC/openSUSE:Factory/grantlee5 (Old)
and /work/SRC/openSUSE:Factory/.grantlee5.new.3248 (New)
Package is "grantlee5"
Sun Apr 5 20:51:54 2020 rev:7 rq:790581 version:5.2.0
Changes:
--- /work/SRC/openSUSE:Factory/grantlee5/grantlee5.changes 2019-12-23
22:40:13.533892717 +0100
+++ /work/SRC/openSUSE:Factory/.grantlee5.new.3248/grantlee5.changes
2020-04-05 20:51:54.721088868 +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.7S5NOG/_old 2020-04-05 20:51:55.165089293 +0200
+++ /var/tmp/diff_new_pack.7S5NOG/_new 2020-04-05 20:51:55.169089297 +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:Factory
Hello community,
here is the log from the commit of package grantlee5 for openSUSE:Factory
checked in at 2019-12-23 22:37:24
Comparing /work/SRC/openSUSE:Factory/grantlee5 (Old)
and /work/SRC/openSUSE:Factory/.grantlee5.new.6675 (New)
Package is "grantlee5"
Mon Dec 23 22:37:24 2019 rev:6 rq:758708 version:5.2.0
Changes:
--- /work/SRC/openSUSE:Factory/grantlee5/grantlee5.changes 2019-08-07
13:54:05.288857706 +0200
+++ /work/SRC/openSUSE:Factory/.grantlee5.new.6675/grantlee5.changes
2019-12-23 22:40:13.533892717 +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.BZBXx7/_old 2019-12-23 22:40:16.205893877 +0100
+++ /var/tmp/diff_new_pack.BZBXx7/_new 2019-12-23 22:40:16.221893883 +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:Include
commit grantlee5 for openSUSE:Factory
Hello community,
here is the log from the commit of package grantlee5 for openSUSE:Factory
checked in at 2019-08-07 13:54:03
Comparing /work/SRC/openSUSE:Factory/grantlee5 (Old)
and /work/SRC/openSUSE:Factory/.grantlee5.new.9556 (New)
Package is "grantlee5"
Wed Aug 7 13:54:03 2019 rev:5 rq:720081 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Factory/grantlee5/grantlee5.changes 2019-04-15
11:50:13.238479282 +0200
+++ /work/SRC/openSUSE:Factory/.grantlee5.new.9556/grantlee5.changes
2019-08-07 13:54:05.288857706 +0200
@@ -1,0 +2,6 @@
+Wed Jul 31 14:55:56 UTC 2019 - Fabian Vogt
+
+- Add patch to fix build with newer CMake:
+ * 0001-Remove-vestigial-ansi-flag.patch
+
+---
New:
0001-Remove-vestigial-ansi-flag.patch
Other differences:
--
++ grantlee5.spec ++
--- /var/tmp/diff_new_pack.a76FKC/_old 2019-08-07 13:54:06.528857692 +0200
+++ /var/tmp/diff_new_pack.a76FKC/_new 2019-08-07 13:54:06.528857692 +0200
@@ -29,6 +29,8 @@
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
@@ -53,9 +55,7 @@
grantlee.
%prep
-%setup -q -n grantlee-%{version}
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1 -n grantlee-%{version}
%build
%cmake \
++ 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 not operate in C++11 mode, meaning that
headers such as issue errors.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1324566..049fa4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ endif()
if (CMAKE_COMPILER_IS_GNUCXX)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990
-Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts
-Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security
-Wmissing-format-attribute -fno-common")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long
-ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith
-Wformat-security -fno-check-new -fno-common ")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long
-Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith
-Wformat-security -fno-check-new -fno-common ")
if (CMAKE_BUILD_TYPE MATCHES TestCocoon)
# Needed on 64 bit
--
2.22.0
commit grantlee5 for openSUSE:Factory
Hello community,
here is the log from the commit of package grantlee5 for openSUSE:Factory
checked in at 2019-04-15 11:50:09
Comparing /work/SRC/openSUSE:Factory/grantlee5 (Old)
and /work/SRC/openSUSE:Factory/.grantlee5.new.17052 (New)
Package is "grantlee5"
Mon Apr 15 11:50:09 2019 rev:4 rq:692988 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Factory/grantlee5/grantlee5.changes 2016-05-31
12:23:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.grantlee5.new.17052/grantlee5.changes
2019-04-15 11:50:13.238479282 +0200
@@ -1,0 +2,6 @@
+Wed Apr 10 17:42:44 UTC 2019 - Christophe Giboudeaux
+
+- Add fix-build-with-Qt-5.13.patch
+- Run spec-cleaner
+
+---
New:
fix-build-with-Qt-5.13.patch
Other differences:
--
++ grantlee5.spec ++
--- /var/tmp/diff_new_pack.31mwF9/_old 2019-04-15 11:50:14.878480151 +0200
+++ /var/tmp/diff_new_pack.31mwF9/_new 2019-04-15 11:50:14.914480170 +0200
@@ -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,21 @@
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
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
@@ -53,47 +55,33 @@
%prep
%setup -q -n grantlee-%{version}
%patch0 -p1
+%patch1 -p1
%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
++ fix-build-with-Qt-5.13.patch ++
>From 0cee029ee03ab4906c6d19b57458b5036852b0f8 Mon Sep 17 00:00:00 2001
From: Michael Pyne
Date: Tue, 18 Dec 2018 17:47:21 -0500
Subject: [PATCH] Fix build with Qt 5.13 / GCC 8.2.
At this point Grantlee doesn't build for me because QList is an
incomplete type. I think the compiler is right to complain, so I fix by
including the appropriate header.
Fixes issue #47.
---
templates/lib/lexer_p.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/lib/lexer_p.h b/templates/lib/lexer_p.h
index 275aeea..1ae451a 100644
--- a/templates/lib/lexer_p.h
+++
commit grantlee5 for openSUSE:Factory
Hello community,
here is the log from the commit of package grantlee5 for openSUSE:Factory
checked in at 2016-05-31 12:23:19
Comparing /work/SRC/openSUSE:Factory/grantlee5 (Old)
and /work/SRC/openSUSE:Factory/.grantlee5.new (New)
Package is "grantlee5"
Changes:
--- /work/SRC/openSUSE:Factory/grantlee5/grantlee5.changes 2015-04-16
14:12:45.0 +0200
+++ /work/SRC/openSUSE:Factory/.grantlee5.new/grantlee5.changes 2016-05-31
12:23:20.0 +0200
@@ -1,0 +2,11 @@
+Tue Apr 19 16:00:21 UTC 2016 - hrvoje.sen...@gmail.com
+
+- Update to 5.1.0
+ * Implement advanced operators for the {% if %} tag
+ * Use 'd' postfix for plugins built in debug mode
+ * Use 'd' postfix for libraries built in debug mode by Visual Studio
+ * Make it possible to build without QtScript and QtLinguistTools
+ * Bump Grantlee CMake requirement to 3.1.
+ * Bump Grantlee Qt requirement to 5.3.
+
+---
Old:
grantlee-5.0.0.tar.gz
New:
grantlee-5.1.0.tar.gz
Other differences:
--
++ grantlee5.spec ++
--- /var/tmp/diff_new_pack.hdcUtX/_old 2016-05-31 12:23:21.0 +0200
+++ /var/tmp/diff_new_pack.hdcUtX/_new 2016-05-31 12:23:21.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package grantlee5
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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,7 +17,7 @@
Name: grantlee5
-Version:5.0.0
+Version:5.1.0
Release:0
Summary:Qt string template library
License:LGPL-2.1+
@@ -27,11 +27,11 @@
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
-BuildRequires: cmake >= 2.8.12
+BuildRequires: cmake >= 3.1
BuildRequires: doxygen
-BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: pkgconfig(Qt5Gui)
-BuildRequires: pkgconfig(Qt5Script)
+BuildRequires: pkgconfig(Qt5Core) >= 5.3
+BuildRequires: pkgconfig(Qt5Gui) >= 5.3
+BuildRequires: pkgconfig(Qt5Script) >= 5.3
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -86,14 +86,14 @@
%files
%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING.LIB README
+%doc AUTHORS CHANGELOG COPYING* README*
%{_libdir}/libGrantlee_TextDocument.so.*
%{_libdir}/libGrantlee_Templates.so.*
%{_libdir}/grantlee/
%files devel
%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING.LIB README
+%doc AUTHORS CHANGELOG COPYING* README*
%{_includedir}/grantlee5/
%{_libdir}/libGrantlee_TextDocument.so
%{_libdir}/libGrantlee_Templates.so
++ grantlee-5.0.0.tar.gz -> grantlee-5.1.0.tar.gz ++
45765 lines of diff (skipped)
++ includes.diff ++
--- /var/tmp/diff_new_pack.hdcUtX/_old 2016-05-31 12:23:21.0 +0200
+++ /var/tmp/diff_new_pack.hdcUtX/_new 2016-05-31 12:23:21.0 +0200
@@ -2,9 +2,9 @@
index 45f8673..7832a3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -94,7 +94,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library
directory name (eg. '6
+@@ -100,7 +100,7 @@
set( LIB_INSTALL_DIR lib${LIB_SUFFIX} )
- set( PLUGIN_INSTALL_DIR
lib${LIB_SUFFIX}/grantlee/${Grantlee_MAJOR_MINOR_VERSION_STRING} )
+ set( PLUGIN_INSTALL_DIR
${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )
set( BIN_INSTALL_DIR bin )
-set( INCLUDE_INSTALL_DIR include )
+set( INCLUDE_INSTALL_DIR include/grantlee5 )
@@ -15,7 +15,7 @@
index 789205c..be9d9a2 100644
--- a/templates/lib/CMakeLists.txt
+++ b/templates/lib/CMakeLists.txt
-@@ -106,7 +106,7 @@ install(TARGETS Grantlee_Templates EXPORT grantlee_targets
+@@ -137,7 +137,7 @@
RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT Templates
LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates
ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates
@@ -28,7 +28,7 @@
index 14163db..b155171 100644
--- a/textdocument/lib/CMakeLists.txt
+++ b/textdocument/lib/CMakeLists.txt
-@@ -41,7 +41,7 @@ install(TARGETS Grantlee_TextDocument EXPORT grantlee_targets
+@@ -58,7 +58,7 @@
RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT TextDocument
LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument
ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument
commit grantlee5 for openSUSE:Factory
Hello community,
here is the log from the commit of package grantlee5 for openSUSE:Factory
checked in at 2015-04-16 14:12:44
Comparing /work/SRC/openSUSE:Factory/grantlee5 (Old)
and /work/SRC/openSUSE:Factory/.grantlee5.new (New)
Package is grantlee5
Changes:
--- /work/SRC/openSUSE:Factory/grantlee5/grantlee5.changes 2014-10-08
22:13:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.grantlee5.new/grantlee5.changes 2015-04-16
14:12:45.0 +0200
@@ -1,0 +2,6 @@
+Wed Jan 7 17:51:25 UTC 2015 - hrvoje.sen...@gmail.com
+
+- Move away from using kf5-filesystem, only users of KDEInstallDirs
+ should use it
+
+---
Other differences:
--
++ grantlee5.spec ++
--- /var/tmp/diff_new_pack.GMf1wM/_old 2015-04-16 14:12:45.0 +0200
+++ /var/tmp/diff_new_pack.GMf1wM/_new 2015-04-16 14:12:45.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package grantlee5
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,6 @@
Patch0: includes.diff
BuildRequires: cmake = 2.8.12
BuildRequires: doxygen
-BuildRequires: kf5-filesystem
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Script)
@@ -61,11 +60,25 @@
%else
SUFFIX=
%endif
-%cmake_kf5 -d build -- -DGrantlee_Qt5_TRANSITIONAL=ON -DBUILD_TESTS=OFF
-DLIB_SUFFIX=$SUFFIX
-%make_jobs
+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
%install
-%kf5_makeinstall -C build
+%makeinstall -C build
%post -p /sbin/ldconfig
