- Stop pretending this package is relocatable, its not

- Require rpm >= 4.11 for /usr/lib/rpm/macros.d support etc
- Move our macros out of from /etc, they're not configuration
This commit is contained in:
Panu Matilainen 2014-04-02 17:26:32 +03:00
parent d671d47dd1
commit fe3b678a9d
1 changed files with 11 additions and 6 deletions

View File

@ -6,7 +6,7 @@
Summary: Red Hat specific rpm configuration files Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 10 Version: 11
Release: 1%{?dist} Release: 1%{?dist}
# No version specified. # No version specified.
License: GPL+ License: GPL+
@ -70,12 +70,12 @@ Source501: config.sub
BuildArch: noarch BuildArch: noarch
Requires: coreutils Requires: coreutils
Requires: perl-srpm-macros Requires: perl-srpm-macros
Requires: rpm >= 4.8.0 Requires: rpm >= 4.11.0
Requires: dwz >= 0.4 Requires: dwz >= 0.4
Requires: zip Requires: zip
Provides: system-rpm-config = %{version}-%{release} Provides: system-rpm-config = %{version}-%{release}
%global rrcdir %{_prefix}/lib/rpm/redhat %global rrcdir /usr/lib/rpm/redhat
%description %description
Red Hat specific rpm configuration files. Red Hat specific rpm configuration files.
@ -98,15 +98,20 @@ install -p -m 755 -t %{buildroot}%{rrcdir} find-*
mkdir -p %{buildroot}%{rrcdir}/find-provides.d mkdir -p %{buildroot}%{rrcdir}/find-provides.d
install -p -m 644 -t %{buildroot}%{rrcdir}/find-provides.d *.prov install -p -m 644 -t %{buildroot}%{rrcdir}/find-provides.d *.prov
mkdir -p %{buildroot}%{_sysconfdir}/rpm mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
install -p -m 644 -t %{buildroot}%{_sysconfdir}/rpm macros.* install -p -m 644 -t %{buildroot}%{_rpmconfigdir}/macros.d macros.*
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{rrcdir} %{rrcdir}
%{_sysconfdir}/rpm/* %{_rpmconfigdir}/macros.d/*
%changelog %changelog
* Wed Apr 02 2014 Panu Matilainen <pmatilai@redhat.com> - 11-1
- Stop pretending this package is relocatable, its not
- Require rpm >= 4.11 for /usr/lib/rpm/macros.d support etc
- Move our macros out of from /etc, they're not configuration
* Wed Apr 02 2014 Panu Matilainen <pmatilai@redhat.com> - 10-1 * Wed Apr 02 2014 Panu Matilainen <pmatilai@redhat.com> - 10-1
- Make fedora dist-git the upstream of this package and its sources - Make fedora dist-git the upstream of this package and its sources
- Add maintainer comments to spec wrt versioning and changes - Add maintainer comments to spec wrt versioning and changes