From: Marcin Krol Date: Wed, 6 Dec 2023 18:00:12 +0000 (+0100) Subject: - adjusted for rpm 4.5, required for rpm.org migration X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=8971ab2e92a83d22b3ac15b2b634517ee1c055f1;p=packages%2Frpm-tld-macros.git - adjusted for rpm 4.5, required for rpm.org migration --- diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec index 0201b7b..ff7a62d 100644 --- a/rpm-tld-macros.spec +++ b/rpm-tld-macros.spec @@ -6,7 +6,7 @@ Summary: TLD Linux RPM macros Summary(pl.UTF-8): Makra RPM dla Linuksa TLD Name: rpm-tld-macros Version: %{rpm_macros_rev} -Release: 2 +Release: 0.1 License: GPL v2+ Group: Development/Building Source0: macros.tld @@ -82,6 +82,7 @@ Ten pakiet zawiera makra rpm-a dla Linuksa TLD. %package build Summary: TLD Linux RPM build macros Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa TLD +Group: Development/Building Requires: %{name} = %{version}-%{release} Requires: findutils >= 1:4.2.26 Provides: rpmbuild(find_lang) = %{find_lang_rev} @@ -186,6 +187,8 @@ fi rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_usrlibrpm}/{fileattrs,macros.d,tld} +install -d $RPM_BUILD_ROOT{/lib/systemd,/usr/lib/{systemd,binfmt.d,environment.d,modules-load.d,sysctl.d,sysusers.d,tmpfiles.d},/etc/{binfmt.d,modules-load.d,systemd,tmpfiles.d},/usr/share/user-tmpfiles.d} + cp -p macros.tld $RPM_BUILD_ROOT%{_usrlibrpm}/tld/macros cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_usrlibrpm}/tld/rpmrc @@ -245,11 +248,13 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) +%dir %{_usrlibrpm}/tld %{_usrlibrpm}/tld/macros %{_usrlibrpm}/tld/rpmrc %files build %defattr(644,root,root,755) +%dir %{_usrlibrpm}/fileattrs %{_usrlibrpm}/fileattrs/java.attr %{_usrlibrpm}/fileattrs/gstreamer.attr %{_usrlibrpm}/fileattrs/kernel.attr @@ -257,6 +262,7 @@ rm -rf $RPM_BUILD_ROOT %{_usrlibrpm}/fileattrs/php.attr %{_usrlibrpm}/fileattrs/ruby.attr +%dir %{_usrlibrpm}/macros.d %{_usrlibrpm}/macros.d/macros.arch %{_usrlibrpm}/macros.d/macros.browser-plugins %{_usrlibrpm}/macros.d/macros.cacti