From 3ffef56d9d23c3392730b408ec25e970b35e6492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 4 Mar 2015 21:38:41 +0200 Subject: [PATCH] Install macros file to %{_rpmconfigdir}/macros.d (#1074275) --- GConf2.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/GConf2.spec b/GConf2.spec index a68fa94..69db0fb 100644 --- a/GConf2.spec +++ b/GConf2.spec @@ -6,7 +6,7 @@ Summary: A process-transparent configuration system Name: GConf2 Version: 3.2.6 -Release: 12%{?dist} +Release: 13%{?dist} License: LGPLv2+ and GPLv2+ Group: System Environment/Base #VCS: git:git://git.gnome.org/gconf @@ -88,11 +88,11 @@ make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.system -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ +mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/rpm-state/gconf mkdir -p $RPM_BUILD_ROOT%{_datadir}/GConf/gsettings -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ +install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/GConf/2/*.la @@ -136,7 +136,7 @@ fi %{_mandir}/man1/* %dir %{_libdir}/GConf %dir %{_libdir}/GConf/2 -%{_sysconfdir}/rpm/macros.gconf2 +%{_rpmconfigdir}/macros.d/macros.gconf2 %{_sysconfdir}/dbus-1/system.d/org.gnome.GConf.Defaults.conf %{_libexecdir}/gconf-defaults-mechanism %{_datadir}/polkit-1/actions/org.gnome.gconf.defaults.policy @@ -159,6 +159,9 @@ fi %doc %{_mandir}/man1/gsettings-schema-convert.1* %changelog +* Wed Mar 4 2015 Ville Skyttä - 3.2.6-13 +- Install macros file to %%{_rpmconfigdir}/macros.d (#1074275) + * Sat Feb 21 2015 Till Maas - 3.2.6-12 - Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code