unixODBC-2.3.2-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8757 ec354946-7b23-47d6-9f5a-488ba84defc7

u/unixODBC/unixODBC-vl.spec

@@ -5,8 +5,8 @@
 
 Name: unixODBC
 Summary: A complete ODBC Driver Manager for Linux
-Version: 2.2.14
+Version: 2.3.2
-Release: 3%{?_dist_release}
+Release: 1%{?_dist_release}
 
 Group: System Environment/Libraries
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -15,20 +15,19 @@ URL: http://www.unixODBC.org/
 
 Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
 Source1: odbcinst.ini
-Source2: ODBCConfig.desktop
-Source3: DataManager.desktop
 Source4: conffile.h
+Source5: README.dist
+Source6: iusql.1
+Source7: dltest.1
+Source8: odbc_config.1
+Source9: unixODBC.7
 
 Patch1: depcomp.patch
-Patch2: multilib-config.patch
-Patch3: warning-cleanup.patch
 Patch6: export-symbols.patch
-Patch7: libtool-config.patch
 Patch8: so-version-bump.patch
 Patch9: keep-typedefs.patch
-Patch10: odbcint64-config.patch
+Patch10: unixODBC-isql.1.patch
-Patch11: enable-items.patch
+
-Patch12: isql-fixes.patch
 Conflicts: iodbc
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -73,15 +72,10 @@ Components for the ODBCConfig and DataManager (KDE) Components of unixODBC.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
-%patch12 -p1
 
 chmod 0644 Drivers/MiniSQL/*.c
 chmod 0644 Drivers/nn/*.c
@@ -97,11 +91,6 @@ rm -rf config.guess config.sub install-sh ltmain.sh libltdl
 libtoolize --install || libtoolize
 
 %build
-# pick up qt path
-export PATH="%{_qt4_bindir}:$PATH"
-# clean up old moc files
-(cd odbcinstQ4 && rm -f mC*.cpp)
-
 aclocal
 automake --add-missing
 autoconf
@@ -111,30 +100,18 @@ CFLAGS="%{optflags} -fno-strict-aliasing"
 CXXFLAGS="$CFLAGS"
 export CFLAGS CXXFLAGS
 
-%configure --with-gnu-ld=yes --enable-threads=yes --enable-gui=yes --enable-drivers --enable-ltdllib --with-qt-programs="%{_qt4_bindir}" --with-qt-libraries="%{_qt4_libdir}" --with-qt-includes="%{_qt4_headerdir}"
+%configure --with-gnu-ld=yes --enable-threads=yes \
+        --enable-drivers=yes --enable-driverc=yes --enable-ltdllib
 make all
 
 %install
-# pick up qt path
-export PATH="%{_qt4_bindir}:$PATH"
-
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
 make DESTDIR=$RPM_BUILD_ROOT install
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
-
-# install *.desktop files
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
-
-# package doesn't supply an icon for ODBCConfig, so use the one for DataManager
-cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 # multilib header hacks
 # we only apply this to known Red Hat multilib arches, per bug #181335
 case `uname -i` in
-  i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
+  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
     rm -f unixodbc_conf.h
     sed s/CONFFILE/unixodbc_conf/ %{SOURCE4} >unixodbc_conf.h
@@ -144,6 +121,9 @@ case `uname -i` in
     ;;
 esac
 
+# add some explanatory documentation
+cp %{SOURCE5} README.dist
+
 # remove obsolete Postgres drivers from the package (but not the setup code)
 rm -f $RPM_BUILD_ROOT%{_libdir}/libodbcpsql.so*
 
@@ -153,7 +133,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libodbcpsql.so*
 # cp -pr Drivers/txt/doc/* doc/Drivers/txt
 
 # don't want to install doc Makefiles as docs
-#find doc -name 'Makefile*' | xargs rm
+find doc -name 'Makefile*' | xargs rm
 
 # we do not want to ship static libraries
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -163,6 +143,24 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.*
 rm -rf $RPM_BUILD_ROOT%{_datadir}/libtool
 
+# initialize lists of .so files
+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
+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
+
+# 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
 
@@ -174,77 +172,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun kde -p /sbin/ldconfig
 
-%files
+%files -f base-so-list
-%defattr(-,root,root)
+%doc README COPYING AUTHORS ChangeLog NEWS doc
-%doc README COPYING AUTHORS ChangeLog NEWS INSTALL doc
+%doc README.dist
 %config(noreplace) %{_sysconfdir}/odbc*
-%{_bindir}/dltest
+%{_bindir}/odbcinst
 %{_bindir}/isql
+%{_bindir}/dltest
 %{_bindir}/iusql
-%{_bindir}/odbcinst
-%{_libdir}/libboundparam.so.*
-%{_libdir}/libesoobS.so.*
-%{_libdir}/libgtrtst.so.*
-%{_libdir}/libmimerS.so.*
-%{_libdir}/libnn.so.*
-%{_libdir}/libodbc.so.*
-%{_libdir}/libodbccr.so.*
-%{_libdir}/libodbcdrvcfg1S.so.*
-%{_libdir}/libodbcdrvcfg2S.so.*
-#%{_libdir}/libodbcextras.so.*
-%{_libdir}/libodbcinst.so.*
-%{_libdir}/libodbcminiS.so.*
-%{_libdir}/libodbcmyS.so.*
-%{_libdir}/libodbcnnS.so.*
-#%{_libdir}/libodbcpsql.so.*
-%{_libdir}/libodbcpsqlS.so.*
-#%{_libdir}/libodbctxt.so.*
-%{_libdir}/libodbctxtS.so.*
-%{_libdir}/liboplodbcS.so.*
-%{_libdir}/liboraodbcS.so.*
-%{_libdir}/libsapdbS.so.*
-%{_libdir}/libtdsS.so.*
-%{_libdir}/libtemplate.so.*
-
-%files devel
-%defattr(-,root,root)
 %{_bindir}/odbc_config
+%{_bindir}/slencheck
+%{_mandir}/man*/*
+
+%files devel -f devel-so-list
 %{_includedir}/*
-%{_libdir}/libboundparam.so
-%{_libdir}/libesoobS.so
-%{_libdir}/libgtrtst.so
-%{_libdir}/libmimerS.so
-%{_libdir}/libnn.so
-%{_libdir}/libodbc.so
-%{_libdir}/libodbccr.so
-%{_libdir}/libodbcdrvcfg1S.so
-%{_libdir}/libodbcdrvcfg2S.so
-#%{_libdir}/libodbcextras.so
-%{_libdir}/libodbcinst.so
-%{_libdir}/libodbcminiS.so
-%{_libdir}/libodbcmyS.so
-%{_libdir}/libodbcnnS.so
-#%{_libdir}/libodbcpsql.so
-%{_libdir}/libodbcpsqlS.so
-#%{_libdir}/libodbctxt.so
-%{_libdir}/libodbctxtS.so
-%{_libdir}/liboplodbcS.so
-%{_libdir}/liboraodbcS.so
-%{_libdir}/libsapdbS.so
-%{_libdir}/libtdsS.so
-%{_libdir}/libtemplate.so
-#{_libdir}/*.a
-#{_libdir}/*.la
-
-%files kde
-%defattr(-,root,root)
-%{_bindir}/ODBCConfig
-%{_datadir}/applications/ODBCConfig.desktop
-%{_datadir}/pixmaps/LinuxODBC.xpm
-%{_libdir}/libodbcinstQ*so
-%{_libdir}/libodbcinstQ*so.*
 
 %changelog
+* Tue Jul  8 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.2-1
+- new upstream release.
+- gui was discontinued in upstream.
+
 * Fri Dec 27 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.2.14-3
 - rebuild with VineSeed environment