From 2ad2253da11f2aed8d642c35151f854f5b95186e Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 20 Mar 2017 13:08:53 +0200 Subject: [PATCH] Own license directory by runtime (#1206044) --- macros.scl-filesystem | 3 ++- scl-utils.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/macros.scl-filesystem b/macros.scl-filesystem index 1e51cf9..4ba6a64 100644 --- a/macros.scl-filesystem +++ b/macros.scl-filesystem @@ -61,6 +61,7 @@ %{_scl_root}/usr/share/icons %{_scl_root}/usr/share/idl %{_scl_root}/usr/share/info +%dir %{_scl_root}/usr/share/licenses %dir %{_scl_root}/usr/share/locale %dir %{_scl_root}/usr/share/man %{_scl_root}/usr/share/mime-info @@ -281,7 +282,7 @@ rm -f $RPM_BUILD_DIR/%{buildsubdir}/filesystem pushd %{buildroot}%{_scl_root} mkdir -p boot dev \\ home media mnt opt proc root run/lock srv sys tmp \\ - usr/{bin,etc,games,include,lib/{games,locale,modules,sse2},libexec,local/{bin,etc,games,lib,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11},src,src/kernels,src/debug} + usr/{bin,etc,games,include,lib/{games,locale,modules,sse2},libexec,local/{bin,etc,games,lib,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,licenses,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11},src,src/kernels,src/debug} %ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x mkdir -p usr/{%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},local/%{_lib}} %endif diff --git a/scl-utils.spec b/scl-utils.spec index cfe3453..6c4dee6 100644 --- a/scl-utils.spec +++ b/scl-utils.spec @@ -3,7 +3,7 @@ Name: scl-utils Epoch: 1 Version: 2.0.1 -Release: 12%{dist} +Release: 13%{dist} Summary: Utilities for alternative packaging License: GPLv2+ @@ -81,6 +81,9 @@ rm -rf %buildroot %{_rpmconfigdir}/brp-scl-python-bytecompile %changelog +* Mon Mar 20 2017 Panu Matilainen - 1:2.0.1-13 +- Own license directory by runtime (#1206044) + * Mon Mar 20 2017 Panu Matilainen - 1:2.0.1-12 - Don't try to use no longer existing brp-java-repack-jars script (#1409277)