From ebf59e42fa96831d28f98c62bf64d9d57111888b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 21 Aug 2014 15:32:39 +0200 Subject: [PATCH] rpm-macros: install macros.%{name}, not %{name}.macros 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 --- postgresql.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/postgresql.spec b/postgresql.spec index 58a7945..7d55318 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -67,7 +67,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 9.3 Version: 9.3.5 -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. @@ -639,7 +639,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/extension echo "%%%{name}_major %{majorversion}" > 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! # we only apply this to known Red Hat multilib arches, per bug #177564 @@ -1155,6 +1155,9 @@ fi %endif %changelog +* Thu Aug 21 2014 Pavel Raiskup - 9.3.5-4 +- install macros.postgresql, not postgresql.macros + * Sun Aug 17 2014 Fedora Release Engineering - 9.3.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild