From 63a8880c60196bdf21657317f6ebea961ae1de77 Mon Sep 17 00:00:00 2001 From: songnannan Date: Sat, 21 Mar 2020 17:59:31 +0800 Subject: [PATCH 1/2] exclude the evoldap.conf --- GConf2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/GConf2.spec b/GConf2.spec index 40ce556..3cef77d 100644 --- a/GConf2.spec +++ b/GConf2.spec @@ -1,6 +1,6 @@ Name: GConf2 Version: 3.2.6 -Release: 23 +Release: 24 Summary: GConf is a system for storing application preferences License: LGPLv2+ and GPLv2+ URL: http://projects.gnome.org/gconf/ @@ -99,6 +99,7 @@ fi %{_localstatedir}/lib/rpm-state/gconf/ %{_libdir}/gio/modules/libgsettingsgconfbackend.so %{_libdir}/girepository-1.0 +%exclude %{_sysconfdir}/gconf/2/evoldap.conf %files devel %{_libdir}/*.so @@ -114,6 +115,9 @@ fi %{_mandir}/man1/gsettings-schema-convert.1* %changelog +* Sat Mare 21 2020 songnannan - 2.0.6-24 +- exclude the evoldap.conf + * Sat Jan 11 2020 openEuler Buildteam - 3.2.6-23 - Type:enhancement - ID:NA From e579b4f664973a4b11438e469db6aa750821879e Mon Sep 17 00:00:00 2001 From: songnannan Date: Sat, 21 Mar 2020 19:40:38 +0800 Subject: [PATCH 2/2] exclude the evoldap.conf --- GConf2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GConf2.spec b/GConf2.spec index 3cef77d..cabf1be 100644 --- a/GConf2.spec +++ b/GConf2.spec @@ -15,7 +15,7 @@ Patch0100: pkill-hack.patch BuildRequires: libxml2-devel >= 2.4.12 libxslt-devel glib2-devel >= 2.25.9 gtk-doc >= 0.9 BuildRequires: pkgconfig >= 0.14 gettext intltool polkit-devel >= 0.92 dbus-glib-devel >= 0.8 -BuildRequires: gobject-introspection-devel >= 0.6.7 autoconf automake libtool +BuildRequires: gobject-introspection-devel >= 0.6.7 autoconf automake libtool gdb Requires: dbus psmisc Conflicts: GConf2-dbus