rpms/postgresql
5
0
Fork 0
Code Issues Pull Requests Releases Activity

spec: install README.rpm-dist properly

Browse Source 
Resolves: rhbz#1249708
Version: 9.4.4-4
This commit is contained in:
Pavel Raiskup 2015-08-04 12:50:04 +02:00
parent 31524fb5ac
commit a037a89502
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
postgresql.spec
View File

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