fix file conflicts

glibc.spec

@@ -786,7 +786,6 @@ LANG variable to their preferred language in their
 %{_bindir}/sotruss
 %{_bindir}/sprof
 %{_bindir}/tzselect
-%{_bindir}/zdump
 %{_sbindir}/iconvconfig
 %{_sbindir}/ldconfig
 %ghost %{_sysconfdir}/ld.so.cache
@@ -1116,8 +1115,8 @@ Group:		System/Base
 These are configuration files that describe possible time zones.
 
 %files -n timezone
-%{_sbindir}/zdump
+%{_bindir}/zdump
-%{_sbindir}/zic
+%{_bindir}/zic
 %doc %{_mandir}/man1/zdump.1*
 %{_datadir}/zoneinfo
 #-----------------------------------------------------------------------
@@ -1303,7 +1302,7 @@ echo CC="$BuildCC" CXX="$BuildCXX" CFLAGS="$BuildFlags -Wno-error" ARFLAGS="$ARF
     --host=$configarch-%{platform} \
     --prefix=%{_prefix} \
     --bindir=%{_bindir} \
-    --sbindir=%{_sbindir} \
+    --sbindir=%{_bindir} \
     --libexecdir=%{_prefix}/libexec \
     --libdir=${LIBDIR} \
     --infodir=%{_infodir} \
@@ -1667,6 +1666,7 @@ rm -f %{buildroot}%{_bindir}/rpcgen %{buildroot}%{_mandir}/man1/rpcgen.1*
 
 %if !%{with timezone}
     rm -f %{buildroot}%{_sbindir}/zic
+    rm -f %{buildroot}%{_bindir}/zdump
     rm -f %{buildroot}%{_mandir}/man1/zdump.1*
 %endif