Albert Uchytil f3d300
From c260cd124d5990395897637ed8bd5edb2fbe7ac6 Mon Sep 17 00:00:00 2001
Albert Uchytil f3d300
From: Albert Uchytil <auchytil@dhcp-24-234.brq.redhat.com>
Albert Uchytil f3d300
Date: Mon, 3 Mar 2014 08:41:14 +0100
Albert Uchytil f3d300
Subject: [PATCH] Added Provides: scl-package(%scl) for metapackage and build
Albert Uchytil f3d300
 subpackage
Albert Uchytil f3d300
Albert Uchytil f3d300
---
Albert Uchytil f3d300
 macros.scl | 1 +
Albert Uchytil f3d300
 scl.attr   | 2 +-
Albert Uchytil f3d300
 2 files changed, 2 insertions(+), 1 deletion(-)
Albert Uchytil f3d300
Albert Uchytil f3d300
diff --git a/macros.scl b/macros.scl
Albert Uchytil f3d300
index 9e4b0540ed75617346334816abca53f8991dece4..50f4df2e6ac09ae1de7cde5e49f7c4c82db6ef70 100644
Albert Uchytil f3d300
--- a/macros.scl
Albert Uchytil f3d300
+++ b/macros.scl
Albert Uchytil f3d300
@@ -73,6 +73,7 @@ package or when debugging this package.
Albert Uchytil f3d300
 Requires: %scl_runtime
Albert Uchytil f3d300
 }
Albert Uchytil f3d300
 BuildRequires: scl-utils-build
Albert Uchytil f3d300
+Provides: scl-package(%scl)
Albert Uchytil f3d300
 %{?scl_package_override:%scl_package_override}
Albert Uchytil f3d300
 }
Albert Uchytil f3d300
 
Albert Uchytil f3d300
diff --git a/scl.attr b/scl.attr
Albert Uchytil f3d300
index 3e546568261b996e065be3bfaed648d785466c36..5f7d91f452b8ba1e29e98892d0e0145fae89e55e 100644
Albert Uchytil f3d300
--- a/scl.attr
Albert Uchytil f3d300
+++ b/scl.attr
Albert Uchytil f3d300
@@ -1,2 +1,2 @@
Albert Uchytil f3d300
 %__scl_provides	%{_rpmconfigdir}/scldeps.sh --provides %{scl}
Albert Uchytil f3d300
-%__scl_path	%{?scl:^%{_scl_prefix}/.*$}
Albert Uchytil f3d300
+%__scl_path	%{?scl:^%{_scl_prefix}/.*$ || %{_root_sysconfdir}/rpm/macros.%{scl}-config$}
Albert Uchytil f3d300
--
Albert Uchytil f3d300
1.8.3.1
Albert Uchytil f3d300