rpms/libiodbc/devel libiodbc.spec,1.1,1.2

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/libiodbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20385

Modified Files:
	libiodbc.spec 
Log Message:
* 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



Index: libiodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiodbc/devel/libiodbc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libiodbc.spec	5 Jun 2009 23:55:57 -0000	1.1
+++ libiodbc.spec	6 Jun 2009 18:45:07 -0000	1.2
@@ -5,7 +5,7 @@
 Summary: iODBC Driver Manager
 Name: libiodbc
 Version: 3.52.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2 or BSD
 URL: http://www.iodbc.org/
@@ -28,10 +28,9 @@ Summary: Header files and libraries for 
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release} 
 Requires: pkgconfig
-Requires: unixODBC-devel
 %description devel
 This package contains the header files and libraries needed to develop
-program that use the driver manager.
+programs that use the driver manager.
 
 %package admin
 Summary: Gui administrator for iODBC development
@@ -59,6 +58,7 @@ chmod -x include/*.h
   --enable-pthreads \
   --disable-libodbc \
   --disable-static \
+  --includedir=%{_includedir}/libiodbc \
   %{?_enable_gui} %{!?_enable_gui:--disable-gui}
 
 make %{?_smp_mflags}
@@ -76,8 +76,6 @@ chrpath --delete %{buildroot}%{_bindir}/
 # unpackaged files
 rm -f %{buildroot}%{_libdir}/lib*.la
 rm -rf %{buildroot}%{_datadir}/libiodbc/samples
-# conflicts with unixODBC
-rm -f %{buildroot}%{_includedir}/{odbcinst,sql,sqlext,sqltypes,sqlucode}.h
 
 
 %clean
@@ -87,6 +85,7 @@ rm -rf %{buildroot} 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog LICENSE* README
@@ -101,7 +100,7 @@ rm -rf %{buildroot} 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/iodbc-config
-%{_includedir}/*.h
+%{_includedir}/libiodbc/
 %{_libdir}/libiodbc.so
 %{_libdir}/libiodbcinst.so
 %{_mandir}/man1/iodbc-config.1*
@@ -117,6 +116,10 @@ rm -rf %{buildroot} 
 %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