0.8.3-3
- .spec cleanup (drop support for old releases) - -gtk: Provides: pinentry-gtk2
This commit is contained in:
parent
cb18b650c2
commit
168f7f3fba
@ -1,32 +1,14 @@
|
||||
|
||||
%if 0%{?fedora} > 8 || 0%{?rhel} > 5
|
||||
%define _enable_pinentry_qt4 --enable-pinentry-qt4
|
||||
%define _enable_pinentry_qt --enable-pinentry-qt
|
||||
%define qt_major 3
|
||||
%define qt3 qt3
|
||||
%else
|
||||
%define qt3 qt
|
||||
%define _enable_pinentry_qt --enable-pinentry-qt
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} && 0%{?fedora} > 12
|
||||
%define _enable_pinentry_qt4 --enable-pinentry-qt4
|
||||
%define qt_major 4
|
||||
%undefine _enable_pinentry_qt
|
||||
%endif
|
||||
|
||||
Name: pinentry
|
||||
Version: 0.8.3
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Collection of simple PIN or passphrase entry dialogs
|
||||
|
||||
Group: Applications/System
|
||||
# qt & qt4 subpackage have different license, see subpackage definitions
|
||||
License: GPLv2+
|
||||
URL: http://www.gnupg.org/aegypten/
|
||||
Source0: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2
|
||||
Source1: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2.sig
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
# borrowed from opensuse
|
||||
Source10: pinentry-wrapper
|
||||
@ -58,9 +40,9 @@ This package contains the curses (text) based version of the PIN entry dialog.
|
||||
|
||||
%package gtk
|
||||
Summary: Passphrase/PIN entry dialog based on GTK+
|
||||
Group: Applications/System
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: %{name}-gui = %{version}-%{release}
|
||||
Provides: pinentry-gtk2 = %{version}-%{release}
|
||||
%description gtk
|
||||
Pinentry is a collection of simple PIN or passphrase entry dialogs which
|
||||
utilize the Assuan protocol as described by the aegypten project; see
|
||||
@ -68,36 +50,19 @@ http://www.gnupg.org/aegypten/ for details.
|
||||
This package contains the GTK GUI based version of the PIN entry dialog.
|
||||
|
||||
%package qt
|
||||
Summary: Passphrase/PIN entry dialog based on Qt%{?qt_major}
|
||||
Group: Applications/System
|
||||
# Original license for secq* files doesn't allow higher GPL versions to be used
|
||||
License: GPLv2
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: %{name}-gui = %{version}-%{release}
|
||||
%if ! 0%{?_enable_pinentry_qt:1}
|
||||
Obsoletes: %{name}-qt4 < 0.8.0-2
|
||||
Provides: %{name}-qt4 = %{version}-%{release}
|
||||
%endif
|
||||
%description qt
|
||||
Pinentry is a collection of simple PIN or passphrase entry dialogs which
|
||||
utilize the Assuan protocol as described by the aegypten project; see
|
||||
http://www.gnupg.org/aegypten/ for details.
|
||||
This package contains the Qt%{?qt_major} GUI based version of the PIN entry dialog.
|
||||
|
||||
%package qt4
|
||||
Summary: Passphrase/PIN entry dialog based on Qt4
|
||||
Group: Applications/System
|
||||
# original code for secstring.cpp doesn't allow GPL versions higher than 3 to be
|
||||
# used
|
||||
License: GPLv2 or GPLv3
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: %{name}-gui = %{version}-%{release}
|
||||
%description qt4
|
||||
Obsoletes: pinentry-qt4 < 0.8.0-2
|
||||
Provides: pinentry-qt4 = %{version}-%{release}
|
||||
%description qt
|
||||
Pinentry is a collection of simple PIN or passphrase entry dialogs which
|
||||
utilize the Assuan protocol as described by the aegypten project; see
|
||||
http://www.gnupg.org/aegypten/ for details.
|
||||
This package contains the Qt4 GUI based version of the PIN entry dialog.
|
||||
Support for Qt4 is new, and a bit experimental.
|
||||
|
||||
|
||||
%prep
|
||||
@ -105,26 +70,16 @@ Support for Qt4 is new, and a bit experimental.
|
||||
|
||||
%patch53 -p1 -b .rhbug_589532
|
||||
|
||||
# hack around auto* madness, lack of proper support for moc
|
||||
%if %{?_enable_pinentry_qt4:1}
|
||||
pushd qt4
|
||||
moc-qt4 pinentrydialog.h > pinentrydialog.moc
|
||||
moc-qt4 qsecurelineedit.h > qsecurelineedit.moc
|
||||
popd
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if 0%{?_enable_pinentry_qt:1}
|
||||
unset QTDIR || : ; . /etc/profile.d/qt.sh
|
||||
%endif
|
||||
|
||||
%configure \
|
||||
--disable-rpath \
|
||||
--disable-dependency-tracking \
|
||||
--disable-pinentry-gtk \
|
||||
--disable-pinentry-qt \
|
||||
--without-libcap \
|
||||
%{?_enable_pinentry_qt} %{!?_enable_pinentry_qt:--disable-pinentry-qt} \
|
||||
%{?_enable_pinentry_qt4} %{!?_enable_pinentry_qt4:--disable-pinentry-qt4}
|
||||
--enable-pinentry-gtk2 \
|
||||
--enable-pinentry-qt4
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -134,14 +89,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
# Backwards compatibility
|
||||
ln -s pinentry-gtk-2 $RPM_BUILD_ROOT%{_bindir}/pinentry-gtk
|
||||
%if ! 0%{?_enable_pinentry_qt:1}
|
||||
ln -s pinentry-qt4 $RPM_BUILD_ROOT%{_bindir}/pinentry-qt
|
||||
%endif
|
||||
|
||||
install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pinentry
|
||||
|
||||
# unpackaged files
|
||||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||
rm -fv $RPM_BUILD_ROOT%{_infodir}/dir
|
||||
|
||||
|
||||
# alternatives dropped at 0.7.6-3 (use %%trigger instead?)
|
||||
%pre
|
||||
@ -159,7 +113,6 @@ if [ $1 -eq 0 -a -f %{_infodir}/pinentry.info* ] ; then
|
||||
/sbin/install-info --delete %{_infodir}/pinentry.info %{_infodir}/dir ||:
|
||||
fi
|
||||
|
||||
|
||||
%files
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
|
||||
%{_bindir}/pinentry-curses
|
||||
@ -172,18 +125,14 @@ fi
|
||||
|
||||
%files qt
|
||||
%{_bindir}/pinentry-qt
|
||||
%if ! 0%{?_enable_pinentry_qt:1}
|
||||
%{_bindir}/pinentry-qt4
|
||||
%else
|
||||
|
||||
%if 0%{?_enable_pinentry_qt4:1}
|
||||
%files qt4
|
||||
%{_bindir}/pinentry-qt4
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Jul 19 2014 Rex Dieter <rdieter@fedoraproject.org> - 0.8.3-3
|
||||
- .spec cleanup (drop support for old releases)
|
||||
- -gtk: Provides: pinentry-gtk2
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user