rpms/scl-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed the last rebase before the final build

Browse Source
This commit is contained in:
Jan Zeleny 2013-10-15 16:22:23 +02:00
parent 1a8a9051f2
commit 2515baf2ec
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/scl-utils-20121110.tar.gz /scl-utils-20121110.tar.gz
/scl-utils-20130529.tar.gz /scl-utils-20130529.tar.gz
/scl-utils-20131009.tar.gz /scl-utils-20131009.tar.gz
/scl-utils-20131015.tar.gz

5
macros.scl-filesystem
View File

@ -268,8 +268,11 @@ pushd %{buildroot}%{_scl_root}
mkdir -p boot dev \\ mkdir -p boot dev \\
etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki} \\ etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki} \\
home media mnt opt proc root run/lock srv sys tmp \\ home media mnt opt proc root run/lock srv sys tmp \\
usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{games,locale,modules,sse2},libexec,local/{bin,etc,games,lib,%{_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,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} \\
var/{adm,empty,gopher,lib/{games,misc,rpm-state},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd,uucp},tmp,db,cache,opt,games,yp} var/{adm,empty,gopher,lib/{games,misc,rpm-state},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd,uucp},tmp,db,cache,opt,games,yp}
%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
ln -snf ../var/tmp usr/tmp ln -snf ../var/tmp usr/tmp
ln -snf spool/mail var/mail ln -snf spool/mail var/mail
ln -snf usr/bin bin ln -snf usr/bin bin

14
scl-utils.spec
View File

@ -1,7 +1,7 @@
Summary: Utilities for alternative packaging Summary: Utilities for alternative packaging
Name: scl-utils Name: scl-utils
Version: 20131009 Version: 20131015
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/File Group: Applications/File
URL: https://fedorahosted.org/released/scl-utils/ URL: https://fedorahosted.org/released/scl-utils/
@ -54,6 +54,7 @@ rm -rf %buildroot
%dir %{_sysconfdir}/scl/prefixes %dir %{_sysconfdir}/scl/prefixes
%{_bindir}/scl %{_bindir}/scl
%{_bindir}/scl_enabled %{_bindir}/scl_enabled
%{_bindir}/scl_source
%{_mandir}/man1/* %{_mandir}/man1/*
%{_sysconfdir}/bash_completion.d/scl.bash %{_sysconfdir}/bash_completion.d/scl.bash
%doc LICENSE %doc LICENSE
@ -69,17 +70,14 @@ rm -rf %buildroot
%{_rpmconfigdir}/brp-scl-python-bytecompile %{_rpmconfigdir}/brp-scl-python-bytecompile
%changelog %changelog
* Wed Oct 09 2013 Jan Zeleny <jzeleny@redhat.com> - 20131009-2 * Wed Oct 09 2013 Jan Zeleny <jzeleny@redhat.com> - 20131015-1
- new source file (fixed %_root_sharedstatedir) - Correct the %_sharedstatedir and %_root_sharedstatedir macros
* Wed Oct 09 2013 Jan Zeleny <jzeleny@redhat.com> - 20131009-1
- Correct the %_sharedstatedir macro
- Don't install /%{_lib} when not necessary - Don't install /%{_lib} when not necessary
- Add LICENSE file - Add LICENSE file
- Add scl_source script - Add scl_source script
- Don't change directory in %scl_install - Don't change directory in %scl_install
- Don't generate provides from sonames in the SCL root - Don't generate provides from sonames in the SCL root
- Add prefix to virtual provides of SCL packages - Add the SCL prefix to virtual provides of SCL-based packages
- Implement "--" as a command separator - Implement "--" as a command separator
- Removed binary file scl from git tracking - Removed binary file scl from git tracking
- Fixed typo - Fixed typo

2
sources
View File

@ -1 +1 @@
3f53e946ce10a49985316dd2e6d41a7f scl-utils-20131009.tar.gz 9906864e3b096d8e75c04a68421212c5 scl-utils-20131015.tar.gz