SPECS: mapserver.spec - no need to bcond preamble, cosmetics

[qboosh]

Author: qboosh                       Date: Fri Sep  2 18:58:16 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no need to bcond preamble, cosmetics

---- Files affected:
SPECS:
   mapserver.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/mapserver.spec
diff -u SPECS/mapserver.spec:1.19 SPECS/mapserver.spec:1.20
--- SPECS/mapserver.spec:1.19	Thu Sep  1 18:13:22 2005
+++ SPECS/mapserver.spec	Fri Sep  2 20:58:11 2005
@@ -6,7 +6,7 @@
 #
 # Contitional build:
 %bcond_with	ms_tcl			# Tcl mapscript module
-
+#
 #%%define	apxs	/usr/sbin/apxs1
 %include	/usr/lib/rpm/macros.perl
 Summary:	Web-enabled mapping application development
@@ -100,7 +100,6 @@
 %description -n php-mapscript -l pl
 Moduł MapScript dla PHP.
 
-%if %{with ms_tcl}
 %package -n tcl-mapscript
 Summary:	Tcl MapScript module
 Summary(pl):	Moduł Tcl MapScript
@@ -111,7 +110,6 @@
 
 %description -n tcl-mapscript -l pl
 Moduł Tcl MapScript.
-%endif
 
 %prep
 %setup -q
@@ -135,7 +133,8 @@
 	--with-pdf \
 	--with-wfsclient
 
-%{__make} REGEX_OBJ=
+%{__make} \
+	REGEX_OBJ=
 
 cd mapscript/perl
 %{__perl} Makefile.PL \
@@ -146,7 +145,8 @@
 # tcl currently disables - swig problems and mapscript_wrap.c not included!
 cd ../tcl
 touch ../../perlvars
-./configure --with-tcl=/usr
+./configure \
+	--with-tcl=/usr
 %{__make} \
 	TCL_CC="%{__cc} %{rpmcflags} -pipe" \
 	TCL_SHLIB_CC="%{__cc} %{rpmcflags} -pipe -shared"
@@ -165,13 +165,11 @@
 
 install mapscript/php3/php_mapscript.so $RPM_BUILD_ROOT%{_libdir}/php
 
-cd mapscript/perl
-%{__make} install \
+%{__make} -C mapscript/perl install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with ms_tcl}
-cd ../tcl
-%{__make} install \
+%{__make} -C mapscript/tcl install \
 	TCL_EXEC_PREFIX=$RPM_BUILD_ROOT%{_prefix}
 %endif
 
@@ -226,6 +224,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2005/09/02 18:58:11  qboosh
+- no need to bcond preamble, cosmetics
+
 Revision 1.19  2005/09/01 16:13:22  bartowl
 - drop php-cgi R:
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mapserver.spec?r1=1.19&r2=1.20&f=u