commit c89aa79e27769372005f386a992fcc385af9fa80
Author: Jan Rękorajski <[email protected]>
Date: Wed Jan 22 11:17:53 2020 +0100
- moved all macros to build subpackage, rpm5 has distro macros in main
package
rpm-pld-macros.spec | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 32696dc..6de8088 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,10 +1,7 @@
-#
-# TODO: rename to rpm-pld-setup/config and split build stuff from main package
-#
%define rpm_macros_rev 1.744
%define find_lang_rev 1.40
-Summary: PLD Linux RPM build macros
-Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
+Summary: PLD Linux RPM macros
+Summary(pl.UTF-8): Makra RPM dla Linuksa PLD
Name: rpm-pld-macros
Version: %{rpm_macros_rev}
Release: 2
@@ -57,9 +54,26 @@ Patch0: disable-systemd.patch
#Patchx: %{name}-pydebuginfo.patch
BuildRequires: rpm >= 4.4.9-56
BuildRequires: sed >= 4.0
+BuildArch: noarch
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+# redefine to bootstrap
+%define _usrlibrpm %{_prefix}/lib/rpm
+
+%description
+This package contains rpm macros for PLD Linux.
+
+%description -l pl.UTF-8
+Ten pakiet zawiera makra rpm-a dla Linuksa PLD.
+
+%package build
+Summary: PLD Linux RPM build macros
+Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
+Requires: %{name} = %{version}-%{release}
Requires: findutils >= 1:4.2.26
Provides: rpmbuild(find_lang) = %{find_lang_rev}
Provides: rpmbuild(macros) = %{rpm_macros_rev}
+Obsoletes: rpm-build-macros
Obsoletes: rpm-macros
# rm: option `--interactive' doesn't allow an argument
Conflicts: coreutils < 6.9
@@ -77,16 +91,11 @@ Conflicts: python3 < 1:3.2.1-3
# libtool --install
Conflicts: libtool < 2:2.2
%endif
-BuildArch: noarch
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# redefine to bootstrap
-%define _usrlibrpm %{_prefix}/lib/rpm
-
-%description
+%description build
This package contains rpm build macros for PLD Linux.
-%description -l pl.UTF-8
+%description build -l pl.UTF-8
Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
%package rubyprov
@@ -219,7 +228,7 @@ cp -p %{SOURCE61}
$RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/mimetype
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files build
%defattr(644,root,root,755)
%{_usrlibrpm}/macros.build
%{_usrlibrpm}/macros.d/browser-plugins
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/c89aa79e27769372005f386a992fcc385af9fa80
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
