SPECS: scribus.spec - use %cmake macro instead

glen glen at pld-linux.org
Tue Dec 5 19:43:38 CET 2006


Author: glen                         Date: Tue Dec  5 18:43:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %cmake macro instead

---- Files affected:
SPECS:
   scribus.spec (1.123 -> 1.124) 

---- Diffs:

================================================================
Index: SPECS/scribus.spec
diff -u SPECS/scribus.spec:1.123 SPECS/scribus.spec:1.124
--- SPECS/scribus.spec:1.123	Tue Dec  5 19:33:47 2006
+++ SPECS/scribus.spec	Tue Dec  5 19:43:32 2006
@@ -39,6 +39,7 @@
 BuildRequires:	python-modules
 BuildRequires:	qt-devel >= 6:3.0.5
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.293
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
 Requires:	python-PIL
@@ -124,17 +125,14 @@
 %build
 export QTDIR=%{_prefix}
 export KDEDIR=%{_prefix}
-export CC="%{__cc}"
-export CXX="%{__cxx}"
-export CFLAGS="%{rpmcflags}"
-export CXXFLAGS="%{rpmcxxflags}"
 
-cmake . -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-	%if %{with cairo }
+%cmake . \
+	-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+%if %{with cairo}
 	-DWANT_CAIRO=1
-	%else
+%else
 	-DWANT_LIBART=1
-	%endif
+%endif
 
 %{__make}
 
@@ -289,6 +287,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2006/12/05 18:43:32  glen
+- use %cmake macro instead
+
 Revision 1.123  2006/12/05 18:33:47  deejay1
 - pass compiler flags to cmake
 - last try with dropin
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/scribus.spec?r1=1.123&r2=1.124&f=u



More information about the pld-cvs-commit mailing list