|
|
@@ -1,6 +1,6 @@
|
|
|
Name: unixODBC
|
|
|
-Version: 2.3.2
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 2.3.4
|
|
|
+Release: 1%{?_dist_release}
|
|
|
Summary: A complete ODBC Driver Manager for Linux
|
|
|
Summary(ja): Linux 用 ODBC ドライバマネージャー
|
|
|
|
|
|
@@ -13,16 +13,10 @@ Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
|
|
|
Source1: odbcinst.ini
|
|
|
Source4: conffile.h
|
|
|
Source5: README.dist
|
|
|
-Source6: iusql.1
|
|
|
-Source7: dltest.1
|
|
|
-Source8: odbc_config.1
|
|
|
-Source9: unixODBC.7
|
|
|
|
|
|
-Patch1: depcomp.patch
|
|
|
Patch6: export-symbols.patch
|
|
|
Patch8: so-version-bump.patch
|
|
|
Patch9: keep-typedefs.patch
|
|
|
-Patch10: unixODBC-isql.1.patch
|
|
|
|
|
|
Conflicts: iodbc
|
|
|
|
|
|
@@ -51,11 +45,9 @@ ODBC, you need to install this package.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-%patch1 -p1
|
|
|
%patch6 -p1
|
|
|
%patch8 -p1
|
|
|
%patch9 -p1
|
|
|
-%patch10 -p1
|
|
|
|
|
|
chmod 0644 Drivers/MiniSQL/*.c
|
|
|
chmod 0644 Drivers/nn/*.c
|
|
|
@@ -82,6 +74,11 @@ export CFLAGS CXXFLAGS
|
|
|
|
|
|
%configure --with-gnu-ld=yes --enable-threads=yes \
|
|
|
--enable-drivers=yes --enable-driverc=yes --enable-ltdllib
|
|
|
+
|
|
|
+# Get rid of the rpaths
|
|
|
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
|
|
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
|
|
+
|
|
|
make all
|
|
|
|
|
|
%install
|
|
|
@@ -136,12 +133,6 @@ do
|
|
|
mv -f devel-so-list.x devel-so-list
|
|
|
done
|
|
|
|
|
|
-# install man pages that are not part of the upstream yet
|
|
|
-install -Dm644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/iusql.1
|
|
|
-install -Dm644 %{SOURCE7} $RPM_BUILD_ROOT%{_mandir}/man1/dltest.1
|
|
|
-install -Dm644 %{SOURCE8} $RPM_BUILD_ROOT%{_mandir}/man1/odbc_config.1
|
|
|
-install -Dm644 %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man7/unixODBC.7
|
|
|
-
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
@@ -165,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_includedir}/*
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Jan 5 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.4-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Tue Mar 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.3.2-2
|
|
|
- rebuilt with readline 6.3
|
|
|
- removed kde-subpackage-related BuildRequires
|
tomop