rpms/compat-libgda/devel compat-libgda.spec, NONE, 1.1 libgda-1.2.0-configure.patch, NONE, 1.1 libgda-1.2.3-configpath.patch, NONE, 1.1 libgda-1.2.3-gdasql.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Denis Leroy (denis)
fedora-extras-commits at redhat.com
Mon Sep 11 18:07:28 UTC 2006
Author: denis
Update of /cvs/extras/rpms/compat-libgda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5539/devel
Modified Files:
.cvsignore sources
Added Files:
compat-libgda.spec libgda-1.2.0-configure.patch
libgda-1.2.3-configpath.patch libgda-1.2.3-gdasql.patch
Log Message:
auto-import compat-libgda-1.2.3-3 on branch devel from compat-libgda-1.2.3-3.src.rpm
--- NEW FILE compat-libgda.spec ---
# Default provider build options (MySQL, Postgres & unixODBC)
#
# Package build options:
# --without tds
# --without db2
# --without oracle
# --with sqlite
# --without sybase
# --without mdb
# --with ldap
# --with xbase
# --with mysql
# --with odbc
# --with postgres
#
%define FREETDS 0
%define IBMDB2 0
%define MYSQL 1
%define ODBC 1
%define ORACLE 0
%define POSTGRES 1
%define SQLITE 1
%define SYBASE 0
%define MDB 0
%define LDAP 1
%define XBASE 1
%{?_with_tds:%define FREETDS 1}
%{?_with_db2:%define IBMDB2 1}
%{?_without_ldap:%define LDAP 0}
%{?_with_mdb:%define MDB 1}
%{?_with_oracle:%define ORACLE 1}
%{?_without_sqlite:%define SQLITE 0}
%{?_with_sybase:%define SYBASE 1}
%{?_without_mysql:%define MYSQL 0}
%{?_without_odbc:%define ODBC 0}
%{?_without_xbase:%define XBASE 0}
%{?_without_postgres:%define POSTGRES 0}
Summary: Library for writing gnome database programs
Name: compat-libgda
Version: 1.2.3
Release: 3%{?dist}
Source: http://ftp.gnome.org/pub/GNOME/sources/libgda/1.2/libgda-%{version}.tar.bz2
URL: http://www.gnome-db.org/
Group: System Environment/Libraries
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: pkgconfig >= 0.8
Requires: glib2 >= 2.0.0
Requires: libxslt >= 1.0.9
Requires: ncurses
BuildRequires: glib2-devel >= 2.0.0
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel >= 1.0.9
BuildRequires: ncurses-devel
BuildRequires: scrollkeeper gettext
BuildRequires: groff
BuildRequires: readline-devel
BuildRequires: db4-devel
BuildRequires: automake autoconf libtool gtk-doc
%if %{FREETDS}
BuildRequires: freetds-devel
%endif
%if %{MYSQL}
BuildRequires: mysqlclient10-devel
%endif
%if %{POSTGRES}
BuildRequires: postgresql-devel
%endif
%if %{ODBC}
BuildRequires: unixODBC-devel
%endif
%if %{SQLITE}
BuildRequires: sqlite-devel
%endif
%if %{MDB}
BuildRequires: mdbtools-devel
%endif
%if %{LDAP}
BuildRequires: openldap-devel
%endif
%if %{XBASE}
BuildRequires: xbase-devel
%endif
Patch0: libgda-1.2.0-configure.patch
Patch1: libgda-1.2.3-gdasql.patch
Patch2: libgda-1.2.3-configpath.patch
%description
libgda is a library that eases the task of writing
gnome database programs.
%package devel
Summary: Development libraries and header files for libgda
Group: Development/Libraries
Requires: glib2-devel >= 2.0.0
Requires: libxml2-devel
Requires: libxslt-devel >= 1.0.9
Requires: db4-devel
Requires: %{name} = %{version}-%{release}
%description devel
This package contains the header files and libraries needed to write
or compile programs that use libgda.
%if %{FREETDS}
%package -n compat-gda-freetds
Summary: GDA FreeTDS Provider
Group: System Environment/Libraries
License: GPL
%description -n compat-gda-freetds
This package includes the GDA FreeTDS provider.
%endif
%if %{IBMDB2}
%package -n compat-gda-ibmdb2
Summary: GDA IBM DB2 Provider
Group: System Environment/Libraries
License: GPL
%description -n compat-gda-ibmdb2
This package includes the GDA IBM DB2 provider.
%endif
%if %{MYSQL}
%package -n compat-gda-mysql
Summary: GDA MySQL Provider
Group: System Environment/Libraries
License: GPL
%description -n compat-gda-mysql
This package includes the GDA MySQL provider.
%endif
%if %{ODBC}
%package -n compat-gda-odbc
Summary: GDA ODBC Provider
Group: System Environment/Libraries
License: GPL
%description -n compat-gda-odbc
This package includes the GDA ODBC provider.
%endif
%if %{ORACLE}
%package -n compat-gda-oracle
Summary: GDA Oracle Provider
Group: System Environment/Libraries
License: GPL
%description -n compat-gda-oracle
This package includes the GDA Oracle provider.
%endif
%if %{POSTGRES}
%package -n compat-gda-postgres
Summary: GDA PostgreSQL Provider
Group: System Environment/Libraries
License: GPL
%description -n compat-gda-postgres
This package includes the GDA PostgreSQL provider.
%endif
%if %{SQLITE}
%package -n compat-gda-sqlite
Summary: GDA SQLite Provider
Group: System Environment/Libraries
License: GPL
%description -n compat-gda-sqlite
This package includes the GDA SQLite provider.
%endif
%if %{SYBASE}
%package -n compat-gda-sybase
Summary: GDA Sybase Provider
Group: System Environment/Libraries
License: GPL
%description -n compat-gda-sybase
This package includes the GDA Sybase provider.
%endif
%if %{MDB}
%package -n compat-gda-mdb
Summary: GDA MDB Provider
Group: System Environment/Libraries
License: GPL
%description -n compat-gda-mdb
This package includes the GDA MDB provider.
%endif
%if %{LDAP}
%package -n compat-gda-ldap
Summary: GDA LDAP Provider
Group: System Environment/Libraries
License: GPL
%description -n compat-gda-ldap
This package includes the GDA LDAP provider.
%endif
%if %{XBASE}
%package -n compat-gda-xbase
Summary: GDA XBASE Provider
Group: System Environment/Libraries
License: GPL
%description -n compat-gda-xbase
This package includes the GDA XBASE provider.
%endif
%prep
%setup -q -n libgda-%{version}
%patch0 -p1 -b .configure
%patch1 -p1 -b .gdasql
%patch2 -p1 -b .config
%build
aclocal
automake
autoconf
%if %{FREETDS}
CONFIG="$CONFIG --with-tds"
%else
CONFIG="$CONFIG --without-tds"
%endif
%if %{IBMDB2}
CONFIG="$CONFIG --with-ibmdb2"
%else
CONFIG="$CONFIG --without-ibmdb2"
%endif
%if %{MYSQL}
CONFIG="$CONFIG --with-mysql"
%else
CONFIG="$CONFIG --without-mysql"
%endif
%if %{POSTGRES}
CONFIG="$CONFIG --with-postgres"
%else
CONFIG="$CONFIG --without-postgres"
%endif
%if %{ODBC}
CONFIG="$CONFIG --with-odbc"
%else
CONFIG="$CONFIG --without-odbc"
%endif
%if %{ORACLE}
CONFIG="$CONFIG --with-oracle"
%else
CONFIG="$CONFIG --without-oracle"
%endif
%if %{SQLITE}
CONFIG="$CONFIG --with-sqlite"
%else
CONFIG="$CONFIG --without-sqlite"
%endif
%if %{SYBASE}
CONFIG="$CONFIG --with-sybase"
%else
CONFIG="$CONFIG --without-sybase"
%endif
%if %{MDB}
CONFIG="$CONFIG --with-mdb"
%else
CONFIG="$CONFIG --without-mdb"
%endif
%if %{LDAP}
CONFIG="$CONFIG --with-ldap"
%else
CONFIG="$CONFIG --without-ldap"
%endif
%if %{XBASE}
CONFIG="$CONFIG --with-xbase"
%else
CONFIG="$CONFIG --without-xbase"
%endif
%configure $CONFIG --disable-static --disable-gtk-doc
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
# Need to set these exectutable so that they get stripped into debuginfo
chmod +x $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
chmod +x $RPM_BUILD_ROOT%{_libdir}/libgda/providers/libgda-*
rm -fr $RPM_BUILD_ROOT%{_datadir}/gtk-doc
rm -fr $RPM_BUILD_ROOT%{_datadir}/omf
rm -fr $RPM_BUILD_ROOT%{_bindir}
rm -fr $RPM_BUILD_ROOT%{_mandir}
rm -fr $RPM_BUILD_ROOT%{_datadir}/libgda
%find_lang libgda-2
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files -f libgda-2.lang
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING.LIB ChangeLog README NEWS
%dir %{_sysconfdir}/compat-libgda
%config(noreplace) %{_sysconfdir}/compat-libgda/config
%{_libdir}/*.so.*
%dir %{_libdir}/libgda
%dir %{_libdir}/libgda/providers
%{_libdir}/libgda/providers/libgda-xml.so
%{_libdir}/libgda/providers/libgda-bdb.so
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%if %{FREETDS}
%files -n compat-gda-freetds
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-freetds.so
%endif
%if %{IBMDB2}
%files -n compat-gda-ibmdb2
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-ibmdb2.so
%endif
%if %{MYSQL}
%files -n compat-gda-mysql
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-mysql.so
%endif
%if %{ODBC}
%files -n compat-gda-odbc
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-odbc.so
%endif
%if %{ORACLE}
%files -n compat-gda-oracle
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-oracle.so
%endif
%if %{POSTGRES}
%files -n compat-gda-postgres
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-postgres.so
%endif
%if %{SQLITE}
%files -n compat-gda-sqlite
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-sqlite.so
%endif
%if %{SYBASE}
%files -n compat-gda-sybase
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-sybase.so
%endif
%if %{MDB}
%files -n compat-gda-mdb
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-mdb.so
%endif
%if %{LDAP}
%files -n compat-gda-ldap
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-ldap.so
%endif
%if %{XBASE}
%files -n compat-gda-xbase
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-xbase.so
%endif
%changelog
* Mon Sep 11 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.3-3
- add xbase
- enable everything we can by default (they're subpackages)
- make sure all the libs get stripped into debuginfo
- use URL to Source0
- use correct license tags
* Mon Jul 24 2006 Denis Leroy <denis at poolshark.org> - 1.2.3-2
- Fixed compat configuration directory
* Wed Jul 5 2006 Denis Leroy <denis at poolshark.org> - 1.2.3-1
- First draft, based on FC-4 libgda.spec
libgda-1.2.0-configure.patch:
--- NEW FILE libgda-1.2.0-configure.patch ---
--- libgda-1.2.0/configure.in.orig 2005-02-04 09:54:32.000000000 +0000
+++ libgda-1.2.0/configure.in 2005-02-04 09:59:32.030377459 +0000
@@ -251,7 +251,7 @@
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 = xno; then
AC_MSG_CHECKING(for MySQL files)
libgda-1.2.3-configpath.patch:
--- NEW FILE libgda-1.2.3-configpath.patch ---
--- libgda-1.2.3.orig/libgda/Makefile.in 2005-10-31 11:54:28.000000000 +0100
+++ libgda-1.2.3/libgda/Makefile.in 2006-07-07 19:10:22.000000000 +0200
@@ -345,7 +345,7 @@
$(LIBGDA_CFLAGS) \
-DLIBGDA_PLUGINDIR=\""$(libdir)/libgda/providers"\" \
-DLIBGDA_LOCALEDIR=\""$(datadir)/locale"\" \
- -DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/libgda/config"\"
+ -DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/compat-libgda/config"\"
gda_marshal_built_files = gda-marshal.h gda-marshal.c
gda_headers = \
--- libgda-1.2.3.orig/libgda/Makefile.am 2006-07-24 09:54:21.000000000 +0200
+++ libgda-1.2.3/libgda/Makefile.am 2005-06-25 14:17:36.000000000 +0200
@@ -6,7 +6,7 @@
$(LIBGDA_CFLAGS) \
-DLIBGDA_PLUGINDIR=\""$(libdir)/libgda/providers"\" \
-DLIBGDA_LOCALEDIR=\""$(datadir)/locale"\" \
- -DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/libgda/config"\"
+ -DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/compat-libgda/config"\"
gda_marshal_built_files = gda-marshal.h gda-marshal.c
--- libgda-1.2.3.orig/data/Makefile.am 2006-07-24 10:06:29.000000000 +0200
+++ libgda-1.2.3/data/Makefile.am 2002-11-12 13:32:03.000000000 +0100
@@ -1,5 +1,5 @@
# Default global configuration file
-configdir = $(sysconfdir)/libgda
+configdir = $(sysconfdir)/compat-libgda
config_DATA = config
xmldir = $(datadir)/libgda/xml
--- libgda-1.2.3.orig/data/Makefile.in 2005-10-31 11:54:28.000000000 +0100
+++ libgda-1.2.3/data/Makefile.in 2006-07-24 10:07:56.000000000 +0200
@@ -301,7 +301,7 @@
target_alias = @target_alias@
# Default global configuration file
-configdir = $(sysconfdir)/libgda
+configdir = $(sysconfdir)/compat-libgda
config_DATA = config
xmldir = $(datadir)/libgda/xml
xml_DATA = gda-xml-query.dtd \
libgda-1.2.3-gdasql.patch:
--- NEW FILE libgda-1.2.3-gdasql.patch ---
--- libgda-1.2.3.orig/libgda/Makefile.in 2005-10-31 11:54:28.000000000 +0100
+++ libgda-1.2.3/libgda/Makefile.in 2006-07-07 18:59:37.000000000 +0200
@@ -57,7 +57,7 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libgda_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/libsql/libgdasql.la
+ $(top_builddir)/libsql/libcompatgdasql.la
am__objects_1 = gda-enum-types.lo
am__objects_2 =
am__objects_3 = $(am__objects_2) gda-blob.lo gda-client.lo \
@@ -459,7 +459,7 @@
$(libgda_sources)
libgda_2_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE)
-libgda_2_la_LIBADD = $(LIBGDA_LIBS) $(top_builddir)/libsql/libgdasql.la
+libgda_2_la_LIBADD = $(LIBGDA_LIBS) $(top_builddir)/libsql/libcompatgdasql.la
gdaincludedir = $(includedir)/libgda-$(GDA_MAJOR_VERSION).$(GDA_MINOR_VERSION)/libgda
gdainclude_HEADERS = $(libgda_built_headers) $(gda_headers)
CLEANFILES = $(libgda_built_headers) $(libgda_built_cfiles) \
--- libgda-1.2.3.orig/libsql/Makefile.in 2005-10-31 12:57:42.000000000 +0100
+++ libgda-1.2.3/libsql/Makefile.in 2006-07-07 18:59:47.000000000 +0200
@@ -40,7 +40,7 @@
host_triplet = @host@
noinst_PROGRAMS = sql_parser_test$(EXEEXT)
subdir = libsql
-DIST_COMMON = $(libgdasqlinc_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(libcompatgdasqlinc_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -54,13 +54,13 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libgdasqlincdir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libcompatgdasqlincdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
-libgdasql_la_LIBADD =
-am_libgdasql_la_OBJECTS = parser.lo lexer.lo sql_parser.lo mem.lo \
+libcompatgdasql_la_LIBADD =
+am_libcompatgdasql_la_OBJECTS = parser.lo lexer.lo sql_parser.lo mem.lo \
sql_display.lo sql_tree.lo
-libgdasql_la_OBJECTS = $(am_libgdasql_la_OBJECTS)
+libcompatgdasql_la_OBJECTS = $(am_libcompatgdasql_la_OBJECTS)
PROGRAMS = $(noinst_PROGRAMS)
am_sql_parser_test_OBJECTS = sql_parser_test.$(OBJEXT)
sql_parser_test_OBJECTS = $(am_sql_parser_test_OBJECTS)
@@ -75,10 +75,10 @@
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libgdasql_la_SOURCES) $(sql_parser_test_SOURCES)
-DIST_SOURCES = $(libgdasql_la_SOURCES) $(sql_parser_test_SOURCES)
-libgdasqlincHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(libgdasqlinc_HEADERS)
+SOURCES = $(libcompatgdasql_la_SOURCES) $(sql_parser_test_SOURCES)
+DIST_SOURCES = $(libcompatgdasql_la_SOURCES) $(sql_parser_test_SOURCES)
+libcompatgdasqlincHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libcompatgdasqlinc_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -329,8 +329,8 @@
-I$(top_builddir) \
$(LIBGDA_CFLAGS)
-lib_LTLIBRARIES = libgdasql.la
-libgdasql_la_SOURCES = \
+lib_LTLIBRARIES = libcompatgdasql.la
+libcompatgdasql_la_SOURCES = \
parser.c \
parser.h \
lexer.c \
@@ -342,13 +342,13 @@
sql_tree.c \
sql_tree.h
-libgdasqlincdir = $(includedir)/libgda-$(GDA_MAJOR_VERSION).$(GDA_MINOR_VERSION)/sql
-libgdasqlinc_HEADERS = sql_parser.h
-libgdasql_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(LIBGDA_LIBS)
+libcompatgdasqlincdir = $(includedir)/libgda-$(GDA_MAJOR_VERSION).$(GDA_MINOR_VERSION)/sql
+libcompatgdasqlinc_HEADERS = sql_parser.h
+libcompatgdasql_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(LIBGDA_LIBS)
sql_parser_test_SOURCES = sql_parser_test.c
sql_parser_test_LDFLAGS = $(LIBGDA_LIBS)
-sql_parser_test_DEPENDENCIES = libgdasql.la
-sql_parser_test_LDADD = libgdasql.la
+sql_parser_test_DEPENDENCIES = libcompatgdasql.la
+sql_parser_test_LDADD = libcompatgdasql.la
EXTRA_DIST = parser.y lexer.l
all: all-am
@@ -410,8 +410,8 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libgdasql.la: $(libgdasql_la_OBJECTS) $(libgdasql_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libgdasql_la_LDFLAGS) $(libgdasql_la_OBJECTS) $(libgdasql_la_LIBADD) $(LIBS)
+libcompatgdasql.la: $(libcompatgdasql_la_OBJECTS) $(libcompatgdasql_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libcompatgdasql_la_LDFLAGS) $(libcompatgdasql_la_OBJECTS) $(libcompatgdasql_la_LIBADD) $(LIBS)
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
@@ -467,22 +467,22 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
-install-libgdasqlincHEADERS: $(libgdasqlinc_HEADERS)
+install-libcompatgdasqlincHEADERS: $(libcompatgdasqlinc_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(libgdasqlincdir)" || $(mkdir_p) "$(DESTDIR)$(libgdasqlincdir)"
- @list='$(libgdasqlinc_HEADERS)'; for p in $$list; do \
+ test -z "$(libcompatgdasqlincdir)" || $(mkdir_p) "$(DESTDIR)$(libcompatgdasqlincdir)"
+ @list='$(libcompatgdasqlinc_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(libgdasqlincHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdasqlincdir)/$$f'"; \
- $(libgdasqlincHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdasqlincdir)/$$f"; \
+ echo " $(libcompatgdasqlincHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcompatgdasqlincdir)/$$f'"; \
+ $(libcompatgdasqlincHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcompatgdasqlincdir)/$$f"; \
done
-uninstall-libgdasqlincHEADERS:
+uninstall-libcompatgdasqlincHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(libgdasqlinc_HEADERS)'; for p in $$list; do \
+ @list='$(libcompatgdasqlinc_HEADERS)'; for p in $$list; do \
f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(libgdasqlincdir)/$$f'"; \
- rm -f "$(DESTDIR)$(libgdasqlincdir)/$$f"; \
+ echo " rm -f '$(DESTDIR)$(libcompatgdasqlincdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(libcompatgdasqlincdir)/$$f"; \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -564,7 +564,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libgdasqlincdir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libcompatgdasqlincdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -612,7 +612,7 @@
info-am:
-install-data-am: install-libgdasqlincHEADERS
+install-data-am: install-libcompatgdasqlincHEADERS
install-exec-am: install-libLTLIBRARIES
@@ -641,7 +641,7 @@
ps-am:
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
- uninstall-libgdasqlincHEADERS
+ uninstall-libcompatgdasqlincHEADERS
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \
@@ -650,12 +650,12 @@
html-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-libLTLIBRARIES \
- install-libgdasqlincHEADERS install-man install-strip \
+ install-libcompatgdasqlincHEADERS install-man install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-info-am \
- uninstall-libLTLIBRARIES uninstall-libgdasqlincHEADERS
+ uninstall-libLTLIBRARIES uninstall-libcompatgdasqlincHEADERS
parser.c: parser.y
--- libgda-1.2.3.orig/libgda/Makefile.am 2005-06-25 14:17:36.000000000 +0200
+++ libgda-1.2.3/libgda/Makefile.am 2006-07-07 19:33:36.000000000 +0200
@@ -160,7 +160,7 @@
$(libgda_sources)
libgda_2_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE)
-libgda_2_la_LIBADD = $(LIBGDA_LIBS) $(top_builddir)/libsql/libgdasql.la
+libgda_2_la_LIBADD = $(LIBGDA_LIBS) $(top_builddir)/libsql/libcompatgdasql.la
gdaincludedir=$(includedir)/libgda-$(GDA_MAJOR_VERSION).$(GDA_MINOR_VERSION)/libgda
gdainclude_HEADERS=$(libgda_built_headers) $(gda_headers)
--- libgda-1.2.3.orig/libsql/Makefile.am 2005-10-31 12:57:38.000000000 +0100
+++ libgda-1.2.3/libsql/Makefile.am 2006-07-07 19:33:50.000000000 +0200
@@ -12,9 +12,9 @@
$(LEX) -olexer.c -Psql lexer.l
noinst_PROGRAMS = sql_parser_test
-lib_LTLIBRARIES = libgdasql.la
+lib_LTLIBRARIES = libcompatgdasql.la
-libgdasql_la_SOURCES = \
+libcompatgdasql_la_SOURCES = \
parser.c \
parser.h \
lexer.c \
@@ -25,14 +25,14 @@
sql_display.c \
sql_tree.c \
sql_tree.h
-libgdasqlincdir = $(includedir)/libgda-$(GDA_MAJOR_VERSION).$(GDA_MINOR_VERSION)/sql
-libgdasqlinc_HEADERS = sql_parser.h
-libgdasql_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(LIBGDA_LIBS)
+libcompatgdasqlincdir = $(includedir)/libgda-$(GDA_MAJOR_VERSION).$(GDA_MINOR_VERSION)/sql
+libcompatgdasqlinc_HEADERS = sql_parser.h
+libcompatgdasql_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(LIBGDA_LIBS)
sql_parser_test_SOURCES=sql_parser_test.c
sql_parser_test_LDFLAGS = $(LIBGDA_LIBS)
-sql_parser_test_DEPENDENCIES = libgdasql.la
-sql_parser_test_LDADD = libgdasql.la
+sql_parser_test_DEPENDENCIES = libcompatgdasql.la
+sql_parser_test_LDADD = libcompatgdasql.la
tests: sql_parser_test
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-libgda/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 11 Sep 2006 18:05:20 -0000 1.1
+++ .cvsignore 11 Sep 2006 18:07:28 -0000 1.2
@@ -0,0 +1 @@
+libgda-1.2.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-libgda/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 11 Sep 2006 18:05:20 -0000 1.1
+++ sources 11 Sep 2006 18:07:28 -0000 1.2
@@ -0,0 +1 @@
+eb9c31c3102d542de728f5f55674d511 libgda-1.2.3.tar.bz2
More information about the scm-commits
mailing list