spec: install README.rpm-dist properly
Resolves: rhbz#1249708 Version: 9.4.4-4
This commit is contained in:
parent
31524fb5ac
commit
a037a89502
@ -71,7 +71,7 @@ Summary: PostgreSQL client programs
|
||||
Name: postgresql
|
||||
%global majorversion 9.4
|
||||
Version: 9.4.4
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
|
||||
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
|
||||
# recognizes it as an independent license, so we do as well.
|
||||
@ -650,11 +650,8 @@ cd postgresql-setup-%{setup_version}
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
cd ..
|
||||
|
||||
# For some reson, specifying %doc %{_pkgdocdir}/README.rpm-dist in %files does
|
||||
# not work (at least on RHEL6) and rpmbuild fails with (it may be known issue
|
||||
# but I was unable to debug properly yet):
|
||||
# error: create archive failed on file
|
||||
# /builddir/.../...-9.4.1/README.rpm-dist: cpio: Bad magic
|
||||
# For some reason, having '%%doc %%{_pkgdocdir}/README.rpm-dist' in %%files
|
||||
# causes FTBFS (at least on RHEL6), see rhbz#1250006.
|
||||
cp $RPM_BUILD_ROOT/%{_pkgdocdir}/README.rpm-dist ./
|
||||
|
||||
cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql.conf <<EOF
|
||||
@ -916,6 +913,7 @@ fi
|
||||
%files -f main.lst
|
||||
%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO
|
||||
%doc COPYRIGHT README HISTORY doc/bug.template
|
||||
%doc README.rpm-dist
|
||||
%{_bindir}/clusterdb
|
||||
%{_bindir}/createdb
|
||||
%{_bindir}/createlang
|
||||
@ -1200,6 +1198,9 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Aug 04 2015 Pavel Raiskup <praiskup@redhat.com> - 9.4.4-4
|
||||
- install README.rpm-dist properly (rhbz#1249708)
|
||||
|
||||
* Tue Jul 14 2015 Pavel Raiskup <praiskup@redhat.com> - 9.4.4-3
|
||||
- revert/fix part of e6acde1a9 commit related to multilib hack (rhbz#1242873)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user