packages: unixODBC/unixODBC.spec, unixODBC/unixODBC-libltdl-shared.patch, u...
qboosh
qboosh at pld-linux.org
Tue Oct 27 18:05:30 CET 2009
Author: qboosh Date: Tue Oct 27 17:05:30 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.2.14
- updated URLs
- updated libltdl-shared patch
- removed obsolete flex,gODBCConfig,types,symbols patches
- GNOME 1.x-based gODBCConfig is gone
- txt driver temporarily(?) gone
- todo: build qt4 GUI parts
---- Files affected:
packages/unixODBC:
unixODBC.spec (1.119 -> 1.120)
packages/unixODBC:
unixODBC-libltdl-shared.patch (1.4 -> 1.5) , unixODBC-flex.patch (1.2 -> NONE) (REMOVED), unixODBC-gODBCConfig.patch (1.5 -> NONE) (REMOVED), unixODBC-symbols.patch (1.2 -> NONE) (REMOVED), unixODBC-types.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/unixODBC/unixODBC.spec
diff -u packages/unixODBC/unixODBC.spec:1.119 packages/unixODBC/unixODBC.spec:1.120
--- packages/unixODBC/unixODBC.spec:1.119 Mon Sep 14 14:22:37 2009
+++ packages/unixODBC/unixODBC.spec Tue Oct 27 18:05:24 2009
@@ -1,38 +1,27 @@
# $Revision$, $Date$
+# TODO: qt4 GUI parts
#
# Conditional build:
-%bcond_with gnome1 # GNOME1 GUI stuff (no GNOME2 port yet)
%bcond_without qt # Qt GUI stuff
#
Summary: unixODBC - a complete, free/open, ODBC solution for UNIX/Linux
Summary(pl.UTF-8): unixODBC - kompletne, darmowe/otwarte ODBC dla UNIX/Linuksa
Name: unixODBC
-Version: 2.2.12
-Release: 9
-License: LGPL
+Version: 2.2.14
+Release: 1
+License: LGPL v2+ (libraries), GPL v2+ (programs, News Server driver)
Group: Libraries
-# WARNING: they used to place snapshots of new versions using %{name}-%{version}.tar.gz
-# scheme - so check for official releases on URL!
-Source0: ftp://ftp.easysoft.com/pub/unixODBC/%{name}-%{version}.tar.gz
-# Source0-md5: 9a116aad4059c31d231b626ffdf1869a
+Source0: ftp://ftp.unixodbc.org/pub/unixODBC/%{name}-%{version}.tar.gz
+# Source0-md5: 0b88d6970058acb0d814d8209af63b4a
Source1: DataManager.desktop
Source2: ODBCConfig.desktop
Source3: ODBCtest.desktop
Source4: %{name}.png
Patch0: %{name}-no_libnsl.patch
Patch1: %{name}-libltdl-shared.patch
-Patch2: %{name}-flex.patch
-Patch3: %{name}-gODBCConfig.patch
-# XXX: this may be evil, depending on what uses these types.
-# only two Win32-specific functions from unixODBC sources use them,
-# but what about other projects using ODBC?
-Patch4: %{name}-types.patch
-Patch5: %{name}-symbols.patch
-URL: http://www.unixodbc.com/
+URL: http://www.unixodbc.org/
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: gettext-devel
-%{?with_gnome1:BuildRequires: gnome-libs-devel}
BuildRequires: libltdl-devel
BuildRequires: libtool >= 1:1.4.2-9
%{?with_qt:BuildRequires: qt-devel >= 2.0}
@@ -40,6 +29,9 @@
BuildConflicts: kdesupport-odbc
Requires(post): /sbin/ldconfig
Obsoletes: libunixODBC2
+Obsoletes: unixODBC-gnome
+Obsoletes: unixODBC-gnome-devel
+Obsoletes: unixODBC-gnome-static
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -74,46 +66,6 @@
%description static -l pl.UTF-8
Biblioteki statyczne unixODBC.
-%package gnome
-Summary: GNOME library and configuration GUI for unixODBC
-Summary(pl.UTF-8): Oparta na GNOME biblioteka i graficzny konfigurator dla unixODBC
-Group: X11/Applications
-Requires: %{name} = %{version}-%{release}
-
-%description gnome
-GNOME library (libgtkodbcconfig) and configuration GUI (gODBCConfig)
-for unixODBC.
-
-%description gnome -l pl.UTF-8
-Oparta na GNOME biblioteka (libgtkodbcconfig) i graficzny konfigurator
-(gODBCConfig) do unixODBC.
-
-%package gnome-devel
-Summary: Header file for libgtkodbcconfig library
-Summary(pl.UTF-8): Plik nagłówkowy biblioteki libgtkodbcconfig
-Group: X11/Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-gnome = %{version}-%{release}
-Requires: gnome-libs-devel
-
-%description gnome-devel
-Header file for libgtkodbcconfig library.
-
-%description gnome-devel -l pl.UTF-8
-Plik nagłówkowy biblioteki libgtkodbcconfig.
-
-%package gnome-static
-Summary: Static libgtkodbcconfig library
-Summary(pl.UTF-8): Statyczna biblioteka libgtkodbcconfig
-Group: X11/Development/Libraries
-Requires: %{name}-gnome-devel = %{version}-%{release}
-
-%description gnome-static
-Static libgtkodbcconfig library.
-
-%description gnome-static -l pl.UTF-8
-Statyczna biblioteka libgtkodbcconfig.
-
%package qt
Summary: Qt-based GUIs for unixODBC
Summary(pl.UTF-8): Oparte na Qt graficzne interfejsy dla unixODBC
@@ -134,11 +86,6 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-# breaks build of OOo and we have no idea what it was added in first place
-# %patch4 -p1
-%patch5 -p1
%build
%{__libtoolize}
@@ -146,7 +93,7 @@
%{__autoconf}
%{__automake}
%configure \
- --enable-ltdl-install=no \
+ --disable-ltdl-install \
%if %{with qt}
--enable-gui \
--with-qt-includes=/usr/include/qt \
@@ -154,25 +101,10 @@
%else
--disable-gui \
%endif
- --enable-drivers \
- --enable-static \
- --enable-threads \
- --x-includes=/usr/include
+ --enable-static
%{__make}
-%if %{with gnome1}
-cd gODBCConfig
-%{__gettextize}
-%{__libtoolize}
-%{__aclocal} -I macros
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure
-%{__make}
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -185,11 +117,6 @@
install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
%endif
-%if %{with gnome1}
-%{__make} install -C gODBCConfig \
- DESTDIR=$RPM_BUILD_ROOT
-%endif
-
find doc -name Makefile\* -exec rm -f {} \;
%if %{with qt}
@@ -201,7 +128,7 @@
# Setup drivers are lt_dlopened by given name (.so or SONAME)
rm $RPM_BUILD_ROOT%{_libdir}/lib{esoob,mimer,odbc{drvcfg{1,2},mini,my,nn,psql,txt},oplodbc,oraodbc,sapdb,tds}S.{la,a}
# Drivers are lt_dlopened by given name (.so or SONAME)
-rm $RPM_BUILD_ROOT%{_libdir}/lib{boundparam,nn,odbcpsql,odbctxt,template}.{la,a}
+rm $RPM_BUILD_ROOT%{_libdir}/lib{boundparam,nn,odbcpsql,template}.{la,a}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -212,7 +139,7 @@
/usr/bin/odbcinst -i -d -r <<EOF
[TXT]
Description = Text file driver
-Driver = %{_libdir}/libodbctxt.so.1
+#Driver = %{_libdir}/libodbctxt.so.1
Setup = %{_libdir}/libodbctxtS.so.1
EOF
# install postgresql driver
@@ -225,15 +152,12 @@
%postun -p /sbin/ldconfig
-%post gnome -p /sbin/ldconfig
-%postun gnome -p /sbin/ldconfig
-
%post qt -p /sbin/ldconfig
%postun qt -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
-%doc AUTHORS NEWS doc/AdministratorManual doc/UserManual
+%doc AUTHORS ChangeLog NEWS README doc/AdministratorManual doc/UserManual
%attr(755,root,root) %{_bindir}/dltest
%attr(755,root,root) %{_bindir}/isql
%attr(755,root,root) %{_bindir}/iusql
@@ -271,8 +195,8 @@
%attr(755,root,root) %ghost %{_libdir}/libodbcpsql.so.2
%attr(755,root,root) %{_libdir}/libodbcpsqlS.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libodbcpsqlS.so.1
-%attr(755,root,root) %{_libdir}/libodbctxt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libodbctxt.so.1
+#%attr(755,root,root) %{_libdir}/libodbctxt.so.*.*.*
+#%attr(755,root,root) %ghost %{_libdir}/libodbctxt.so.1
%attr(755,root,root) %{_libdir}/libodbctxtS.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libodbctxtS.so.1
%attr(755,root,root) %{_libdir}/liboplodbcS.so.*.*.*
@@ -297,7 +221,7 @@
%attr(755,root,root) %{_libdir}/libodbcnnS.so
%attr(755,root,root) %{_libdir}/libodbcpsql.so
%attr(755,root,root) %{_libdir}/libodbcpsqlS.so
-%attr(755,root,root) %{_libdir}/libodbctxt.so
+#%attr(755,root,root) %{_libdir}/libodbctxt.so
%attr(755,root,root) %{_libdir}/libodbctxtS.so
%attr(755,root,root) %{_libdir}/liboplodbcS.so
%attr(755,root,root) %{_libdir}/liboraodbcS.so
@@ -310,6 +234,7 @@
%attr(755,root,root) %{_libdir}/libboundparam.so
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/odbc.ini
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/odbcinst.ini
+%dir %{_sysconfdir}/ODBCDataSources
%files devel
%defattr(644,root,root,755)
@@ -327,6 +252,7 @@
%{_includedir}/sqlext.h
%{_includedir}/sqltypes.h
%{_includedir}/sqlucode.h
+%{_includedir}/unixodbc_conf.h
%{_includedir}/uodbc_extras.h
%{_includedir}/uodbc_stats.h
@@ -336,25 +262,6 @@
%{_libdir}/libodbc.a
%{_libdir}/libodbcinst.a
-%if %{with gnome1}
-%files gnome
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gODBCConfig
-%attr(755,root,root) %{_libdir}/libgtkodbcconfig.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgtkodbcconfig.so.0
-%{_pixmapsdir}/gODBCConfig
-
-%files gnome-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgtkodbcconfig.so
-%{_libdir}/libgtkodbcconfig.la
-%{_includedir}/odbcconfig.h
-
-%files gnome-static
-%defattr(644,root,root,755)
-%{_libdir}/libgtkodbcconfig.a
-%endif
-
%if %{with qt}
%files qt
%defattr(644,root,root,755)
@@ -377,6 +284,15 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.120 2009/10/27 17:05:24 qboosh
+- updated to 2.2.14
+- updated URLs
+- updated libltdl-shared patch
+- removed obsolete flex,gODBCConfig,types,symbols patches
+- GNOME 1.x-based gODBCConfig is gone
+- txt driver temporarily(?) gone
+- todo: build qt4 GUI parts
+
Revision 1.119 2009/09/14 12:22:37 tommat
- there is no libodbcinstQ without qt
================================================================
Index: packages/unixODBC/unixODBC-libltdl-shared.patch
diff -u packages/unixODBC/unixODBC-libltdl-shared.patch:1.4 packages/unixODBC/unixODBC-libltdl-shared.patch:1.5
--- packages/unixODBC/unixODBC-libltdl-shared.patch:1.4 Fri Nov 24 18:30:01 2006
+++ packages/unixODBC/unixODBC-libltdl-shared.patch Tue Oct 27 18:05:28 2009
@@ -1,10 +1,10 @@
---- unixODBC-2.2.9/Makefile.am.orig 2004-06-29 14:11:02.000000000 +0200
-+++ unixODBC-2.2.9/Makefile.am 2004-07-07 20:10:49.461109840 +0200
+--- unixODBC-2.2.14/Makefile.am.orig 2008-09-02 14:29:31.000000000 +0200
++++ unixODBC-2.2.14/Makefile.am 2009-10-25 09:00:03.804435785 +0100
@@ -3,7 +3,6 @@
- log \
+ log \
lst \
ini \
-- libltdl \
+- libltdl \
odbcinst \
DriverManager \
odbcinstQ \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/unixODBC/unixODBC.spec?r1=1.119&r2=1.120&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/unixODBC/unixODBC-libltdl-shared.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list