Some more fixes to get it to build with the real modular X.
This commit is contained in:
parent
460f091e48
commit
a5634d28f1
@ -1,7 +1,7 @@
|
||||
Summary: A complete ODBC driver manager for Linux.
|
||||
Name: unixODBC
|
||||
Version: 2.2.11
|
||||
Release: 5
|
||||
Release: 6
|
||||
License: LGPL
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.unixODBC.org/
|
||||
@ -11,13 +11,14 @@ Source1: odbcinst.ini
|
||||
Source2: ODBCConfig.desktop
|
||||
Source3: DataManager.desktop
|
||||
Patch1: depcomp.patch
|
||||
Patch2: unixODBC-config.patch
|
||||
Patch3: unixODBC-2.2.11-symbols.patch
|
||||
Patch4: parserupdate.patch
|
||||
Patch5: nortldglobal.patch
|
||||
Patch6: unixODBC-2.2.11-stricmp.patch
|
||||
|
||||
Conflicts: iodbc
|
||||
BuildPrereq: libX11-devel libXext-devel
|
||||
BuildPrereq: libX11-devel libXt-devel libXext-devel
|
||||
BuildPrereq: kdelibs-devel qt-devel libmng-devel readline-devel
|
||||
BuildPrereq: automake autoconf libtool
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
@ -52,6 +53,7 @@ This package contains components for the ODBCConfig and DataManager
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch6 -p1
|
||||
@ -174,6 +176,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Mon Nov 21 2005 Tom Lane <tgl@redhat.com> 2.2.11-6
|
||||
- Patch NO-vs-no discrepancy between aclocal/acinclude and recent autoconf
|
||||
versions (not sure if this has been broken for a long time, or was just
|
||||
exposed by modular X changeover).
|
||||
- Apparently need to require libXt-devel too for modular X.
|
||||
|
||||
* Mon Nov 7 2005 Tom Lane <tgl@redhat.com> 2.2.11-5
|
||||
- Adjust BuildPrereq for modular X.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user