commit elektra for openSUSE:Factory
Hello community,
here is the log from the commit of package elektra for openSUSE:Factory checked
in at 2018-06-08 23:15:42
Comparing /work/SRC/openSUSE:Factory/elektra (Old)
and /work/SRC/openSUSE:Factory/.elektra.new (New)
Package is "elektra"
Fri Jun 8 23:15:42 2018 rev:5 rq:614414 version:0.8.20
Changes:
--- /work/SRC/openSUSE:Factory/elektra/elektra.changes 2018-01-16
09:43:11.639376542 +0100
+++ /work/SRC/openSUSE:Factory/.elektra.new/elektra.changes 2018-06-08
23:16:02.314822171 +0200
@@ -1,0 +2,6 @@
+Tue Jun 5 13:16:59 UTC 2018 - wba...@tmo.at
+
+- Add Qt-GUI-Do-not-use-deprecated-qt_use_modules.patch to fix
+ build with Qt 5.11
+
+---
New:
Qt-GUI-Do-not-use-deprecated-qt_use_modules.patch
Other differences:
--
++ elektra.spec ++
--- /var/tmp/diff_new_pack.vXUThz/_old 2018-06-08 23:16:03.418782299 +0200
+++ /var/tmp/diff_new_pack.vXUThz/_new 2018-06-08 23:16:03.422782154 +0200
@@ -67,6 +67,8 @@
#BuildRequires: python-devel
#BuildRequires: swig
Patch: patch-fix-augeas-config.patch
+# PATCH-FIX-UPSTREAM Qt-GUI-Do-not-use-deprecated-qt_use_modules.patch -- fix
build with Qt 5.11
+Patch1: Qt-GUI-Do-not-use-deprecated-qt_use_modules.patch
Summary:A key/value pair database to store software configurations
License:BSD-3-Clause
@@ -171,6 +173,7 @@
%prep
%setup -q
%patch -p1
+%patch1 -p1
%build
export SUSE_ASNEEDED=0
++ Qt-GUI-Do-not-use-deprecated-qt_use_modules.patch ++
>From 8e156aac68e4dc202483d86fd33a24dfa53d3d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rene=CC=81=20Schwaiger?=
Date: Wed, 23 May 2018 07:32:22 +0200
Subject: [PATCH] Qt-GUI: Do not use deprecated `qt5_use_modules`
---
src/tools/qt-gui/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/qt-gui/CMakeLists.txt b/src/tools/qt-gui/CMakeLists.txt
index 65e118a4df..7acf6b72c7 100644
--- a/src/tools/qt-gui/CMakeLists.txt
+++ b/src/tools/qt-gui/CMakeLists.txt
@@ -61,7 +61,7 @@ else ()
add_executable(qt-gui ${qt-gui_SRCS} ${qt-gui_HDRS} ${UIS} ${RSCS} ${TRS})
add_dependencies (qt-gui kdberrors_generated)
-qt5_use_modules(qt-gui Quick Gui Core Qml Widgets)
+target_link_libraries(qt-gui Qt5::Quick Qt5::Gui Qt5::Core Qt5::Qml
Qt5::Widgets)
include_directories(${DISCOUNT_INCLUDES})
target_link_libraries(qt-gui ${DISCOUNT_LIBRARIES})
commit elektra for openSUSE:Factory
Hello community,
here is the log from the commit of package elektra for openSUSE:Factory checked
in at 2018-01-16 09:43:10
Comparing /work/SRC/openSUSE:Factory/elektra (Old)
and /work/SRC/openSUSE:Factory/.elektra.new (New)
Package is "elektra"
Tue Jan 16 09:43:10 2018 rev:4 rq:565779 version:0.8.20
Changes:
--- /work/SRC/openSUSE:Factory/elektra/elektra.changes 2017-11-22
11:21:40.978964067 +0100
+++ /work/SRC/openSUSE:Factory/.elektra.new/elektra.changes 2018-01-16
09:43:11.639376542 +0100
@@ -1,0 +2,5 @@
+Mon Jan 15 12:00:00 UTC 2018 - k...@gmx.de
+
+- Augeas: Fix internal inconsistency (git#c93b4175
patch-fix-augeas-config.patch)
+
+---
New:
patch-fix-augeas-config.patch
Other differences:
--
++ elektra.spec ++
--- /var/tmp/diff_new_pack.sI52DE/_old 2018-01-16 09:43:12.483337038 +0100
+++ /var/tmp/diff_new_pack.sI52DE/_new 2018-01-16 09:43:12.491336663 +0100
@@ -1,7 +1,7 @@
#
# spec file for package elektra
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -66,6 +66,7 @@
#BuildRequires: python
#BuildRequires: python-devel
#BuildRequires: swig
+Patch: patch-fix-augeas-config.patch
Summary:A key/value pair database to store software configurations
License:BSD-3-Clause
@@ -169,6 +170,7 @@
%prep
%setup -q
+%patch -p1
%build
export SUSE_ASNEEDED=0
++ patch-fix-augeas-config.patch ++
diff --git a/src/plugins/augeas/CMakeLists.txt
b/src/plugins/augeas/CMakeLists.txt
index b4c9c7c15..dc29fa864 100644
--- a/src/plugins/augeas/CMakeLists.txt
+++ b/src/plugins/augeas/CMakeLists.txt
@@ -23,6 +23,9 @@ if (DEPENDENCY_PHASE)
else (LIBAUGEAS_FOUND)
remove_plugin (augeas "libaugeas not found (libaugeas-dev >=
0.16 needed)")
endif ()
+
+ set (AUGEAS_PLUGIN_INCLUDE_DIRS ${LIBAUGEAS_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR})
+ set (AUGEAS_PLUGIN_LIBRARIES ${LIBAUGEAS_LIBRARIES}
${LIBXML2_LIBRARIES})
endif ()
add_plugin(augeas
@@ -32,16 +35,14 @@ add_plugin(augeas
ADD_TEST
INSTALL_TEST_DATA
INCLUDE_DIRECTORIES
- ${LIBAUGEAS_INCLUDE_DIR}
- ${LIBXML2_INCLUDE_DIR}
+ ${AUGEAS_PLUGIN_INCLUDE_DIRS}
COMPILE_DEFINITIONS
"${LIBAUGEAS_COMPILE_DEFINITIONS}"
LINK_ELEKTRA
elektra-meta
elektra-proposal
LINK_LIBRARIES
- ${LIBAUGEAS_LIBRARIES}
- ${LIBXML2_LIBRARIES}
+ ${AUGEAS_PLUGIN_LIBRARIES}
)
if (ADDTESTING_PHASE)
commit elektra for openSUSE:Factory
Hello community,
here is the log from the commit of package elektra for openSUSE:Factory checked
in at 2017-11-22 11:21:31
Comparing /work/SRC/openSUSE:Factory/elektra (Old)
and /work/SRC/openSUSE:Factory/.elektra.new (New)
Package is "elektra"
Wed Nov 22 11:21:31 2017 rev:3 rq:542774 version:0.8.20
Changes:
--- /work/SRC/openSUSE:Factory/elektra/elektra.changes 2017-02-07
12:03:07.348550238 +0100
+++ /work/SRC/openSUSE:Factory/.elektra.new/elektra.changes 2017-11-22
11:21:40.978964067 +0100
@@ -1,0 +2,8 @@
+Sat Nov 11 12:00:00 UTC 2017 - k...@gmx.de
+
+- update to 0.8.20
+- add fish dependency
+- fix %config file warning
+- add explicite QT5DBus package
+
+---
Old:
elektra-0.8.19.tar.gz
New:
elektra-0.8.20.tar.gz
Other differences:
--
++ elektra.spec ++
--- /var/tmp/diff_new_pack.s24KUM/_old 2017-11-22 11:21:41.982927586 +0100
+++ /var/tmp/diff_new_pack.s24KUM/_new 2017-11-22 11:21:41.986927441 +0100
@@ -16,7 +16,7 @@
#
-Version:0.8.19
+Version:0.8.20
Release:0
%define tempdocdir %{_prefix}/elektra
%define __libtoolize/bin/true
@@ -32,11 +32,11 @@
Source1:elektra-rpmlintrc
BuildRequires: boost-devel
BuildRequires: cmake
-BuildRequires: dbus-1-devel
BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: graphviz
BuildRequires: libxml2-devel
+BuildRequires: pkgconfig(dbus-1)
#BuildRequires: java-1.8.0-devel
# g-ir-compiler fails to build
@@ -49,6 +49,7 @@
BuildRequires: gobject-introspection-devel
%define use_qt5 1
BuildRequires: discount
+BuildRequires: libQt5DBus-devel
BuildRequires: libQt5Test-devel
BuildRequires: libgit2-devel
BuildRequires: libmarkdown-devel
@@ -56,8 +57,11 @@
BuildRequires: libqt5-qtsvg-devel
BuildRequires: libyajl-devel
BuildRequires: python3-devel
-BuildRequires: update-desktop-files
BuildRequires: systemd-logger
+BuildRequires: update-desktop-files
+%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
+BuildRequires: fish
+%endif
#BuildRequires: lua-devel
#BuildRequires: python
#BuildRequires: python-devel
@@ -210,7 +214,12 @@
%defattr(-,root,root,-)
%{_bindir}/kdb
%{_datadir}/bash-completion/completions/*
-%doc doc/AUTHORS doc/LICENSE.md README.md doc/INSTALL.md
+%if 0%{?suse_version} <= 1320
+%dir %{_datadir}/fish
+%dir %{_datadir}/fish/vendor_completions.d/
+%endif
+%{_datadir}/fish/vendor_completions.d/*
+%doc doc/AUTHORS LICENSE.md README.md doc/INSTALL.md
%dir %{_libdir}/elektra/tool_exec
%{_libdir}/elektra/tool_exec/[b-p,r-z]*
@@ -222,7 +231,7 @@
%{_libdir}/elektra%{api}/*elektra-[b-z]*.so
%dir %{_datadir}/doc/elektra
%{_datadir}/doc/elektra/*
-%{_sysconfdir}/ld.so.conf.d/elektra.conf
+%config %{_sysconfdir}/ld.so.conf.d/elektra.conf
%if 0%{?use_qt5} > 0
%files -n %{name}-qt-gui
@@ -270,6 +279,8 @@
%dir %{_datadir}/doc/elektra-doc
%dir %{_datadir}/doc/elektra-doc/html
%{_datadir}/doc/elektra-doc/html/*
+%{_mandir}/man1/*
%{_mandir}/man3/*
+%{_mandir}/man7/*
%changelog
++ elektra-0.8.19.tar.gz -> elektra-0.8.20.tar.gz ++
151826 lines of diff (skipped)
commit elektra for openSUSE:Factory
Hello community,
here is the log from the commit of package elektra for openSUSE:Factory checked
in at 2017-02-07 12:03:06
Comparing /work/SRC/openSUSE:Factory/elektra (Old)
and /work/SRC/openSUSE:Factory/.elektra.new (New)
Package is "elektra"
Changes:
--- /work/SRC/openSUSE:Factory/elektra/elektra.changes 2017-02-03
17:36:17.608655295 +0100
+++ /work/SRC/openSUSE:Factory/.elektra.new/elektra.changes 2017-02-07
12:03:07.348550238 +0100
@@ -1,0 +2,11 @@
+Thu Jan 12 12:00:00 UTC 2017 - k...@gmx.de
+
+- fix module loading
+
+---
+Tue Jan 10 02:44:59 UTC 2017 - sfl...@suse.de
+
+- Replace 0001-desktop-category.patch with %suse_update_desktop_file
+- Correct desktop file group to be in line with openSUSE
+
+---
Old:
0001-desktop-category.patch
Other differences:
--
++ elektra.spec ++
--- /var/tmp/diff_new_pack.jMq3KK/_old 2017-02-07 12:03:08.016455752 +0100
+++ /var/tmp/diff_new_pack.jMq3KK/_new 2017-02-07 12:03:08.020455187 +0100
@@ -1,7 +1,7 @@
#
# spec file for package elektra
#
-# Copyright (c) 2016 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
@@ -56,14 +56,13 @@
BuildRequires: libqt5-qtsvg-devel
BuildRequires: libyajl-devel
BuildRequires: python3-devel
+BuildRequires: update-desktop-files
BuildRequires: systemd-logger
#BuildRequires: lua-devel
#BuildRequires: python
#BuildRequires: python-devel
#BuildRequires: swig
-Patch: 0001-desktop-category.patch
-
Summary:A key/value pair database to store software configurations
License:BSD-3-Clause
Group: System/Libraries
@@ -166,7 +165,6 @@
%prep
%setup -q
-%patch -p1
%build
export SUSE_ASNEEDED=0
@@ -189,16 +187,19 @@
make %{?_smp_mflags}
%install
+%suse_update_desktop_file -r org.libelektra.elektra-qt-editor
"Settings;DesktopSettings;"
%make_install -C build
# Remove statically linked kdb
#rm $RPM_BUILD_ROOT%{_bindir}/kdb-static
# not known by any package?
rm -r $RPM_BUILD_ROOT%{_datadir}/zsh/vendor-completions/
+# add elektra modules paths
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+echo "%{_libdir}/elektra%{api}" >
$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/elektra.conf
%post -n lib%{name}%{api}
/sbin/ldconfig
# activate dbus messages on db changes
-export LD_LIBRARY_PATH=%{_libdir}/elektra%{api}/:$LD_LIBRARY_PATH
%{_bindir}/kdb global-mount dbus || :
%postun -n lib%{name}%{api} -p /sbin/ldconfig
@@ -221,6 +222,7 @@
%{_libdir}/elektra%{api}/*elektra-[b-z]*.so
%dir %{_datadir}/doc/elektra
%{_datadir}/doc/elektra/*
+%{_sysconfdir}/ld.so.conf.d/elektra.conf
%if 0%{?use_qt5} > 0
%files -n %{name}-qt-gui
