From 5638b960710352a821b35f6e06ee4b3d84f39095 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 13:48:51 +0000
Subject: [PATCH] =?UTF-8?q?auto-import=20changelog=20data=20from=20unixODB?=
 =?UTF-8?q?C-2.2.0-4.src.rpm=20Fri=20Apr=2005=202002=20Trond=20Eivind=20Gl?=
 =?UTF-8?q?omsr=F8d=20<teg@redhat.com>=202.2.0-4=20-=20Avoid=20having=20fi?=
 =?UTF-8?q?les=20in=20more=20than=20one=20package=20(#62755)=20Tue=20Mar?=
 =?UTF-8?q?=2026=202002=20Trond=20Eivind=20Glomsr=F8d=20<teg@redhat.com>?=
 =?UTF-8?q?=202.2.0-3=20-=20Don't=20include=20kde=20plugin=20.so=20as=20a?=
 =?UTF-8?q?=20devel=20symlink=20(#61039)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 unixODBC.spec | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/unixODBC.spec b/unixODBC.spec
index d7430ed..4ad76c7 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux.
 Name: unixODBC
 Version: 2.2.0
-Release: 2
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
@@ -67,7 +67,8 @@ install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System
 cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/icons
 cp DataManager/odbc.xpm $RPM_BUILD_ROOT%{_datadir}/icons
-find $RPM_BUILD_ROOT/%{_libdir} -name "*.so*" |sed "s|$RPM_BUILD_ROOT||" |grep -v libodbcinstQ > foo-list
+find $RPM_BUILD_ROOT/%{_libdir} -name "*.so.*" |sed "s|$RPM_BUILD_ROOT||" |grep  -i -v libodbcinstQ > foo-list
+find $RPM_BUILD_ROOT/%{_libdir} -name "*.so" |sed "s|$RPM_BUILD_ROOT||" |grep  -i -v libodbcinstQ > foo-list2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,10 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/dltest
 #{_libdir}/libodbcinstQ*
 
-%files devel
+%files devel -f foo-list2
 %defattr(-,root,root)
 %{_includedir}/*
-%{_libdir}/*.so
 %{_libdir}/*.a
 
 %files kde
@@ -93,7 +93,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ODBCConfig
 %{_bindir}/DataManager
 /etc/X11/applnk/System/*
-%{_libdir}/libodbcinstQ*
+%{_libdir}/libodbcinstQ*so
+%{_libdir}/libodbcinstQ*so.*
 
 %post kde -p /sbin/ldconfig
 %postun kde -p /sbin/ldconfig
@@ -104,6 +105,12 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Apr  5 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.0-4
+- Avoid having files in more than one package (#62755)
+
+* Tue Mar 26 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.0-3
+- Don't include kde plugin .so as a devel symlink (#61039)
+
 * Fri Mar  8 2002 Bernhard Rosenkraenzer <bero@redhat.com> 2.2.0-2
 - Rebuild with KDE 3.x
 
@@ -188,5 +195,3 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Apr 17 2000 Murray Todd Williams <murray@codingapes.com>
 - unixODBC-1.8.7
 - moved install to $RPM_BUILD_ROOT so it didn't overrun existing files.
-
-