GConf to GSettings and a new module addition changes

This commit is contained in:
Milan Crha 2011-12-19 19:25:05 +01:00
parent 9ca5e02c51
commit baaa8c999f

View File

@ -300,6 +300,9 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \;
# remove statically built libraries: # remove statically built libraries:
find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \;
# remove old GConf schemas
find $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas -name '*.schemas' -exec rm {} \;
# remove additional things we don't want # remove additional things we don't want
%if ! %{inline_audio_support} %if ! %{inline_audio_support}
%{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \ %{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \
@ -320,89 +323,21 @@ rm $RPM_BUILD_ROOT%{_datadir}/applications/evolution-settings.desktop
grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang
grep -v "/usr/share/locale" evolution-%{evo_base_version}.lang > help.lang grep -v "/usr/share/locale" evolution-%{evo_base_version}.lang > help.lang
%pre
if [ "$1" -gt 1 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
fi
%pre bogofilter
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || :
%pre spamassassin
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || :
%post %post
/sbin/ldconfig /sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || :
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || :
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || :
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || :
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || :
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas > /dev/null || :
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || :
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || :
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || :
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
%post bogofilter
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || :
%post spamassassin
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || :
%preun
if [ "$1" -eq 0 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || :
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
fi
%preun bogofilter
if [ "$1" -eq 0 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || :
fi
%preun spamassassin
if [ "$1" -eq 0 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || :
fi
%postun %postun
/sbin/ldconfig /sbin/ldconfig
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
glib-compile-schemas %{_datadir}/glib-2.0/schemas
fi fi
%posttrans %posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
glib-compile-schemas %{_datadir}/glib-2.0/schemas
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -411,17 +346,24 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root) %defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README %doc AUTHORS COPYING ChangeLog NEWS README
# GConf schemas: # GSettings schemas:
%{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas %{_datadir}/GConf/gsettings/evolution.convert
%{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas
%{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas %{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml
%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas %{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml
%{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas %{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml
%{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas %{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml
%{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas %{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml
%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas %{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml
%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml
%{_sysconfdir}/gconf/schemas/evolution-mail.schemas %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.external-editor.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml
# The main executable # The main executable
%{_bindir}/evolution %{_bindir}/evolution
@ -454,6 +396,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-composer-autosave.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-composer-autosave.so
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mdn.so
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-online-accounts.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-online-accounts.so
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so
@ -624,7 +567,7 @@ rm -rf $RPM_BUILD_ROOT
%files bogofilter %files bogofilter
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-bogofilter.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-bogofilter.so
%{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas %{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
%files NetworkManager %files NetworkManager
%defattr(-, root, root) %defattr(-, root, root)
@ -633,7 +576,7 @@ rm -rf $RPM_BUILD_ROOT
%files spamassassin %files spamassassin
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-spamassassin.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-spamassassin.so
%{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas %{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
%files perl %files perl
%defattr(-, root, root) %defattr(-, root, root)