rpms/gcalctool/devel .cvsignore, 1.78, 1.79 gcalctool.spec, 1.115, 1.116 sources, 1.80, 1.81

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10751

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.31.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	9 Jun 2010 00:35:53 -0000	1.78
+++ .cvsignore	29 Jun 2010 04:01:11 -0000	1.79
@@ -1 +1 @@
-gcalctool-5.31.3.tar.bz2
+gcalctool-5.31.4.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- gcalctool.spec	9 Jun 2010 00:35:53 -0000	1.115
+++ gcalctool.spec	29 Jun 2010 04:01:11 -0000	1.116
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.31.3
+Version:        5.31.4
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -12,7 +12,6 @@ Source0:        http://download.gnome.or
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel >= 2.6.0
 BuildRequires: libglade2-devel
-BuildRequires: GConf2-devel
 BuildRequires: libsoup-devel
 BuildRequires: desktop-file-utils >= 0.9
 BuildRequires: gnome-doc-utils
@@ -21,12 +20,8 @@ BuildRequires: flex
 BuildRequires: bison
 BuildRequires: intltool
 
-Requires(post): GConf2
-Requires(preun): GConf2
-Requires(pre): GConf2
-
-Requires: GConf2
-
+Requires(post): glib2
+Requires(postun): glib2
 
 %description
 gcalctool is a powerful graphical calculator with financial, logical and
@@ -55,20 +50,16 @@ desktop-file-install --vendor gnome --de
 %find_lang gcalctool --with-gnome
 
 
-%post
-%gconf_schema_upgrade gcalctool
+%postun
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
-%pre
-%gconf_schema_prepare gcalctool
-
-%preun
-%gconf_schema_remove gcalctool
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files -f gcalctool.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
-%{_sysconfdir}/gconf/schemas/gcalctool.schemas
 %{_bindir}/gcalctool
 %{_bindir}/gcalccmd
 %{_bindir}/gnome-calculator
@@ -78,8 +69,11 @@ desktop-file-install --vendor gnome --de
 
 
 %changelog
+* Mon Jun 28 2010 Matthias Clasen <mclasen at redhat.com> - 5.31.4-1
+- Update to 5.31.4
+
 * Tue Jun  8 2010 Matthias Clasen <mclasen at redhat.com> - 5.31.3-1
-- Update to 2.31.3
+- Update to 5.31.3
 
 * Sun Jun  6 2010 Matthias Clasen <mclasen at redhat.com> - 5.31.2-2
 - Purge scrollkeeper from the spec file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	9 Jun 2010 00:35:54 -0000	1.80
+++ sources	29 Jun 2010 04:01:12 -0000	1.81
@@ -1 +1 @@
-2e6f7075ca00ee709a3fcbe200422244  gcalctool-5.31.3.tar.bz2
+a4772903d4481a220e3b24b9e2c459c0  gcalctool-5.31.4.tar.bz2