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

rpm-macros: install macros.%{name}, not %{name}.macros

Browse Source 
The %{name}.macros file is not loaded by rpm.  Spotted by jmlich
through regular dependency checker in Fedora & postgresql-ip4r
package.

Version: 9.3.5-4
This commit is contained in:
Pavel Raiskup 2014-08-21 15:32:39 +02:00
parent 09271080e2
commit ebf59e42fa
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
postgresql.spec
View File

@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql Name: postgresql
%global majorversion 9.3 %global majorversion 9.3
Version: 9.3.5 Version: 9.3.5
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.
@ -639,7 +639,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/extension
echo "%%%{name}_major %{majorversion}" > macros.%{name} echo "%%%{name}_major %{majorversion}" > macros.%{name}
install -D -m 644 macros.%{name} \ install -D -m 644 macros.%{name} \
$RPM_BUILD_ROOT%{macrosdir}/%{name}.macros $RPM_BUILD_ROOT%{macrosdir}/macros.%{name}
# multilib header hack; note pg_config.h is installed in two places! # multilib header hack; note pg_config.h is installed in two places!
# we only apply this to known Red Hat multilib arches, per bug #177564 # we only apply this to known Red Hat multilib arches, per bug #177564
@ -1155,6 +1155,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Aug 21 2014 Pavel Raiskup <praiskup@redhat.com> - 9.3.5-4
- install macros.postgresql, not postgresql.macros
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.3.5-3 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.3.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild