SPECS: hugin.spec - libpano13 detection is greedy

[qboosh]

Author: qboosh                       Date: Sun Jul 15 13:00:28 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- libpano13 detection is greedy

---- Files affected:
SPECS:
   hugin.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/hugin.spec
diff -u SPECS/hugin.spec:1.27 SPECS/hugin.spec:1.28
--- SPECS/hugin.spec:1.27	Wed Jul 11 23:23:25 2007
+++ SPECS/hugin.spec	Sun Jul 15 15:00:23 2007
@@ -1,8 +1,8 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	pano13			# use libpano13 (default with libpano12)
-
+%bcond_with	pano13			# use libpano13 instead of libpano12
+#
 %define		_beta	beta4
 Summary:	Toolchain to create panoramic images
 Summary(pl.UTF-8):	Zestaw narzędzi do tworzenia panoramicznych zdjęć
@@ -38,6 +38,7 @@
 BuildRequires:	wxGTK2-unicode-devel >= 2.6.0
 BuildRequires:	zip
 BuildRequires:	zlib-devel
+%{!?with_pano13:BuildConflicts:	libpano13-devel}
 %{!?with_pano13:Requires:	libpano12 >= 2.8.1}
 %{?with_pano13:Requires:	libpano13}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -122,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2007/07/15 13:00:23  qboosh
+- libpano13 detection is greedy
+
 Revision 1.27  2007/07/11 21:23:25  sls
 - added bcond pano13
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hugin.spec?r1=1.27&r2=1.28&f=u