From 78fb1bd90387b0f339447173531c610708b70dbc Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 3 Mar 2010 20:11:33 +0000 Subject: [PATCH] add macros and directory ownership for simplified gconf schema scriplets --- GConf2.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/GConf2.spec b/GConf2.spec index 80c4f4a..019cc86 100644 --- a/GConf2.spec +++ b/GConf2.spec @@ -7,10 +7,11 @@ Summary: A process-transparent configuration system Name: GConf2 Version: 2.28.0 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ Group: System Environment/Base -Source: http://download.gnome.org/sources/GConf/2.28/GConf-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/GConf/2.28/GConf-%{version}.tar.bz2 +Source1: macros.gconf2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://projects.gnome.org/gconf/ @@ -101,6 +102,10 @@ 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%{_localstatedir}/lib/rpm-state/gconf + +install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/GConf/2/*.la @@ -141,11 +146,13 @@ fi %{_mandir}/man1/* %dir %{_libdir}/GConf %dir %{_libdir}/GConf/2 +%{_sysconfdir}/rpm/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 %{_datadir}/dbus-1/system-services/org.gnome.GConf.Defaults.service %{_datadir}/dbus-1/services/org.gnome.GConf.service +%{_localstatedir}/lib/rpm-state/gconf/ %files gtk %defattr(-, root, root) @@ -160,6 +167,10 @@ fi %{_libdir}/pkgconfig/* %changelog +* Wed Mar 03 2010 Tom "spot" Callaway 2.28.0-9 +- add macros.gconf2 +- own /var/lib/rpm-state/gconf + * Mon Feb 01 2010 Colin Walters 2.28.0-8 - Add defaults patch from f-12 branch