Hello community, here is the log from the commit of package pinentry for openSUSE:Factory checked in at 2014-10-31 18:27:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-10-01 11:22:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pinentry.new/pinentry.changes 2014-10-31 18:27:17.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Oct 21 10:57:43 UTC 2014 - tchvatal@suse.com + +- Remove qt3 helpers +- Remove gpg verification in spec, it is done by obs automatically +- Some whitespace changes +- Add default defattr + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pinentry.spec ++++++ --- /var/tmp/diff_new_pack.KrhwFG/_old 2014-10-31 18:27:18.000000000 +0100 +++ /var/tmp/diff_new_pack.KrhwFG/_new 2014-10-31 18:27:18.000000000 +0100 @@ -16,6 +16,7 @@ # +%global ncursesw_config %(set -- %{_bindir}/ncursesw*-config; echo ${1}) Name: pinentry Version: 0.8.4 Release: 0 @@ -45,13 +46,9 @@ BuildRequires: ncurses-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0 -%if %suse_version >= 1230 -BuildRequires: gpg-offline -%endif -PreReq: %install_info_prereq +Requires(post): %{install_info_prereq} Provides: pinentry-dialog BuildRoot: %{_tmppath}/%{name}-%{version}-build -%global ncursesw_config %(set -- %{_bindir}/ncursesw*-config; echo ${1}) %description This is a collection of simple PIN or passphrase entry dialogs which @@ -64,7 +61,7 @@ Provides: pinentry-dialog Provides: pinentry-gui Provides: pinentry-qt = %{version} -Provides: pinentry:/usr/bin/pinentry-qt4 +Provides: pinentry:%{_bindir}/pinentry-qt4 Obsoletes: pinentry-qt <= 0.8.3 %description qt4 @@ -77,24 +74,23 @@ Requires: pinentry Provides: pinentry-dialog Provides: pinentry-gui -Provides: pinentry:/usr/bin/pinentry-gtk-2 +Provides: pinentry:%{_bindir}/pinentry-gtk-2 %description gtk2 This is a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol as described by the Aegypten project. %prep -%{?gpg_verify: %gpg_verify %{S:1}} %setup -q -%patch0 -p 1 -%patch1 -p 1 -%patch2 -p 1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %patch5 -p1 %patch6 -p1 %patch8 -p1 %build -cp /usr/share/gettext/config.rpath . +cp %{_datadir}/gettext/config.rpath . autoreconf -fi # Regenerate moc's moc qt4/pinentrydialog.h > qt4/pinentrydialog.moc @@ -107,14 +103,11 @@ --enable-pinentry-qt4 \ --enable-pinentry-gtk2 \ --enable-pinentry-tty \ - --with-qt-dir=%{_libdir}/qt3/ \ - --with-qt-includes=%{_libdir}/qt3/include/ \ - --with-qt-libraries=%{_libdir}/qt3/%{_lib}/ \ --without-ncurses-include-dir make %{?_smp_mflags} %install -%makeinstall DESTDIR=%{buildroot} +make DESTDIR=%{buildroot} install %{?_smp_mflags} # remove symlink rm -rf %{buildroot}%{_bindir}/pinentry @@ -135,9 +128,11 @@ %attr(755,root,root) %{_bindir}/pinentry-curses %files qt4 +%defattr(-,root,root) %attr(755,root,root) %{_bindir}/pinentry-qt4 %files gtk2 +%defattr(-,root,root) %attr(755,root,root) %{_bindir}/pinentry-gtk-2 %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org