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