SPECS: libgda3.spec - BR+R: libgcrypt-devel, gnome-vfs2-devel (+gn...

Sat Jan 26 12:15:11 CET 2008

Author: qboosh                       Date: Sat Jan 26 11:15:11 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR+R: libgcrypt-devel, gnome-vfs2-devel (+gnomevfs=gnome bcond)
- no apps here - group changed to Libraries
- added missing libgda-xslt symlink

---- Files affected:
SPECS:
   libgda3.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/libgda3.spec
diff -u SPECS/libgda3.spec:1.15 SPECS/libgda3.spec:1.16

--- SPECS/libgda3.spec:1.15	Sun Nov 18 19:12:58 2007
+++ SPECS/libgda3.spec	Sat Jan 26 12:15:05 2008
@@ -6,7 +6,9 @@
 %bcond_without	doc		# don't generate html documentation
 %bcond_without	static_libs	# don't build static libraries
 %bcond_with	gamin		# use gamin instead of fam library
-#
+%bcond_without	gnomevfs	# build without gnome-vfs support
+%bcond_without	gnome		# without gnomevfs (convenience alias)
+# - database plugins:
 %bcond_without	firebird	# build without firebird plugin
 %bcond_without	freetds		# build without freetds plugin
 %bcond_without	ldap		# build without ldap plugin
@@ -17,16 +19,19 @@
 %bcond_without	sqlite		# build without sqlite plugin
 %bcond_without	xbase		# build without xbase plugin
 #
+%if %{without gnome}
+%undefine	with_gnomevfs
+%endif
 %ifnarch %{ix86} sparc sparcv9 alpha
 %undefine	with_firebird
 %endif
 Summary:	GNU Data Access library
-Summary(pl.UTF-8):   Biblioteka GNU Data Access
+Summary(pl.UTF-8):	Biblioteka GNU Data Access
 Name:		libgda3
 Version:	3.1.2
 Release:	3
 License:	LGPL v2+/GPL v2+
-Group:		Applications/Databases
+Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/gnome/sources/libgda/3.1/libgda-%{version}.tar.bz2
 # Source0-md5:	fe299d264ddeb7fbc36276f74f1abfdc
 Patch1:		%{name}-configure.patch
@@ -42,10 +47,12 @@
 %{?with_gamin:BuildRequires:	gamin-devel}
 BuildRequires:	glib2-devel >= 1:2.12.0
 BuildRequires:	gnome-common >= 2.12.0
+%{?with_gnomevfs:BuildRequires:	gnome-vfs2-devel >= 2.0}
 BuildRequires:	gtk-doc >= 1.6
-BuildRequires:	intltool >= 0.35
+BuildRequires:	intltool >= 0.35.5
+BuildRequires:	libgcrypt-devel >= 1.1.42
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:.2.6.26
+BuildRequires:	libxml2-devel >= 1:2.6.26
 BuildRequires:	libxslt-devel >= 1.1.17
 %{?with_mdb:BuildRequires:	mdbtools-devel >= 0.6}
 %{?with_mysql:BuildRequires:	mysql-devel}
@@ -60,7 +67,6 @@
 %{?with_xbase:BuildRequires:	xbase-devel >= 2.0.0}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-#%define		_libgdadir	libgda-%(echo %{version} | cut -d '.' -f 1-2 )
 %define		_libgdadir	libgda-3.0
 %define		_providersdir	%{_libdir}/%{_libgdadir}/providers
 
@@ -83,14 +89,16 @@
 pozwolić na używanie przez niegnomowe aplikacje.
 
 %package devel
-Summary:	GNU Data Access development
-Summary(pl.UTF-8):   Dla programistów GNU Data Access
+Summary:	GNU Data Access development files
+Summary(pl.UTF-8):	Pliki programistyczne biblioteki GNU Data Access
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 %{!?with_gamin:Requires:	fam-devel}
 %{?with_gamin:Requires:	gamin-devel}
 Requires:	glib2-devel >= 1:2.12.0
+%{?with_gnomevfs:Requires:	gnome-vfs2-devel >= 2.0}
 Requires:	gtk-doc-common
+Requires:	libgcrypt-devel >= 1.1.42
 Requires:	libxml2-devel >= 1:2.6.26
 Requires:	libxslt-devel >= 1.1.17
 Obsoletes:	libgda0-devel
@@ -110,7 +118,7 @@
 
 %package static
 Summary:	GNU Data Access static libraries
-Summary(pl.UTF-8):   Statyczne biblioteki GNU Data Access
+Summary(pl.UTF-8):	Statyczne biblioteki GNU Data Access
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
@@ -122,8 +130,8 @@
 
 %package provider-db
 Summary:	GDA Berkeley DB provider
-Summary(pl.UTF-8):   Źródło danych Berkeley DB dla GDA
-Group:		Applications/Databases
+Summary(pl.UTF-8):	Źródło danych Berkeley DB dla GDA
+Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description provider-db
@@ -134,8 +142,8 @@
 
 %package provider-firebird
 Summary:	GDA Firebird provider
-Summary(pl.UTF-8):   Źródło danych Firebird dla GDA
-Group:		Applications/Databases
+Summary(pl.UTF-8):	Źródło danych Firebird dla GDA
+Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description provider-firebird
@@ -146,8 +154,8 @@
 
 %package provider-freetds
 Summary:	GDA FreeTDS provider
-Summary(pl.UTF-8):   Źródło danych FreeTDS dla GDA
-Group:		Applications/Databases
+Summary(pl.UTF-8):	Źródło danych FreeTDS dla GDA
+Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description provider-freetds
@@ -158,8 +166,8 @@
 
 %package provider-ldap
 Summary:	GDA LDAP provider
-Summary(pl.UTF-8):   Źródło danych LDAP dla GDA
-Group:		Applications/Databases
+Summary(pl.UTF-8):	Źródło danych LDAP dla GDA
+Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description provider-ldap
@@ -170,8 +178,8 @@
 
 %package provider-mdb
 Summary:	GDA MDB provider
-Summary(pl.UTF-8):   Źródło danych MDB
-Group:		Applications/Databases
+Summary(pl.UTF-8):	Źródło danych MDB
+Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	mdbtools-libs >= 0.6
 
@@ -183,8 +191,8 @@
 
 %package provider-mysql
 Summary:	GDA MySQL provider
-Summary(pl.UTF-8):   Źródło danych MySQL dla GDA
-Group:		Applications/Databases
+Summary(pl.UTF-8):	Źródło danych MySQL dla GDA
+Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Obsoletes:	libgda-mysql0
 
@@ -196,8 +204,8 @@
 
 %package provider-odbc
 Summary:	GDA ODBC provider
-Summary(pl.UTF-8):   Źródło danych ODBC dla GDA
-Group:		Applications/Databases
+Summary(pl.UTF-8):	Źródło danych ODBC dla GDA
+Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description provider-odbc
@@ -208,8 +216,8 @@
 
 %package provider-postgres
 Summary:	GDA PostgreSQL provider
-Summary(pl.UTF-8):   Źródło danych PostgreSQL dla GDA
-Group:		Applications/Databases
+Summary(pl.UTF-8):	Źródło danych PostgreSQL dla GDA
+Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Obsoletes:	libgda-postgres0
 
@@ -221,8 +229,8 @@
 
 %package provider-sqlite
 Summary:	GDA SQLite provider
-Summary(pl.UTF-8):   Źródło danych SQLite dla GDA
-Group:		Applications/Databases
+Summary(pl.UTF-8):	Źródło danych SQLite dla GDA
+Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description provider-sqlite
@@ -233,8 +241,8 @@
 
 %package provider-xbase
 Summary:	GDA xBase provider
-Summary(pl.UTF-8):   Źródło danych xBase dla GDA
-Group:		Applications/Databases
+Summary(pl.UTF-8):	Źródło danych xBase dla GDA
+Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description provider-xbase
@@ -247,8 +255,11 @@
 %setup -q -n libgda-%{version}
 %patch1 -p1
 
-%if ! %{with gamin}
-sed -i -e 's#\(PKG_CHECK_MODULES(GAMIN.*\)#dnl \1#g' configure.in
+%if %{without gamin}
+sed -i -e 's#PKG_CHECK_MODULES(GAMIN.*)#have_fam=no#g' configure.in
+%endif
+%if %{without gnomevfs}
+sed -i -e 's#PKG_CHECK_MODULES(GNOMEVFS.*)#have_gnomevfs=no#g' configure.in
 %endif
 
 %build
@@ -298,9 +309,13 @@
 %attr(755,root,root) %{_bindir}/gda-config-tool-3.0
 %attr(755,root,root) %{_bindir}/gda-list-server-op-3.0
 %attr(755,root,root) %{_libdir}/libgda-3.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgda-3.0.so.3
 %attr(755,root,root) %{_libdir}/libgda-report-3.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgda-report-3.0.so.3
 %attr(755,root,root) %{_libdir}/libgda-xslt-3.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgda-xslt-3.0.so.0
 %attr(755,root,root) %{_libdir}/libgdasql-3.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgdasql-3.0.so.3
 %dir %{_libdir}/%{_libgdadir}
 %dir %{_providersdir}
 %{_datadir}/libgda-3.0
@@ -320,6 +335,7 @@
 %attr(755,root,root) %{_bindir}/gda-test-connection-3.0
 %attr(755,root,root) %{_libdir}/libgda-3.0.so
 %attr(755,root,root) %{_libdir}/libgda-report-3.0.so
+%attr(755,root,root) %{_libdir}/libgda-xslt-3.0.so
 %attr(755,root,root) %{_libdir}/libgdasql-3.0.so
 %{_libdir}/libgda-3.0.la
 %{_libdir}/libgda-report-3.0.la
@@ -404,6 +420,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2008-01-26 11:15:05  qboosh
+- BR+R: libgcrypt-devel, gnome-vfs2-devel (+gnomevfs=gnome bcond)
+- no apps here - group changed to Libraries
+- added missing libgda-xslt symlink
+
 Revision 1.15  2007-11-18 18:12:58  arekm
 - rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libgda3.spec?r1=1.15&r2=1.16&f=u

