rpms/vidalia/F-11 vidalia.spec,1.2,1.3

[Simon Wesp]

Author: cassmodiah

Update of /cvs/pkgs/rpms/vidalia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17895

Modified Files:
	vidalia.spec 
Log Message:



Index: vidalia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/F-11/vidalia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vidalia.spec	1 Jun 2009 20:18:16 -0000	1.2
+++ vidalia.spec	2 Jun 2009 04:47:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             vidalia
 Version:          0.1.13
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          GUI controller for the Tor Onion Routing Network
 
 Group:            Applications/Internet
@@ -43,13 +43,13 @@ Doxygen generated documentations for %{n
 
 
 %build
-  %if 0%{?fedora}
-%cmake .
-  %endif
+%if 0%{?_qt4_bindir:1}
+PATH=%{_qt4_bindir}:$PATH; export PATH
+%else
+PATH=%{_libdir}/qt4/bin:$PATH; export PATH
+%endif
 
-  %if 0%{?rhel}
-%cmake -DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake .
-  %endif
+%cmake .
 
 make %{?_smp_mflags}
 
@@ -115,6 +115,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jun 01 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.13-2
+- Merge builds for fedora and epel
+
 * Mon Jun 01 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.13-1
 - Update to 0.1.13
 - Adjust to fedora and epel