diff options
| author | Jani Välimaa <wally@mageia.org> | 2019-12-26 22:19:55 +0200 |
|---|---|---|
| committer | Jani Välimaa <wally@mageia.org> | 2019-12-26 22:19:55 +0200 |
| commit | 9e86a885d803a5859ab0546e4b2d21fbfaa2cb85 (patch) | |
| tree | 2998af9470d2ec0e252ae8011c54f4d7b9bb4690 | |
| parent | 1737e998727cfd711f051662d2dfdb07b35ca291 (diff) | |
| download | rpm-setup-9e86a885d803a5859ab0546e4b2d21fbfaa2cb85.tar rpm-setup-9e86a885d803a5859ab0546e4b2d21fbfaa2cb85.tar.gz rpm-setup-9e86a885d803a5859ab0546e4b2d21fbfaa2cb85.tar.bz2 rpm-setup-9e86a885d803a5859ab0546e4b2d21fbfaa2cb85.tar.xz rpm-setup-9e86a885d803a5859ab0546e4b2d21fbfaa2cb85.zip | |
build.macros: remove %_after_setup leftovers
Support for it was dropped when introduce-_after_setup-which-is-called-after-setup.patch was removed from rpm
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | build.macros.in | 8 |
2 files changed, 2 insertions, 8 deletions
@@ -1,3 +1,5 @@ +- build.macros: remove %_after_setup leftovers after + introduce-_after_setup-which-is-called-after-setup.patch was removed from rpm - rpmrc: drop deprecated macrofiles line Version 2.47 - 25 December 2019, by Jani Välimaa diff --git a/build.macros.in b/build.macros.in index 7798ec5..9595931 100644 --- a/build.macros.in +++ b/build.macros.in @@ -2,14 +2,6 @@ %_sys_macros_dir @RPMSYSCONFDIR@/macros.d %build_sysmacrospath() %{_sys_macros_dir}/%{?1:%{1}}%{?!1:%{name}}.macros -# when %_with_git_repository is set, these macros modify the behaviour of "%prep" step: -%_after_setup %{?_with_git_repository:GIT_URL="%{?git_url}" GIT_REPOSITORY_CACHE=%{?git_repository_cache} @RPMVENDORDIR@/git-repository--after-tarball} -%_patch %{?_with_git_repository:PKG_NAME=%{name} @RPMVENDORDIR@/git-repository--apply-patch}%{?!_with_git_repository:%__patch -U} - -# used by "git-repository--after-tarball": -%git_repository_cache %_topdir/%{name}.git - - # Various programs used in rpm scripts %_update_desktop_database_bin %{_bindir}/update-desktop-database %_update_mime_database_bin %{_bindir}/update-mime-database |