Resolve merge conflict
This commit is contained in:
		
						commit
						63bb20b848
					
				@ -1,7 +1,7 @@
 | 
			
		||||
Summary: The basic directory layout for a Linux system
 | 
			
		||||
Name: filesystem
 | 
			
		||||
Version: 3.2
 | 
			
		||||
Release: 37%{?dist}
 | 
			
		||||
Release: 39%{?dist}
 | 
			
		||||
License: Public Domain
 | 
			
		||||
URL: https://fedorahosted.org/filesystem
 | 
			
		||||
Group: System Environment/Base
 | 
			
		||||
@ -178,7 +178,7 @@ restorecon /media 2>/dev/null >/dev/null || :
 | 
			
		||||
/etc/bash_completion.d/
 | 
			
		||||
/home
 | 
			
		||||
/lib
 | 
			
		||||
%ifarch x86_64 ppc64 sparc64 s390x aarch64 ppc64le mips64 mips64el
 | 
			
		||||
%ifarch x86_64 ppc64 sparc64 s390x aarch64 ppc64le mips64 mips64el riscv64
 | 
			
		||||
/%{_lib}
 | 
			
		||||
%endif
 | 
			
		||||
/media
 | 
			
		||||
@ -209,7 +209,7 @@ restorecon /media 2>/dev/null >/dev/null || :
 | 
			
		||||
%ghost /usr/lib/debug/sbin
 | 
			
		||||
%attr(555,root,root) /usr/lib/games
 | 
			
		||||
%attr(555,root,root) /usr/lib/sse2
 | 
			
		||||
%ifarch x86_64 ppc64 sparc64 s390x aarch64 ppc64le mips64 mips64el
 | 
			
		||||
%ifarch x86_64 ppc64 sparc64 s390x aarch64 ppc64le mips64 mips64el riscv64
 | 
			
		||||
%attr(555,root,root) /usr/%{_lib}
 | 
			
		||||
%else
 | 
			
		||||
%attr(555,root,root) /usr/lib/tls
 | 
			
		||||
@ -274,11 +274,14 @@ restorecon /media 2>/dev/null >/dev/null || :
 | 
			
		||||
/var/yp
 | 
			
		||||
 | 
			
		||||
%changelog
 | 
			
		||||
* Mon Jan 02 2017 Ondrej Vasik <ovasik@redhat.com> - 3.2-37
 | 
			
		||||
* Mon Jan 02 2017 Ondrej Vasik <ovasik@redhat.com> - 3.2-39
 | 
			
		||||
- refresh lang-exceptions list - /usr/share/locale ownerships
 | 
			
		||||
  (#1409402, #1313421)
 | 
			
		||||
- add ownership for /usr/share/help (#1357974)
 | 
			
		||||
 | 
			
		||||
* Tue Oct 11 2016 Richard W.M. Jones <rjones@redhat.com> - 3.2-38
 | 
			
		||||
- Add riscv64 to list of 64 bit architectures.
 | 
			
		||||
 | 
			
		||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-37
 | 
			
		||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user