[gnome-terminal] Fix filelists

Richard Hughes rhughes at fedoraproject.org
Wed Jan 16 17:20:54 UTC 2013


commit 72bce50aa3b561b7b8d3f7c7fbf15aa0bf0943b6
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Jan 16 17:23:07 2013 +0000

    Fix filelists

 gnome-terminal.spec |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 3c0b14d..5218eaa 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -25,7 +25,6 @@ BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 # for gtk-builder-convert
 BuildRequires: gtk2-devel
-BuildRequires: GConf2-devel
 BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: vte3-devel >= %{vte_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
@@ -56,9 +55,7 @@ clickable URLs.
 make %{?_smp_mflags}
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 desktop-file-install --vendor gnome --delete-original	\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
@@ -68,23 +65,23 @@ desktop-file-install --vendor gnome --delete-original	\
 
 %find_lang %{gettext_package} --with-gnome
 
-%post
-%gconf_schema_upgrade gnome-terminal
-
-%pre
-%gconf_schema_prepare gnome-terminal
-
-%preun
-%gconf_schema_remove gnome-terminal
+%postun
+if [ $1 -eq 0 ] ; then
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
 
+%posttrans
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{gettext_package}.lang
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS COPYING NEWS
 
 %{_bindir}/gnome-terminal
-%{_datadir}/gnome-terminal
 %{_datadir}/applications/gnome-terminal.desktop
-%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
+%{_libexecdir}/gnome-terminal-migration
+%{_libexecdir}/gnome-terminal-server
+%{_datadir}/dbus-1/services/org.gnome.Terminal.service
+%{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml
 
 %changelog
 * Wed Jan 16 2013 Richard Hughes <hughsient at gmail.com> - 3.7.1-1


More information about the scm-commits mailing list