Fixed the last rebase before the final build
This commit is contained in:
parent
1a8a9051f2
commit
2515baf2ec
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/scl-utils-20121110.tar.gz
|
||||
/scl-utils-20130529.tar.gz
|
||||
/scl-utils-20131009.tar.gz
|
||||
/scl-utils-20131015.tar.gz
|
||||
|
@ -268,8 +268,11 @@ pushd %{buildroot}%{_scl_root}
|
||||
mkdir -p boot dev \\
|
||||
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 \\
|
||||
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}
|
||||
%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 spool/mail var/mail
|
||||
ln -snf usr/bin bin
|
||||
|
@ -1,7 +1,7 @@
|
||||
Summary: Utilities for alternative packaging
|
||||
Name: scl-utils
|
||||
Version: 20131009
|
||||
Release: 2%{?dist}
|
||||
Version: 20131015
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/File
|
||||
URL: https://fedorahosted.org/released/scl-utils/
|
||||
@ -54,6 +54,7 @@ rm -rf %buildroot
|
||||
%dir %{_sysconfdir}/scl/prefixes
|
||||
%{_bindir}/scl
|
||||
%{_bindir}/scl_enabled
|
||||
%{_bindir}/scl_source
|
||||
%{_mandir}/man1/*
|
||||
%{_sysconfdir}/bash_completion.d/scl.bash
|
||||
%doc LICENSE
|
||||
@ -69,17 +70,14 @@ rm -rf %buildroot
|
||||
%{_rpmconfigdir}/brp-scl-python-bytecompile
|
||||
|
||||
%changelog
|
||||
* Wed Oct 09 2013 Jan Zeleny <jzeleny@redhat.com> - 20131009-2
|
||||
- new source file (fixed %_root_sharedstatedir)
|
||||
|
||||
* Wed Oct 09 2013 Jan Zeleny <jzeleny@redhat.com> - 20131009-1
|
||||
- Correct the %_sharedstatedir macro
|
||||
* Wed Oct 09 2013 Jan Zeleny <jzeleny@redhat.com> - 20131015-1
|
||||
- Correct the %_sharedstatedir and %_root_sharedstatedir macros
|
||||
- Don't install /%{_lib} when not necessary
|
||||
- Add LICENSE file
|
||||
- Add scl_source script
|
||||
- Don't change directory in %scl_install
|
||||
- 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
|
||||
- Removed binary file scl from git tracking
|
||||
- Fixed typo
|
||||
|
Loading…
Reference in New Issue
Block a user