packages: pinentry/pinentry.spec - for qt4: added BR: qt4-build - BR: QtGui...

[sparky]

Author: sparky                       Date: Mon Nov 30 02:36:58 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- for qt4: added BR: qt4-build
- BR: QtGui-devel and regenerate moc only if compiled with qt4
- BR: gettext-devel

---- Files affected:
packages/pinentry:
   pinentry.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/pinentry/pinentry.spec
diff -u packages/pinentry/pinentry.spec:1.30 packages/pinentry/pinentry.spec:1.31
--- packages/pinentry/pinentry.spec:1.30	Sun Jul 26 00:08:47 2009
+++ packages/pinentry/pinentry.spec	Mon Nov 30 03:36:52 2009
@@ -18,9 +18,10 @@
 Patch0:		%{name}-system-assuan.patch
 Patch1:		%{name}-info.patch
 URL:		http://www.gnupg.org/
-BuildRequires:	QtGui-devel
+%{?with_qt4:BuildRequires:	QtGui-devel}
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1:1.7.6
+BuildRequires:	gettext-devel
 %{?with_gtk:BuildRequires:	gtk+-devel >= 1.2.0}
 %{?with_gtk2:BuildRequires:	gtk+2-devel >= 2:2.4.0}
 BuildRequires:	libassuan-devel >= 1:0.6.0
@@ -29,6 +30,7 @@
 BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig
 %{?with_qt:BuildRequires:	qt-devel}
+%{?with_qt4:BuildRequires:	qt4-build}
 BuildRequires:	texinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -94,10 +96,12 @@
 %patch0 -p1
 %patch1 -p1
 
+%if %{with qt4}
 cd qt4
 %{_bindir}/moc-qt4 pinentrydialog.h  -o pinentrydialog.moc
 %{_bindir}/moc-qt4 qsecurelineedit.h -o qsecurelineedit.moc
 cd ..
+%endif
 
 rm assuan/*.h
 
@@ -115,7 +119,7 @@
 	--%{!?with_gtk2:dis}%{?with_gtk2:en}able-pinentry-gtk2 \
 	--%{!?with_qt:dis}%{?with_qt:en}able-pinentry-qt \
 	--%{!?with_qt4:dis}%{?with_qt4:en}able-pinentry-qt4 \
-	--with-qt-includes=/usr/include/qt
+	--with-qt-includes=%{_includedir}/qt
 
 %{__make}
 
@@ -192,6 +196,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2009/11/30 02:36:52  sparky
+- for qt4: added BR: qt4-build
+- BR: QtGui-devel and regenerate moc only if compiled with qt4
+- BR: gettext-devel
+
 Revision 1.30  2009/07/25 22:08:47  arekm
 - up to 0.7.6; qt4 version available now
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pinentry/pinentry.spec?r1=1.30&r2=1.31&f=u