Accepting request 18841 from Base:System
Copy from Base:System/rpm based on submit request 18841 from user mlschroe OBS-URL: https://build.opensuse.org/request/show/18841 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=84
This commit is contained in:
committed by
Git OBS Bridge
parent
bd5319d2fe
commit
25f00b6cb5
@@ -4,7 +4,7 @@ Index: macros.in
|
||||
===================================================================
|
||||
--- macros.in.orig
|
||||
+++ macros.in
|
||||
@@ -433,14 +433,18 @@ print (t)\
|
||||
@@ -473,14 +473,18 @@ print (t)\
|
||||
#
|
||||
# Path to scripts to autogenerate package dependencies,
|
||||
#
|
||||
@@ -13,16 +13,16 @@ Index: macros.in
|
||||
+posix.setenv("RPMBUILD_SOURCEDIR",rpm.expand("%?_sourcedir"));
|
||||
+}
|
||||
# Note: Used iff _use_internal_dependency_generator is zero.
|
||||
#%__find_provides @RPMCONFIGDIR@/rpmdeps --provides
|
||||
#%__find_requires @RPMCONFIGDIR@/rpmdeps --requires
|
||||
-%__find_provides @RPMCONFIGDIR@/find-provides %name
|
||||
-%__find_requires @RPMCONFIGDIR@/find-requires %name
|
||||
+%__find_provides %{__set_helper_env}@RPMCONFIGDIR@/find-provides %name
|
||||
+%__find_requires %{__set_helper_env}@RPMCONFIGDIR@/find-requires %name
|
||||
#%__find_provides %{_rpmconfigdir}/rpmdeps --provides
|
||||
#%__find_requires %{_rpmconfigdir}/rpmdeps --requires
|
||||
-%__find_provides %{_rpmconfigdir}/find-provides %name
|
||||
-%__find_requires %{_rpmconfigdir}/find-requires %name
|
||||
+%__find_provides %{__set_helper_env}%{_rpmconfigdir}/find-provides %name
|
||||
+%__find_requires %{__set_helper_env}%{_rpmconfigdir}/find-requires %name
|
||||
#%__find_conflicts ???
|
||||
#%__find_obsoletes ???
|
||||
-#%__find_supplements ???
|
||||
+%__find_supplements %{__set_helper_env}@RPMCONFIGDIR@/find-supplements %name
|
||||
+%__find_supplements %{__set_helper_env}%{_rpmconfigdir}/find-supplements %name
|
||||
#%__find_enhances ???
|
||||
|
||||
#
|
||||
|
Reference in New Issue
Block a user