rpms/coreutils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Ondřej Vašík 2014-07-22 14:02:48 +02:00
commit df0e53f22d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
coreutils.spec
View File

@ -259,7 +259,9 @@ fi
%dir %{_datadir}/locale/*/LC_TIME %dir %{_datadir}/locale/*/LC_TIME
%config(noreplace) %{_sysconfdir}/DIR_COLORS* %config(noreplace) %{_sysconfdir}/DIR_COLORS*
%config(noreplace) %{_sysconfdir}/profile.d/* %config(noreplace) %{_sysconfdir}/profile.d/*
%doc COPYING ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/* %doc ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/*
%{!?_licensedir:%global license %%doc}
%license COPYING
%{_bindir}/arch %{_bindir}/arch
%{_bindir}/basename %{_bindir}/basename
%{_bindir}/cat %{_bindir}/cat
@ -372,6 +374,9 @@ fi
- synchronize the old differences in ls SELinux options - synchronize the old differences in ls SELinux options
with upstream with upstream
* Fri Jul 11 2014 Tom Callaway <spot@fedoraproject.org> - 8.22-17
- fix license handling
* Mon Jun 23 2014 Jakub Čajka <jcajka@redhat.com> - 8.22-16 * Mon Jun 23 2014 Jakub Čajka <jcajka@redhat.com> - 8.22-16
- fix failed tests on ppc(backport from gnulib upstream) - fix failed tests on ppc(backport from gnulib upstream)