rpms/libiodbc/F-11 libiodbc-3.52.6-multilib.patch, NONE, 1.1 libiodbc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/libiodbc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27119/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	libiodbc-3.52.6-multilib.patch libiodbc.spec 
Log Message:
sync w/devel branch


libiodbc-3.52.6-multilib.patch:

--- NEW FILE libiodbc-3.52.6-multilib.patch ---
--- bin/iodbc-config.in.orig	2006-01-23 11:29:22.000000000 +0100
+++ bin/iodbc-config.in	2009-06-04 17:48:19.000000000 +0200
@@ -145,10 +145,10 @@
       echo_libs=yes
       ;;
    --static-libs)
-      echo_staticlibs=yes
+      echo_libs=yes
       ;;
    --libtool-libs)
-      echo_libtoollibs=yes
+      echo_libs=yes
       ;;
    --data-dir)
       echo_data_dir=yes
@@ -196,19 +196,5 @@
 	if test "$lib_iodbc" = "yes"; then
 		libs="$libs -liodbc -liodbcinst"
 	fi
-	echo "-L at libdir@ $libs"
-fi
-if test "$echo_staticlibs" = "yes"; then
-	libs=""
-	if test "$lib_iodbc" = "yes"; then
-		libs="@libdir@/libiodbc.a @libdir@/libiodbcinst.a @LIBADD_DL@"
-	fi
-	echo "$libs"
-fi
-if test "$echo_libtoollibs" = "yes"; then
-	libs=""
-	if test "$lib_iodbc" = "yes"; then
-		libs="@libdir@/libiodbc.la @libdir@/libiodbcinst.la"
-	fi
 	echo "$libs"
 fi


--- NEW FILE libiodbc.spec ---

## admin gui build currently busted, FIXME?
#define _enable_gui --enable-gui

Summary: iODBC Driver Manager
Name: libiodbc
Version: 3.52.6
Release: 4%{?dist}
Group: System Environment/Libraries
License: LGPLv2 or BSD
URL: http://www.iodbc.org/
Source0: http://www.iodbc.org/downloads/iODBC/libiodbc-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Patch1: libiodbc-3.52.6-multilib.patch

%{?_enable_gui:BuildRequires: gtk2-devel}
BuildRequires: chrpath

%description
The iODBC Driver Manager is a free implementation of the SAG CLI and
ODBC compliant driver manager which allows developers to write ODBC
compliant applications that can connect to various databases using
appropriate backend drivers.

%package devel
Summary: Header files and libraries for iODBC development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} 
Requires: pkgconfig
%description devel
This package contains the header files and libraries needed to develop
programs that use the driver manager.

%package admin
Summary: Gui administrator for iODBC development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description admin
This package contains a Gui administrator program for maintaining
DSN information in odbc.ini and odbcinst.ini files.


%prep
%setup -q

%patch1 -p0 -b .multilib

# fix header permissions
chmod -x include/*.h


%build
# --disable-libodbc to minimize conflicts with unixODBC
%configure \
  --enable-odbc3 \
  --with-iodbc-inidir=%{_sysconfdir} \
  --enable-pthreads \
  --disable-libodbc \
  --disable-static \
  --includedir=%{_includedir}/libiodbc \
  %{?_enable_gui} %{!?_enable_gui:--disable-gui}

make %{?_smp_mflags}


%install
rm -rf %{buildroot} 

make install DESTDIR=%{buildroot}

# nuke rpaths
chrpath --delete %{buildroot}%{_bindir}/iodbctest
chrpath --delete %{buildroot}%{_bindir}/iodbctestw

# unpackaged files
rm -f %{buildroot}%{_libdir}/lib*.la
rm -rf %{buildroot}%{_datadir}/libiodbc/samples


%clean
rm -rf %{buildroot} 


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files 
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog LICENSE* README
%doc etc/odbc*.ini.sample
%{_bindir}/iodbctest
%{_bindir}/iodbctestw
%{_libdir}/libiodbc.so.2*
%{_libdir}/libiodbcinst.so.2*
%{_mandir}/man1/iodbctest.1*
%{_mandir}/man1/iodbctestw.1*

%files devel
%defattr(-,root,root,-)
%{_bindir}/iodbc-config
%{_includedir}/libiodbc/
%{_libdir}/libiodbc.so
%{_libdir}/libiodbcinst.so
%{_mandir}/man1/iodbc-config.1*
%{_libdir}/pkgconfig/libiodbc.pc

%if 0%{?_enable_gui:1}
%files admin
%defattr(-,root,root,-)
%{_bindir}/iodbcadm-gtk
%{_libdir}/libdrvproxy.so*
%{_libdir}/libiodbcadm.so*
%{_mandir}/man1/iodbcadm-gtk.1*
%endif

%changelog
* Sat Jun 06 2009 Rex Dieter <rdieter at fedoraproject.org> 3.52.6-4
- -devel: install headers to /usr/include/libiodbc/ to better avoid
  conflicts and need for bogus unixODBC-devel dep

* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> 3.52.6-3
- capitalize Name,Summary,Version tags
- -devel: capitalize Summary
- fix spurious permissions on header files
- refresh upstream source
- -admin,-devel: add %%defattr(...)

* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> 3.52.6-2
- iodbc-config multilib patch

* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 3.52.6-1
- first try, based on upstream src.rpm



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiodbc/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Jun 2009 21:29:19 -0000	1.1
+++ .cvsignore	11 Jun 2009 16:57:55 -0000	1.2
@@ -0,0 +1 @@
+libiodbc-3.52.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiodbc/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Jun 2009 21:29:19 -0000	1.1
+++ sources	11 Jun 2009 16:57:55 -0000	1.2
@@ -0,0 +1 @@
+761ad547467bd63ac0b2b4f3ee4b5afb  libiodbc-3.52.6.tar.gz