Hello community,
here is the log from the commit of package pinentry for openSUSE:Factory
checked in at 2016-01-20 09:54:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pinentry (Old)
and /work/SRC/openSUSE:Factory/.pinentry.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pinentry"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pinentry/pinentry.changes 2015-12-18
21:52:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pinentry.new/pinentry.changes 2016-01-20
09:54:13.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Jan 13 10:07:36 UTC 2016 - tchva...@suse.com
+
+- Use qt5 instead of qt4 in pinentry-qt
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pinentry.spec ++++++
--- /var/tmp/diff_new_pack.UUQMoj/_old 2016-01-20 09:54:15.000000000 +0100
+++ /var/tmp/diff_new_pack.UUQMoj/_new 2016-01-20 09:54:15.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pinentry
#
-# Copyright (c) 2015 SUSE LINUX 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
@@ -16,8 +16,6 @@
#
-#%define nmajor %(xxx="`grep NCURSES_VERSION_MAJOR /usr/include/ncurses.h`";
test -z "$xxx" && xxx=leer; echo $xxx)
-#%define nmajor %(xxx="leer"; xxx="`grep NCURSES_VERSION_MAJOR
/usr/include/ncurses.h 2> /dev/null`"; echo $xxx)
%define ncurses %(xxx="`readlink -f %{_includedir}/ncurses.h`"; echo $xxx)
%define nmajor %(grep NCURSES_VERSION_MAJOR < %{_includedir}/ncurses.h)
Name: pinentry
@@ -36,9 +34,11 @@
Patch7: pinentry-ncurses6.diff
BuildRequires: libassuan-devel >= 2.1.0
BuildRequires: libgpg-error-devel >= 1.16
-BuildRequires: libqt4-devel
BuildRequires: ncurses-devel
BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(gcr-3)
BuildRequires: pkgconfig(gcr-base-3)
BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0
@@ -51,17 +51,18 @@
This is a collection of simple PIN or passphrase entry dialogs which
utilize the Assuan protocol as described by the Aegypten project.
-%package qt4
+%package qt5
Summary: Collection of Simple PIN or Passphrase Entry Dialogs
Group: Productivity/Other
Requires: pinentry
Provides: pinentry-dialog
Provides: pinentry-gui
Provides: pinentry-qt = %{version}
-Provides: pinentry:%{_bindir}/pinentry-qt4
Obsoletes: pinentry-qt <= 0.8.3
+Provides: pinentry-qt4 = %{version}
+Obsoletes: pinentry-qt4 <= 0.9.7
-%description qt4
+%description qt5
This is a collection of simple PIN or passphrase entry dialogs which
utilize the Assuan protocol as described by the Aegypten project.
@@ -109,8 +110,8 @@
%build
# Regenerate moc's
-moc qt/pinentrydialog.h > qt/pinentrydialog.moc
-moc qt/pinentryconfirm.h > qt/pinentryconfirm.moc
+moc-qt5 qt/pinentrydialog.h > qt/pinentrydialog.moc
+moc-qt5 qt/pinentryconfirm.h > qt/pinentryconfirm.moc
nmajor=$(sed -rn 's/^#define\s+NCURSES_VERSION_MAJOR\s+([0-9]+)/\1/p'
%{_includedir}/ncurses.h)
CFLAGS="%{optflags} $(ncursesw${nmajor}-config --cflags)"
CXXFLAGS="%{optflags} -std=gnu++11 $(ncursesw${nmajor}-config --cflags)"
@@ -173,7 +174,7 @@
%attr(755,root,root) %{_bindir}/pinentry-tty
%attr(755,root,root) %{_bindir}/pinentry-curses
-%files qt4
+%files qt5
%defattr(-,root,root)
%attr(755,root,root) %{_bindir}/pinentry-qt4
%attr(755,root,root) %{_bindir}/pinentry-qt
