packages: libiodbc/libiodbc.spec, libiodbc/libiodbc-build.patch (NEW) - add...

[tommat]

Author: tommat                       Date: Wed Sep  9 16:08:19 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added build patch to assure respecting config.h
- packaged files
- ghost soname symlinks
- rel 1

---- Files affected:
packages/libiodbc:
   libiodbc.spec (1.34 -> 1.35) , libiodbc-build.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libiodbc/libiodbc.spec
diff -u packages/libiodbc/libiodbc.spec:1.34 packages/libiodbc/libiodbc.spec:1.35
--- packages/libiodbc/libiodbc.spec:1.34	Thu Mar 27 22:28:11 2008
+++ packages/libiodbc/libiodbc.spec	Wed Sep  9 18:08:13 2009
@@ -1,12 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-#	Installed (but unpackaged) file(s) found:
-#	   /usr/bin/iodbctest
-#	   /usr/bin/iodbctestw
-#	   /usr/share/libiodbc/samples/Makefile
-#	   /usr/share/libiodbc/samples/iodbctest.c
-#	   /usr/share/man/man1/iodbctest.1.gz
-#	   /usr/share/man/man1/iodbctestw.1
 #
 # Conditional build:
 %bcond_without	gtk		# don't build iodbcadm and GUI elements in drvproxy
@@ -15,18 +7,19 @@
 Summary(pl.UTF-8):	Zarządca sterowników iODBC
 Name:		libiodbc
 Version:	3.52.6
-Release:	0.1
+Release:	1
 License:	LGPL v2 or BSD
 Group:		Libraries
 Source0:	http://www.iodbc.org/downloads/iODBC/%{name}-%{version}.tar.gz
 # Source0-md5:	761ad547467bd63ac0b2b4f3ee4b5afb
 Patch0:		%{name}-make-jN.patch
+Patch1:		%{name}-build.patch
 URL:		http://www.iodbc.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4p5
 BuildRequires:	gtk+2-devel >= 1:2.0.0
-BuildRequires:	pkgconfig
 BuildRequires:	libtool
+BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -98,6 +91,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -118,6 +112,7 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 install etc/odbc.ini.sample $RPM_BUILD_ROOT%{_sysconfdir}/odbc.ini
+rm -rf $RPM_BUILD_ROOT/usr/share/libiodbc/samples/
 
 # dlopened by lib*.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib{iodbcadm,drvproxy}.{a,la}
@@ -136,9 +131,15 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog LICENSE LICENSE.BSD NEWS README
-%attr(755,root,root) %{_libdir}/libiodbc.so.*.*.*
-%attr(755,root,root) %{_libdir}/libiodbcinst.so.*.*.*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/odbc.ini
+%attr(755,root,root) %{_bindir}/iodbctest
+%attr(755,root,root) %{_bindir}/iodbctestw
+%attr(755,root,root) %{_libdir}/libiodbc.so.2.*.*
+%attr(755,root,root) %ghost %{_libdir}/libiodbc.so.2
+%attr(755,root,root) %{_libdir}/libiodbcinst.so.2.*.*
+%attr(755,root,root) %ghost %{_libdir}/libiodbcinst.so.2
+%{_mandir}/man1/iodbctest.1*
+%{_mandir}/man1/iodbctestw.1
 
 %files devel
 %defattr(644,root,root,755)
@@ -160,8 +161,10 @@
 %files gtk
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/iodbcadm-gtk
-%attr(755,root,root) %{_libdir}/libiodbcadm.so.*.*.*
-%attr(755,root,root) %{_libdir}/libdrvproxy.so.*.*.*
+%attr(755,root,root) %{_libdir}/libiodbcadm.so.2.*.*
+%attr(755,root,root) %ghost %{_libdir}/libiodbcadm.so.2
+%attr(755,root,root) %{_libdir}/libdrvproxy.so.2.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdrvproxy.so.2
 %attr(755,root,root) %{_libdir}/libiodbcadm.so
 %attr(755,root,root) %{_libdir}/libdrvproxy.so
 %{_mandir}/man1/iodbcadm-gtk.1*
@@ -173,6 +176,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2009/09/09 16:08:13  tommat
+- added build patch to assure respecting config.h
+- packaged files
+- ghost soname symlinks
+- rel 1
+
 Revision 1.34  2008/03/27 21:28:11  sls
 - added make-jN.patch
 

================================================================
Index: packages/libiodbc/libiodbc-build.patch
diff -u /dev/null packages/libiodbc/libiodbc-build.patch:1.1
--- /dev/null	Wed Sep  9 18:08:19 2009
+++ packages/libiodbc/libiodbc-build.patch	Wed Sep  9 18:08:13 2009
@@ -0,0 +1,12 @@
+diff -Nur libiodbc-3.52.6-orig/iodbcinst/unicode.h libiodbc-3.52.6/iodbcinst/unicode.h
+--- libiodbc-3.52.6-orig/iodbcinst/unicode.h	2006-01-20 16:58:35.000000000 +0100
++++ libiodbc-3.52.6/iodbcinst/unicode.h	2009-09-09 15:42:37.000000000 +0200
+@@ -77,6 +77,8 @@
+ #ifndef _UNICODE_H
+ #define _UNICODE_H
+ 
++#include "config.h"
++
+ #if HAVE_WCHAR_H
+ #include <wchar.h>
+ #endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libiodbc/libiodbc.spec?r1=1.34&r2=1.35&f=u