bz#205202 File conflicts

amanda.spec

@@ -11,7 +11,7 @@
 Summary: A network-capable tape backup solution.
 Name: amanda
 Version: 2.5.0p2
-Release: 2.1
+Release: 3
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 # Source2: __README_QUICKSETUP__
@@ -207,13 +207,14 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \
 
 %files
 %defattr(-,root,root)
-%{_libdir}/libamanda-*.so
-%{_libdir}/libamtape-*.so
-%{_libdir}/libamserver-*.so
-%{_libdir}/librestore-*.so
+					%{_libdir}/libamanda-*.so
+					%{_libdir}/libamtape-*.so
+					%{_libdir}/libamserver-*.so
+					%{_libdir}/librestore-*.so
+					%{_libdir}/libamclient-*.so
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amrestore
-%{_mandir}/man8/amrestore.8*
-%attr(600,%amanda_user,%amanda_group)  %config(noreplace) %{_localstatedir}/amanda/.amandahosts
+					%{_mandir}/man8/amrestore.8*
+%attr(600,%amanda_user,%amanda_group)	%config(noreplace) %{_localstatedir}/amanda/.amandahosts
 
 %attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda
 %attr(-,%amanda_user,%amanda_group)	%dir %{_localstatedir}/amanda/
@@ -320,7 +321,6 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \
 %files client
 					%defattr(-,root,root)
 					%config(noreplace) /etc/xinetd.d/amanda
-					%{_libdir}/libamclient-*.so
 %attr(-,%amanda_user,%amanda_group)	%dir %{_libexecdir}/
 %attr(-,%amanda_user,%amanda_group)     %{_libexecdir}/noop
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amandad
@@ -348,6 +348,11 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \
 %{_libdir}/librestore.so
 
 %changelog
+* Tue Sep 5 2006 Jay Fenlason <fenlason@redhat.com> 2.5.0p2-3
+- move libamclient-*.so to the base rpm, so that multilib support works.
+  This fixes
+  bz#205202 File conflicts
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.5.0p2-2.1
 - rebuild