SPECS: openoffice.org.spec - unified bcond name (vfs -> gnomevfs)

qboosh qboosh at pld-linux.org
Sat Dec 23 18:50:11 CET 2006


Author: qboosh                       Date: Sat Dec 23 17:50:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified bcond name (vfs -> gnomevfs)

---- Files affected:
SPECS:
   openoffice.org.spec (1.625 -> 1.626) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.625 SPECS/openoffice.org.spec:1.626
--- SPECS/openoffice.org.spec:1.625	Tue Dec 19 23:18:41 2006
+++ SPECS/openoffice.org.spec	Sat Dec 23 18:50:06 2006
@@ -36,8 +36,8 @@
 #
 
 # Conditional build:
+%bcond_without	gnomevfs	# GNOME VFS and Evolution 2 support
 %bcond_without	java		# without Java support (disables help support)
-%bcond_without	vfs		# Enable GNOME VFS and Evolution 2 support
 %bcond_with	mono		# enable compilation of mono bindings
 %bcond_without	mozilla		# without mozilla
 
@@ -64,7 +64,7 @@
 Summary(pl):	OpenOffice.org - potężny pakiet biurowy
 Name:		openoffice.org
 Version:	%{ver}%{bugfix}
-Release:	0.%{bver}%{?without_vfs:.novfs}.%{_rel}
+Release:	0.%{bver}%{?without_gnomevfs:.novfs}.%{_rel}
 Epoch:		1
 License:	GPL/LGPL
 Group:		X11/Applications
@@ -132,7 +132,7 @@
 BuildRequires:	db-devel
 %endif
 BuildRequires:	/usr/bin/getopt
-%if %{with vfs}
+%if %{with gnomevfs}
 BuildRequires:	gnome-vfs2-devel
 %endif
 %if %{with java}
@@ -2181,7 +2181,7 @@
 %else
 	--without-java \
 %endif
-%if %{with vfs}
+%if %{with gnomevfs}
 	--enable-gnome-vfs \
 %else
 	--disable-gnome-vfs \
@@ -2636,6 +2636,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.626  2006/12/23 17:50:06  qboosh
+- unified bcond name (vfs -> gnomevfs)
+
 Revision 1.625  2006/12/19 22:18:41  sls
 - added subpackage bash-completion-openoffice
 - rel up (0.3)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.625&r2=1.626&f=u



More information about the pld-cvs-commit mailing list