rpms/libgda/devel libgda-1.9.100-configure.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libgda.spec, 1.5, 1.6 sources, 1.2, 1.3 libgda-1.2.0-64bitgnomeXXXXXX.patch, 1.1, NONE libgda-1.2.0-configure.patch, 1.1, NONE libgda-1.2.0-gnome162569.patch, 1.1, NONE libgda-1.2.0-gnomeXXXXXX.patch, 1.1, NONE libgda-1.2.0-libdir.patch, 1.1, NONE

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Sun Nov 27 20:30:35 UTC 2005 

Author: jwrdegoede

Update of /cvs/extras/rpms/libgda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27858

Modified Files:
	.cvsignore libgda.spec sources 
Added Files:
	libgda-1.9.100-configure.patch 
Removed Files:
	libgda-1.2.0-64bitgnomeXXXXXX.patch 
	libgda-1.2.0-configure.patch libgda-1.2.0-gnome162569.patch 
	libgda-1.2.0-gnomeXXXXXX.patch libgda-1.2.0-libdir.patch 
Log Message:
New upstream release 1.9.100 (for gnumeric 1.6)

libgda-1.9.100-configure.patch:

--- NEW FILE libgda-1.9.100-configure.patch ---
--- libgda-1.3.4/configure.in.configure	2005-07-08 16:44:14.000000000 +0200
+++ libgda-1.3.4/configure.in	2005-11-27 20:55:37.000000000 +0100
@@ -250,9 +250,9 @@
 mysqldir=""
 if test $try_mysql = true
 then
-	AC_PATH_PROG(MYSQL_CONFIG, mysql_config)
+	AC_PATH_PROG(MYSQL_CONFIG, mysql_config, 'no', [${libdir}/mysql3/mysql:$PATH])
 
-	if test x$MYSQL_CONFIG = x; then
+	if test x$MYSQL_CONFIG = xno; then
 		AC_MSG_CHECKING(for MySQL files)
 		for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql
 		do


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 08:13:04 -0000	1.2
+++ .cvsignore	27 Nov 2005 20:30:33 -0000	1.3
@@ -1 +1 @@
-libgda-1.2.0.tar.bz2
+libgda-1.9.100.tar.bz2


Index: libgda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libgda.spec	5 Aug 2005 17:37:02 -0000	1.5
+++ libgda.spec	27 Nov 2005 20:30:33 -0000	1.6
@@ -6,7 +6,6 @@
 # --with oracle
 # --with sybase
 # --with mdb
-# --without sqlite
 # --without ldap
 # --without mysql
 # --without odbc
@@ -19,7 +18,6 @@
 %define           ODBC     1
 %define           ORACLE   0
 %define           POSTGRES 1
-%define           SQLITE   1
 %define           SYBASE   0
 %define 	  MDB	   0
 %define		  LDAP	   1
@@ -29,7 +27,6 @@
 %{?_with_mdb:%define MDB 	1}
 %{?_with_oracle:%define ORACLE 	1}
 %{?_with_sybase:%define SYBASE 	1}
-%{?_without_sqlite:%define SQLITE 	0}
 %{?_without_ldap:%define LDAP 	0}
 %{?_without_mysql:%define MYSQL 0}
 %{?_without_odbc:%define ODBC 	0}
@@ -37,8 +34,8 @@
 
 Summary:          Library for writing gnome database programs
 Name:             libgda
-Version:          1.2.0
-Release: 	  8
+Version:          1.9.100
+Release: 	  1
 Epoch:		  1
 Source:           %{name}-%{version}.tar.bz2
 URL:              http://www.gnome-db.org/
@@ -75,10 +72,6 @@
 BuildRequires:    unixODBC-devel
 %endif
 
-%if %{SQLITE}
-BuildRequires:	  sqlite2-devel
-%endif
-
 %if %{MDB}
 BuildRequires:	  mdbtools-devel
 %endif
@@ -87,11 +80,7 @@
 BuildRequires:	  openldap-devel
 %endif
 
-Patch0: libgda-1.2.0-configure.patch
-Patch1: libgda-1.2.0-gnome162569.patch
-Patch2: libgda-1.2.0-gnomeXXXXXX.patch
-Patch3: libgda-1.2.0-64bitgnomeXXXXXX.patch
-Patch4: libgda-1.2.0-libdir.patch
+Patch0: libgda-1.9.100-configure.patch
 
 %description
 libgda is a library that eases the task of writing
@@ -171,16 +160,6 @@
 Provides:	gda-postgres = %{epoch}:%{version}-%{release}
 %endif
 
-%if %{SQLITE}
-%package sqlite
-Summary:	libgda SQLite Provider
-Group:		System Environment/Libraries
-%description sqlite
-This package includes the libgda SQLite provider.
-Obsoletes:	gda-sqlite < %{epoch}:%{version}-%{release}
-Provides:	gda-sqlite = %{epoch}:%{version}-%{release}
-%endif
-
 %if %{SYBASE}
 %package sybase
 Summary:	libgda Sybase Provider
@@ -214,10 +193,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .configure
-%patch1 -p1 -b .gnome162569
-%patch2 -p1 -b .gnomeXXXXXX
-%patch3 -p1 -b .64bitgnomeXXXXXX.patch
-%patch4 -p1 -b .libdir
 
 %build
 aclocal
