packages: scribus/scribus.spec - enabled cairo bcond -- won't build without...

sparky sparky at pld-linux.org
Sat Jan 22 22:23:02 CET 2011


Author: sparky                       Date: Sat Jan 22 21:23:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- enabled cairo bcond -- won't build without it
- BR: QtCore-devel, QtGui-devel, QtNetwork-devel, QtXml-devel, qt4-build,
  qt4-linguist, qt4-qmake
- dropped unused BR: perl-base, qt-devel

---- Files affected:
packages/scribus:
   scribus.spec (1.160 -> 1.161) 

---- Diffs:

================================================================
Index: packages/scribus/scribus.spec
diff -u packages/scribus/scribus.spec:1.160 packages/scribus/scribus.spec:1.161
--- packages/scribus/scribus.spec:1.160	Fri Dec  3 11:53:29 2010
+++ packages/scribus/scribus.spec	Sat Jan 22 22:22:57 2011
@@ -3,7 +3,7 @@
 # TODO: files (docs and some translations)
 #
 # Conditional build:
-%bcond_with	cairo	# build with cairo support
+%bcond_without	cairo	# build with cairo support
 %bcond_without	cups	# build without CUPS support
 #
 Summary:	Scribus - Open Source Desktop Publishing
@@ -20,6 +20,10 @@
 Patch2:		%{name}-docs.patch
 Patch3:		%{name}-sparc.patch
 URL:		http://www.scribus.net/
+BuildRequires:	QtCore-devel
+BuildRequires:	QtGui-devel
+BuildRequires:	QtNetwork-devel
+BuildRequires:	QtXml-devel
 %{?with_cairo:BuildRequires:	cairo-devel >= 1.2.0}
 BuildRequires:	cmake >= 2.4.5
 %if %{with cups}
@@ -35,12 +39,13 @@
 BuildRequires:	libtiff-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	openssl-devel
-BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	podofo-devel
 BuildRequires:	python-devel
 BuildRequires:	python-modules
-BuildRequires:	qt-devel >= 6:3.0.5
+BuildRequires:	qt4-build
+BuildRequires:	qt4-linguist
+BuildRequires:	qt4-qmake
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.577
 BuildRequires:	sed >= 4.0
@@ -312,6 +317,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161  2011/01/22 21:22:57  sparky
+- enabled cairo bcond -- won't build without it
+- BR: QtCore-devel, QtGui-devel, QtNetwork-devel, QtXml-devel, qt4-build,
+  qt4-linguist, qt4-qmake
+- dropped unused BR: perl-base, qt-devel
+
 Revision 1.160  2010/12/03 10:53:29  lisu
 - comment out cs not ca translation
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scribus/scribus.spec?r1=1.160&r2=1.161&f=u



More information about the pld-cvs-commit mailing list