Fix macros expansions so that conditionals work
This commit is contained in:
parent
c20097ef76
commit
64ee09dc8d
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
Name: pinentry
|
Name: pinentry
|
||||||
Version: 0.8.1
|
Version: 0.8.1
|
||||||
Release: 8%{?dist}
|
Release: 9%{?dist}
|
||||||
Summary: Collection of simple PIN or passphrase entry dialogs
|
Summary: Collection of simple PIN or passphrase entry dialogs
|
||||||
|
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
@ -74,7 +74,7 @@ Group: Applications/System
|
|||||||
License: GPLv2
|
License: GPLv2
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Provides: %{name}-gui = %{version}-%{release}
|
Provides: %{name}-gui = %{version}-%{release}
|
||||||
%if ! 0%{?_enable_pinentry_qt}
|
%if ! 0%{?_enable_pinentry_qt:1}
|
||||||
Obsoletes: %{name}-qt4 < 0.8.0-2
|
Obsoletes: %{name}-qt4 < 0.8.0-2
|
||||||
Provides: %{name}-qt4 = %{version}-%{release}
|
Provides: %{name}-qt4 = %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
@ -136,7 +136,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|||||||
|
|
||||||
# Backwards compatibility
|
# Backwards compatibility
|
||||||
ln -s pinentry-gtk-2 $RPM_BUILD_ROOT%{_bindir}/pinentry-gtk
|
ln -s pinentry-gtk-2 $RPM_BUILD_ROOT%{_bindir}/pinentry-gtk
|
||||||
%if ! 0%{?_enable_pinentry_qt}
|
%if ! 0%{?_enable_pinentry_qt:1}
|
||||||
ln -s pinentry-qt4 $RPM_BUILD_ROOT%{_bindir}/pinentry-qt
|
ln -s pinentry-qt4 $RPM_BUILD_ROOT%{_bindir}/pinentry-qt
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -182,7 +182,7 @@ fi
|
|||||||
%files qt
|
%files qt
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_bindir}/pinentry-qt
|
%{_bindir}/pinentry-qt
|
||||||
%if ! 0%{?_enable_pinentry_qt}
|
%if ! 0%{?_enable_pinentry_qt:1}
|
||||||
%{_bindir}/pinentry-qt4
|
%{_bindir}/pinentry-qt4
|
||||||
%else
|
%else
|
||||||
|
|
||||||
@ -195,6 +195,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.1-9
|
||||||
|
- Fix macros expansions so that conditionals work
|
||||||
|
|
||||||
* Mon Nov 12 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.1-8
|
* Mon Nov 12 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.1-8
|
||||||
- Fix up licenses for qt and qt4 subpackages (#875875)
|
- Fix up licenses for qt and qt4 subpackages (#875875)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user