Browse Source

unixODBC-2.3.11-1

Tomohiro "Tomo-p" KATO 4 months ago
parent
commit
328ad62e70
1 changed files with 10 additions and 11 deletions
  1. 10 11
      u/unixODBC/unixODBC-vl.spec

+ 10 - 11
u/unixODBC/unixODBC-vl.spec

@@ -1,5 +1,5 @@
 Name: unixODBC
-Version: 2.3.9
+Version: 2.3.11
 Release: 1%{?_dist_release}
 Summary: A complete ODBC Driver Manager for Linux
 Summary(ja): Linux 用 ODBC ドライバマネージャー
@@ -85,10 +85,10 @@ install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 # we only apply this to known Red Hat multilib arches, per bug #181335
 case `uname -i` in
   i386 | x86_64 | ia64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
-    mv $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf_`uname -i`.h
+    mv $RPM_BUILD_ROOT%{_includedir}/unixODBC/unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}/unixODBC/unixodbc_conf_`uname -i`.h
     rm -f unixodbc_conf.h
     sed s/CONFFILE/unixodbc_conf/ %{SOURCE4} >unixodbc_conf.h
-    install -m 644 unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}
+    install -m 644 unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}/unixODBC/
     ;;
   *)
     ;;
@@ -100,6 +100,9 @@ cp %{SOURCE5} README.dist
 # remove obsolete Postgres drivers from the package (but not the setup code)
 rm -f $RPM_BUILD_ROOT%{_libdir}/libodbcpsql.so*
 
+# make directory for unversioned plugins
+mkdir $RPM_BUILD_ROOT%{_libdir}/%{name}
+
 # copy text driver documentation into main doc directory
 # currently disabled because upstream no longer includes text driver
 # mkdir -p doc/Drivers/txt
@@ -120,14 +123,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/libtool
 find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" > base-so-list
 find $RPM_BUILD_ROOT%{_libdir} -name "*.so"   | sed "s|^$RPM_BUILD_ROOT||" > devel-so-list
 
-# move these to main package, they're often dlopened...
-for lib in libodbc.so libodbcinst.so libodbcpsqlS.so libodbcmyS.so libtdsS.so
-do
-    echo "%{_libdir}/$lib" >> base-so-list
-    grep -v "/$lib$" devel-so-list > devel-so-list.x
-    mv -f devel-so-list.x devel-so-list
-done
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,6 +147,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 16 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.11-1
+- new upstream release.
+- updated Patch8.
+
 * Sat Mar 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.9-1
 - new upstream release.
 - dropped scriptlets.