rpms/freetds/F-8 freetds.spec,1.4,1.5

[Dmitry Butskoy (buc)]

Author: buc

Update of /cvs/extras/rpms/freetds/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12887

Modified Files:
	freetds.spec 
Log Message:



Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/F-8/freetds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- freetds.spec	28 Aug 2007 21:47:17 -0000	1.4
+++ freetds.spec	25 Jan 2008 15:25:09 -0000	1.5
@@ -1,13 +1,20 @@
+%if %_lib == lib64
+%define bits	64
+%else
+%define bits	32
+%endif
+
 Name: freetds
 Summary: Implementation of the TDS (Tabular DataStream) protocol
 Version: 0.64
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+ and GPLv2+
 URL: http://www.freetds.org/
-Source:	ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-%{version}.tar.gz
+Source0: ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-%{version}.tar.gz
+Source1: freetds-tds_sysdep_public.h
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: unixODBC-devel
+BuildRequires: unixODBC-devel, readline-devel
 BuildRequires: doxygen, docbook-style-dsssl
 Patch0: freetds-0.64-makefile-doc.patch
  
@@ -20,16 +27,26 @@
 
 
 %package devel
-Summary: Header files, libraries and development documentation for %{name}
+Summary: Header files  and development libraries for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
-This package contains the header files and development documentation
+This package contains the header files and development libraries
 for %{name}. If you like to develop programs using %{name}, you will need
 to install %{name}-devel.
 
 
+%package doc
+Summary: Development documentation for %{name}
+Group: Documentation
+
+%description doc
+This package contains the development documentation for %{name}.
+If you like to develop programs using %{name}, you will need to install
+%{name}-doc.
+
+
 %prep 
 %setup -q
 %patch0 -p1
@@ -71,8 +88,15 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+mv -f $RPM_BUILD_ROOT%{_includedir}/tds_sysdep_public.h \
+	$RPM_BUILD_ROOT%{_includedir}/tds_sysdep_public_%{bits}.h
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/tds_sysdep_public.h
+
 rm -f samples/Makefile* samples/*.in samples/README
 
+mv -f samples/unixodbc.freetds.driver.template \
+	samples/unixodbc.freetds.driver.template-%{bits}
+
 
 %post -p /sbin/ldconfig
 
@@ -94,14 +118,26 @@
 
  
 %files devel 
-%defattr (-, root, root) 
-%doc samples doc/doc/freetds-%{version}/reference
+%defattr (-, root, root, -) 
+%doc samples
 %{?_with_static: %{_libdir}/*.a}
 %{_libdir}/*.so
 %{_includedir}/*
+
+
+%files doc
+%defattr (-, root, root, -) 
+%doc doc/doc/freetds-%{version}/reference
  
 
 %changelog
+* Fri Jan 25 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.64-8
+- resolve multiarch conflicts (#341181):
+  - split references to separate freetds-doc subpackage
+  - add arch-specific suffixes for arch-specific filenames in -devel
+  - add wrapper for tds_sysdep_public.h
+- add readline support (#430196)
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.64-7
 - Rebuild for selinux ppc32 issue.