rpms/vidalia/EL-5 vidalia.spec,1.2,1.3
Rex Dieter
rdieter at fedoraproject.org
Mon Jun 1 20:50:31 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/vidalia/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv765
Modified Files:
vidalia.spec
Log Message:
fix build for epel (lacking %%_qt4_bindir, make a good guess)
Index: vidalia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/EL-5/vidalia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vidalia.spec 1 Jun 2009 19:57:16 -0000 1.2
+++ vidalia.spec 1 Jun 2009 20:50:01 -0000 1.3
@@ -43,13 +43,15 @@ Doxygen generated documentations for %{n
%build
- %if 0%{?fedora}
-%cmake .
- %endif
- %if 0%{?rhel}
-%cmake -DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake .
- %endif
+# ensure we find qt4 tools, like qmake, moc, etc...
+%if 0%{?_qt4_bindir:1}
+PATH=%{_qt4_bindir}:$PATH; export PATH
+%else
+PATH=%{_libdir}/qt4/bin:$PATH; export PATH
+%endif
+
+%cmake .
make %{?_smp_mflags}
More information about the fedora-extras-commits
mailing list