Rebase to the latest upstream release

- split _scl_prefix macro in two parts: scl_basedir and scl_vendor
  (#985233)
- check if temp file is created (#1032666)
- don't split command arguments containing white space (#1032666)
- rename some attr rpm macros to stop confusing rpm (#1023625)
This commit is contained in:
Jan Zeleny 2014-01-08 10:13:35 +01:00
parent 6b54f60316
commit 847df3ab2f
3 changed files with 10 additions and 3 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/scl-utils-20131015.tar.gz /scl-utils-20131015.tar.gz
/scl-utils-20131016.tar.gz /scl-utils-20131016.tar.gz
/scl-utils-20131017.tar.gz /scl-utils-20131017.tar.gz
/scl-utils-20140108.tar.gz

View File

@ -1,10 +1,10 @@
Summary: Utilities for alternative packaging Summary: Utilities for alternative packaging
Name: scl-utils Name: scl-utils
Version: 20131017 Version: 20140108
Release: 1%{?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/SoftwareCollections/
Source0: https://fedorahosted.org/released/scl-utils/%{name}-%{version}.tar.gz Source0: https://fedorahosted.org/released/scl-utils/%{name}-%{version}.tar.gz
Source1: macros.scl-filesystem Source1: macros.scl-filesystem
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -70,6 +70,12 @@ rm -rf %buildroot
%{_rpmconfigdir}/brp-scl-python-bytecompile %{_rpmconfigdir}/brp-scl-python-bytecompile
%changelog %changelog
* Wed Jan 08 2014 Jan Zeleny <jzeleny@redhat.com> - 20140108-1
- split _scl_prefix macro in two parts: scl_basedir and scl_vendor (#985233)
- check if temp file is created (#1032666)
- don't split command arguments containing white space (#1032666)
- rename some attr rpm macros to stop confusing rpm (#1023625)
* Thu Oct 17 2013 Jan Zeleny <jzeleny@redhat.com> - 20131017-1 * Thu Oct 17 2013 Jan Zeleny <jzeleny@redhat.com> - 20131017-1
- fixed one issue in scl_source script - fixed one issue in scl_source script

View File

@ -1 +1 @@
68ecdeb0232d7a523a09914124e015f7 scl-utils-20131017.tar.gz b68961a83838ed8bd13a88c23ab18254 scl-utils-20140108.tar.gz