@@ -259,12 +234,6 @@
 CONFIG="$CONFIG --without-oracle"
 %endif
 
-%if %{SQLITE}
-CONFIG="$CONFIG --with-sqlite"
-%else
-CONFIG="$CONFIG --without-sqlite"
-%endif
-
 %if %{SYBASE}
 CONFIG="$CONFIG --with-sybase"
 %else
@@ -291,10 +260,11 @@
 %makeinstall
 
 # Cleanup unnecessary, unpackaged files
-rm -f %{buildroot}/%{_libdir}/libgda/providers/*.{a,la}
+rm -f %{buildroot}/%{_libdir}/libgda-1.9/providers/*.{a,la}
 rm -f %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}/%{_sysconfdir}/libgda/sales_test.db
 
-%find_lang libgda-2
+%find_lang libgda-3
 
 %post -p /sbin/ldconfig
 
@@ -309,7 +279,7 @@
 %clean
 rm -rf %{buildroot}
 
-%files -f libgda-2.lang
+%files -f libgda-3.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README NEWS
 #%doc %{_datadir}/gnome/help/libgda
@@ -318,17 +288,16 @@
 %{_bindir}/*
 %{_datadir}/libgda
 %{_libdir}/*.so.*
-%dir %{_libdir}/libgda
-%dir %{_libdir}/libgda/providers
-%{_libdir}/libgda/providers/libgda-xml.so
-%{_libdir}/libgda/providers/libgda-bdb.so
+%dir %{_libdir}/libgda-1.9
+%dir %{_libdir}/libgda-1.9/providers
+%{_libdir}/libgda-1.9/providers/libgda-sqlite.so
+%{_libdir}/libgda-1.9/providers/libgda-bdb.so
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
 %files devel
 %defattr(-,root,root)
 %doc %{_datadir}/gtk-doc/html/libgda
-%{_datadir}/omf/*
 %{_includedir}/*
 %{_libdir}/*.a
 %{_libdir}/*.so
@@ -337,65 +306,65 @@
 %if %{FREETDS}
 %files freetds
 %defattr(-,root,root)
-%{_libdir}/libgda/providers/libgda-freetds.so
+%{_libdir}/libgda-1.9/providers/libgda-freetds.so
 %endif
 
 %if %{IBMDB2}
 %files ibmdb2
 %defattr(-,root,root)
-%{_libdir}/libgda/providers/libgda-ibmdb2.so
+%{_libdir}/libgda-1.9/providers/libgda-ibmdb2.so
 %endif
 
 %if %{MYSQL}
 %files mysql
 %defattr(-,root,root)
-%{_libdir}/libgda/providers/libgda-mysql.so
+%{_libdir}/libgda-1.9/providers/libgda-mysql.so
 %endif
 
 %if %{ODBC}
 %files odbc
 %defattr(-,root,root)
-%{_libdir}/libgda/providers/libgda-odbc.so
+%{_libdir}/libgda-1.9/providers/libgda-odbc.so
 %endif
 
 %if %{ORACLE}
 %files oracle
 %defattr(-,root,root)
-%{_libdir}/libgda/providers/libgda-oracle.so
+%{_libdir}/libgda-1.9/providers/libgda-oracle.so
 %endif
 
 %if %{POSTGRES}
 %files postgres
 %defattr(-,root,root)
-%{_libdir}/libgda/providers/libgda-postgres.so
-%endif
-
-%if %{SQLITE}
-%files sqlite
-%defattr(-,root,root)
-%{_libdir}/libgda/providers/libgda-sqlite.so
+%{_libdir}/libgda-1.9/providers/libgda-postgres.so
 %endif
 
 %if %{SYBASE}
 %files sybase
 %defattr(-,root,root)
-%{_libdir}/libgda/providers/libgda-sybase.so
+%{_libdir}/libgda-1.9/providers/libgda-sybase.so
 %endif
 
 %if %{MDB}
 %files mdb
 %defattr(-,root,root)
-%{_libdir}/libgda/providers/libgda-mdb.so
+%{_libdir}/libgda-1.9/providers/libgda-mdb.so
 %endif
 
 %if %{LDAP}
 %files ldap
 %defattr(-,root,root)
-%{_libdir}/libgda/providers/libgda-ldap.so
+%{_libdir}/libgda-1.9/providers/libgda-ldap.so
 %endif
 
 
 %changelog
+* Sun Nov 27 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-1
+- New upstream version
+- Drop 4 intergrated patches
+- Removed sqlite configurability, it is now an internal part of the upstream
+  sources.
+
 * Fri Aug  5 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.2.0-8
 - Remove libgda.la file from devel package.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 08:13:04 -0000	1.2
+++ sources	27 Nov 2005 20:30:33 -0000	1.3
@@ -1 +1 @@
-c18ac2dc6484c58cc9f72387abb9a10c  libgda-1.2.0.tar.bz2
+c943610dc4c9c286bb14d6ce3c6e549b  libgda-1.9.100.tar.bz2


--- libgda-1.2.0-64bitgnomeXXXXXX.patch DELETED ---


--- libgda-1.2.0-configure.patch DELETED ---


--- libgda-1.2.0-gnome162569.patch DELETED ---


--- libgda-1.2.0-gnomeXXXXXX.patch DELETED ---


--- libgda-1.2.0-libdir.patch DELETED ---

More information about the fedora-extras-commits mailing list