diff --git a/SOURCES/0005-Various-fixes-in-Provides-and-Requires-of-scl-packag.patch b/SOURCES/0005-Various-fixes-in-Provides-and-Requires-of-scl-packag.patch
index 11e173b..7f4a9d7 100644
--- a/SOURCES/0005-Various-fixes-in-Provides-and-Requires-of-scl-packag.patch
+++ b/SOURCES/0005-Various-fixes-in-Provides-and-Requires-of-scl-packag.patch
@@ -1,4 +1,4 @@
-From b603a0b745fe01b410bb826422ad48b1df9d1da9 Mon Sep 17 00:00:00 2001
+From 4daefe484e42d5cccbf1b3fe1e5f3494269c9e98 Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@redhat.com>
Date: Mon, 27 Jan 2014 10:23:36 +0100
Subject: [PATCH] Various fixes in Provides and Requires of scl packages
@@ -20,7 +20,7 @@ Subject: [PATCH] Various fixes in Provides and Requires of scl packages
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/macros.scl b/macros.scl
-index 8b6377ee00fd26c89db1748c96e703e30214e9d9..d344b5e80f4fa6d97c7243df2f40847303eb26df 100644
+index 8b6377e..d344b5e 100644
--- a/macros.scl
+++ b/macros.scl
@@ -40,6 +40,7 @@
@@ -55,16 +55,16 @@ index 8b6377ee00fd26c89db1748c96e703e30214e9d9..d344b5e80f4fa6d97c7243df2f408473
%scl_require_package() %1-%2
-
diff --git a/scl.attr b/scl.attr
-index 3e546568261b996e065be3bfaed648d785466c36..068fc4a995443340428fd75b017affed069188d3 100644
+index 3e54656..c16ade6 100644
--- a/scl.attr
+++ b/scl.attr
@@ -1,2 +1,3 @@
%__scl_provides %{_rpmconfigdir}/scldeps.sh --provides %{scl}
-%__scl_path %{?scl:^%{_scl_prefix}/.*$}
+%__scl_requires %{_rpmconfigdir}/scldeps.sh --requires %{scl_runtime}
-+%__scl_path %{?scl:^%{_scl_prefix}/.*$ || %{_root_sysconfdir}/rpm/macros.%{scl}-config$}
++%__scl_path %{?scl:^%{_scl_prefix}/.*$|%{_root_sysconfdir}/rpm/macros.%{scl}-config$}
diff --git a/scldeps.sh b/scldeps.sh
-index 268d6bb5109f34d0e8da8c7d01816dcecffb6888..df8ddb3bb35b291de839bff0754c479958704030 100755
+index 268d6bb..df8ddb3 100755
--- a/scldeps.sh
+++ b/scldeps.sh
@@ -9,5 +9,8 @@ case $1 in
diff --git a/SOURCES/0013-Add-capability-to-share-collections-using-nfs.patch b/SOURCES/0013-Add-capability-to-share-collections-using-nfs.patch
index 73e6570..e966df4 100644
--- a/SOURCES/0013-Add-capability-to-share-collections-using-nfs.patch
+++ b/SOURCES/0013-Add-capability-to-share-collections-using-nfs.patch
@@ -18,11 +18,11 @@ index 67c76be..3bf00ce 100644
%global _datadir %{_prefix}/share
%global _sysconfdir %{_scl_root}/etc
-%global _sharedstatedir %{_prefix}/com
-+%{?nfsmountable: %global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/scls/%{scl}}
++%{?nfsmountable: %global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/%{scl}}
+%global _sharedstatedir %{_scl_root}/var/lib
-+%{?nfsmountable: %global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}/lib}
++%{?nfsmountable: %global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}/lib}
%global _localstatedir %{_scl_root}/var
-+%{?nfsmountable: %global _localstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}}
++%{?nfsmountable: %global _localstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}}
%global _libdir %{_exec_prefix}/%{_lib}
%global _includedir %{_prefix}/include
%global _infodir %{_datadir}/info
diff --git a/SOURCES/macros.scl-filesystem b/SOURCES/macros.scl-filesystem
index 55e1462..cb45354 100644
--- a/SOURCES/macros.scl-filesystem
+++ b/SOURCES/macros.scl-filesystem
@@ -98,9 +98,10 @@
%scl_install %{expand:
# scl specific stuff
mkdir -p %{buildroot}%{_root_sysconfdir}/{rpm,scl/prefixes}
-echo -n '%' > %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config
cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF
-scl %scl
+%%%%scl %scl
+%{?nfsmountable:%%%%nfsmountable %{nfsmountable}}
+%{!?nfsmountable:%%%%undefine nfsmountable}
EOF
cat >> %{buildroot}%{_root_sysconfdir}/scl/prefixes/%{scl} << EOF
%_scl_prefix
@@ -263,7 +264,7 @@ H
EOF
mkdir -p %{buildroot}%{_localstatedir}
pushd %{buildroot}%{_localstatedir}
-mkdir -p {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}
+mkdir -p {adm,empty,gopher,lib/{games,misc,rpm-state},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games,yp}
popd
mkdir -p %{buildroot}%{_sysconfdir}
pushd %{buildroot}%{_sysconfdir}
diff --git a/SPECS/scl-utils.spec b/SPECS/scl-utils.spec
index f373836..61dddc3 100644
--- a/SPECS/scl-utils.spec
+++ b/SPECS/scl-utils.spec
@@ -1,7 +1,7 @@
Summary: Utilities for alternative packaging
Name: scl-utils
Version: 20130529
-Release: 9%{?dist}
+Release: 17%{?dist}
License: GPLv2+
Group: Applications/File
URL: https://fedorahosted.org/released/scl-utils/
@@ -96,6 +96,37 @@ rm -rf %buildroot
%{_rpmconfigdir}/brp-scl-python-bytecompile
%changelog
+* Thu Mar 08 2015 Lubos Karddos <lkardos@redhat.com> - 20130529-17
+- Remove /uucp/ from directory structure.
+
+* Thu Mar 05 2015 Lubos Karddos <lkardos@redhat.com> - 20130529-16
+- Remove /scls/ from macros _sysconfdir, _sharedstatedir and _localstatedir
+
+* Tue Jan 27 2015 Lubos Karddos <lkardos@redhat.com> - 20130529-15
+- fixed wrong syntax of or-operator in scl.attr
+
+* Tue Jan 06 2015 Jan Zeleny <jzeleny@redhat.com> - 20142529-14
+- remove the vendor prefix from %%scl_install
+
+* Tue Jan 06 2015 Jan Zeleny <jzeleny@redhat.com> - 20130529-13
+- bump the version to get in sync with 7.1 branch
+- Reflect the state of %%nfsmountable macro in collections' rpm macro files
+- escape all the %% chars in changelog
+
+* Mon Jan 05 2015 Jan Zeleny <jzeleny@redhat.com> - 20132529-13
+- after a thorough discussion with scl maintainers, revert the vendor prefix
+ in package names
+
+* Fri Dec 12 2014 Jan Zeleny <jzeleny@redhat.com> - 20132529-12
+- the second half of the macro rename
+
+* Fri Dec 12 2014 Jan Zeleny <jzeleny@redhat.com> - 20130529-11
+- renamed %%scl_pkg_prefix to %%scl_full_prefix (#1167042)
+
+* Fri Dec 05 2014 Lubos Kardos <lkardos@redhat.com> - 20130529-10
+- Allow to use vendor prefix in packages names
+- Include %%nfsmountable macro into scl's rpm macros file
+
* Wed Oct 23 2014 Lubos Kardos <lkardos@redhat.com - 20130529-9
- "filesystem" is now symlink to file "filelist"
@@ -112,9 +143,9 @@ Support for importing collections from NFS mounts
* Tue Aug 26 2014 Jan Zeleny <jzeleny@redhat.com> - 20130529-6
Catch up with Fedora and RHEL6
-- add automatic Provides: scl-package(%scl) to all scl packages
+- add automatic Provides: scl-package(%%scl) to all scl packages
(except for metapackages)
-- add automatic Requires: %scl_runtime to all scl packages
+- add automatic Requires: %%scl_runtime to all scl packages
(except for metapackages)
- the "filesystem" file renamed back to "filelist"
- add correct dependencies to debug packages.
@@ -126,7 +157,7 @@ Catch up with Fedora and RHEL6
- add the command set to register/deregister collection
- fix missing allocation check in read_script_output()
- drop recursive ownership of /usr/lib within SCL root
-- introduce %scl_dependency_generators macro
+- introduce %%scl_dependency_generators macro
* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 20130529-5
- Mass rebuild 2014-01-24