Move libodbcinst.so symlink into main package, per bug 204882

This commit is contained in:
Tom Lane 2008-02-12 00:15:57 +00:00
parent b9ddd13f3e
commit 62398503b6

View File

@ -1,7 +1,7 @@
Summary: A complete ODBC driver manager for Linux Summary: A complete ODBC driver manager for Linux
Name: unixODBC Name: unixODBC
Version: 2.2.12 Version: 2.2.12
Release: 5%{?dist} Release: 6%{?dist}
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.unixODBC.org/ URL: http://www.unixODBC.org/
# Programs are GPL, libraries are LGPL, except News Server library is GPL. # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@ -125,32 +125,32 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.* rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.*
rm -rf $RPM_BUILD_ROOT/usr/share/libtool rm -rf $RPM_BUILD_ROOT/usr/share/libtool
find $RPM_BUILD_ROOT/%{_libdir} -name "*.so.*" |sed "s|$RPM_BUILD_ROOT||" |grep -i -v libodbcinstQ > foo-list # initialize lists of .so files; note that libodbcinstQ* go into kde subpkg
find $RPM_BUILD_ROOT/%{_libdir} -name "*.so" |sed "s|$RPM_BUILD_ROOT||" |grep -i -v libodbcinstQ |grep -v -E "libodbc.so$" |grep -v -E "libodbcpsqlS?.so$" |grep -v -E "libodbcmyS.so$" > foo-list2 find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" | grep -v /libodbcinstQ > base-so-list
find $RPM_BUILD_ROOT%{_libdir} -name "*.so" | sed "s|^$RPM_BUILD_ROOT||" | grep -v /libodbcinstQ > devel-so-list
# move to main package, it's often dlopened... # move these to main package, they're often dlopened...
echo "%{_libdir}/libodbc.so" >> foo-list for lib in libodbc.so libodbcinst.so libodbcpsql.so libodbcpsqlS.so libodbcmyS.so
echo "%{_libdir}/libodbcpsql.so" >> foo-list do
echo "%{_libdir}/libodbcpsqlS.so" >> foo-list echo "%{_libdir}/$lib" >> base-so-list
echo "%{_libdir}/libodbcmyS.so" >> foo-list grep -v "/$lib$" devel-so-list > devel-so-list.x
mv -f devel-so-list.x devel-so-list
done
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files -f foo-list %files -f base-so-list
%defattr(-,root,root) %defattr(-,root,root)
%doc README COPYING AUTHORS ChangeLog NEWS INSTALL doc %doc README COPYING AUTHORS ChangeLog NEWS INSTALL doc
%config(noreplace) %{_sysconfdir}/odbc* %config(noreplace) %{_sysconfdir}/odbc*
#{_libdir}/*so.*
%{_bindir}/odbcinst %{_bindir}/odbcinst
%{_bindir}/isql %{_bindir}/isql
%{_bindir}/dltest %{_bindir}/dltest
%{_bindir}/iusql %{_bindir}/iusql
%{_bindir}/odbc_config %{_bindir}/odbc_config
#%{_bindir}/odbctest
#{_libdir}/libodbcinstQ*
%files devel -f foo-list2 %files devel -f devel-so-list
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/* %{_includedir}/*
%{_libdir}/*.a %{_libdir}/*.a
@ -175,6 +175,11 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Mon Feb 11 2008 Tom Lane <tgl@redhat.com> 2.2.12-6
- Move libodbcinst.so symlink into main package, since it's often dlopen'd
Related: #204882
- Clean up specfile's ugly coding for making base-vs-devel decisions
* Sun Dec 30 2007 Tom Lane <tgl@redhat.com> 2.2.12-5 * Sun Dec 30 2007 Tom Lane <tgl@redhat.com> 2.2.12-5
- Add missing BuildRequires for flex. - Add missing BuildRequires for flex.
Resolves: #427063 Resolves: #427063