rpms/gnome-chemistry-utils/F-13 30495.patch, NONE, 1.1 fonts.patch, NONE, 1.1 formalcharges.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 gnome-chemistry-utils.spec, 1.53, 1.54 sources, 1.29, 1.30

Mon Jul 26 18:49:58 UTC 2010

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13572

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Added Files:
	30495.patch fonts.patch formalcharges.patch 
Log Message:
* Mon Jul 26 2010 Julian Sikorski <belegdol at fedoraproject.org> - 0.12.2-4
- Fixed the fonts issue properly (Savannah #30495)
- Fixed formal charges not being exported to OpenBabel (Savannah #30547)
- Fixed %changelog typo


30495.patch:
 view.cc |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE 30495.patch ---
Index: libs/gcp/view.cc
===================================================================
--- libs/gcp/view.cc	(révision 1354)
+++ libs/gcp/view.cc	(copie de travail)
@@ -174,6 +174,8 @@
 
 void View::Update (Object *pObject)
 {
+	if (!m_pWidget)
+		return;
 	gccv::ItemClient *client = dynamic_cast <gccv::ItemClient *> (pObject);
 	if (client)
 		client->UpdateItem ();

fonts.patch:
 theme.cc |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE fonts.patch ---
Index: libs/gcp/theme.cc
===================================================================
--- libs/gcp/theme.cc	(révision 1375)
+++ libs/gcp/theme.cc	(copie de travail)
@@ -335,6 +335,7 @@
 void ThemeManager::OnConfigChanged (GOConfNode *node, gchar const *name)
 {
 	Theme *theme = m_Themes["GChemPaint"];
+	char *buf = NULL;
 	GCU_UPDATE_KEY ("bond-length", float, DefaultBondLength, theme->m_BondLength = DefaultBondLength;)
 	GCU_UPDATE_KEY ("bond-angle", float, DefaultBondAngle, theme->m_BondAngle = DefaultBondAngle;)
 	GCU_UPDATE_KEY ("bond-dist", float, DefaultBondDist, theme->m_BondDist = DefaultBondDist;)
@@ -360,12 +361,12 @@
 	GCU_UPDATE_KEY ("object-padding", float, DefaultObjectPadding, theme->m_ObjectPadding = DefaultObjectPadding;)
 	GCU_UPDATE_KEY ("charge-sign-padding", float, DefaultSignPadding, theme->m_SignPadding = DefaultSignPadding;)
 	GCU_UPDATE_KEY ("charge-sign-size", float, DefaultChargeSignSize, theme->m_ChargeSignSize = DefaultChargeSignSize;)
-	GCU_UPDATE_KEY ("font-family", string, name,
-		if (name) {
+	GCU_UPDATE_STRING_KEY ("font-family", buf,
+		if (buf) {
 			if (DefaultFontFamily != NULL)
 				g_free (DefaultFontFamily);
-			DefaultFontFamily = g_strdup (name);
-			theme->m_FontFamily = DefaultFontFamily;
+			DefaultFontFamily = g_strdup (buf);
+			theme->m_FontFamily = g_strdup (DefaultFontFamily);
 		})
 	int n;
 	GCU_UPDATE_KEY ("font-style", int, n, {
@@ -385,12 +386,12 @@
 		theme->m_FontStretch = DefaultFontStretch;
 	})
 	GCU_UPDATE_KEY ("font-size", float, DefaultFontSize, theme->m_FontSize = DefaultFontSize;)
-	GCU_UPDATE_KEY ("text-font-family", string, name,
-		if (name) {
+	GCU_UPDATE_STRING_KEY ("text-font-family", buf,
+		if (buf) {
 			if (DefaultTextFontFamily != NULL)
 				g_free (DefaultTextFontFamily);
 			DefaultTextFontFamily = g_strdup (name);
-			theme->m_TextFontFamily = DefaultTextFontFamily;
+			theme->m_TextFontFamily = g_strdup (DefaultTextFontFamily);
 		})
 	GCU_UPDATE_KEY ("text-font-style", int, n, {
 		DefaultTextFontStyle = set_fontstyle (n);

formalcharges.patch:
 molecule.cc |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE formalcharges.patch ---
Index: libs/gcp/molecule.cc
===================================================================
--- libs/gcp/molecule.cc	(wersja 1383)
+++ libs/gcp/molecule.cc	(wersja 1384)
@@ -622,6 +622,7 @@
 		AtomTable [pgAtom->GetId ()] = index;
 		obAtom.SetIdx (index++);
 		obAtom.SetAtomicNum (pgAtom->GetZ());
+		obAtom.SetFormalCharge (pgAtom->GetCharge ());
 		pgAtom->GetCoords (&x, &y, &z);
 		// Scans the atom bonds and change z to try conservation of stereochemistry
 		pBond = (Bond*) pgAtom->GetFirstBond (i);
@@ -682,6 +683,7 @@
 		AtomTable [pgAtom->GetId ()] = index;
 		obAtom.SetIdx (index++);
 		obAtom.SetAtomicNum (pgAtom->GetZ());
+		obAtom.SetFormalCharge (pgAtom->GetCharge ());
 		pgAtom->GetCoords (&x, &y, &z);
 		// Scans the atom bonds and change z to try conservation of stereochemistry
 		obAtom.SetVector ((x - xav) / 100, (yav - y) / 100, 0.);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-13/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	17 Jun 2010 19:53:55 -0000	1.28
+++ .cvsignore	26 Jul 2010 18:49:58 -0000	1.29
@@ -1 +1 @@
-gnome-chemistry-utils-0.12.1.tar.bz2
+gnome-chemistry-utils-0.12.2.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-13/gnome-chemistry-utils.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- gnome-chemistry-utils.spec	17 Jun 2010 19:53:55 -0000	1.53
+++ gnome-chemistry-utils.spec	26 Jul 2010 18:49:58 -0000	1.54
@@ -1,12 +1,16 @@
 Name:           gnome-chemistry-utils
-Version:        0.12.1
-Release:        1%{?dist}
+Version:        0.12.2
+Release:        4%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://www.nongnu.org/gchemutils/
 Source0:        http://download.savannah.nongnu.org/releases/gchemutils/0.12/%{name}-%{version}.tar.bz2
+#https://savannah.nongnu.org/bugs/?30495
+Patch0:         30495.patch
+Patch1:         fonts.patch
+Patch2:         formalcharges.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bodr
@@ -21,10 +25,9 @@ BuildRequires:  gnumeric-devel
 BuildRequires:  goffice-devel
 BuildRequires:  gtkglext-devel
 BuildRequires:  intltool
-BuildRequires:  man
+BuildRequires:  man-pages-reader
 BuildRequires:  openbabel-devel >= 2.1.0
 BuildRequires:  perl(XML::Parser)
-BuildRequires:  scrollkeeper
 
 Requires:       bodr
 Requires:       chemical-mime-data
@@ -34,11 +37,6 @@ Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-Provides:       gchempaint = %{version}-%{release}
-
-Obsoletes:      gchempaint < 0.8.7-4
-Obsoletes:      gnome-chemistry-utils-devel < 0.8.7-3
-
 %description
 This package is a set of chemical utils. Several programs are available:
 * A 3D molecular structure viewer (GChem3D).
@@ -83,6 +81,9 @@ This package contains the mozilla plugin
 
 %prep
 %setup -q
+%patch0 -p0 -b .30495
+%patch1 -p0 -b .fonts
+%patch2 -p0 -b .formalcharges
 
 
 %build
@@ -147,20 +148,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/{gchempaint,gchempaint-arrows,gchemutils,gcrystal}.schemas >/dev/null || :
-    # If the schema file has ever been renamed::
-    #gconftool-2 --makefile-uninstall-rule \
-    #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
-fi
+%gconf_schema_prepare gchempaint gchempaint-arrows gchemutils gcrystal
 
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/{gchempaint,gchempaint-arrows,gchemutils,gcrystal}.schemas > /dev/null || :
+%gconf_schema_upgrade gchempaint gchempaint-arrows gchemutils gcrystal
 update-desktop-database &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -168,11 +160,7 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gcrystal.schemas > /dev/null || :
-fi
+%gconf_schema_remove gchempaint gchempaint-arrows gchemutils gcrystal
 
 
 %postun
@@ -254,6 +242,27 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Mon Jul 26 2010 Julian Sikorski <belegdol at fedoraproject.org> - 0.12.2-4
+- Fixed the fonts issue properly (Savannah #30495)
+- Fixed formal charges not being exported to OpenBabel (Savannah #30547)
+- Fixed %%changelog typo
+
+* Sun Jul 25 2010 Julian Sikorski <belegdol at fedoraproject.org> - 0.12.2-3
+- Rebuilt for new goffice
+
+* Sun Jul 25 2010 Julian Sikorski <belegdol at fedoraproject.org> - 0.12.2-2
+- Patched the crash upon changing the text font (RH #614417, Savannah #30495)
+
+* Sat Jul 24 2010 Julian Sikorski <belegdol at fedoraproject.org> - 0.12.2-1
+- Updated to 0.12.2
+- BR man-pages-reader instead of man
+- Updated GConf scriptlets to macro version
+- Dropped ancient gchempaint Provides and Obsoletes
+- Dropped scrollkeeper BR
+
+* Mon Jul 05 2010 Julian Sikorski <belegdol at fedoraproject.org> - 0.12.1-2
+- Rebuilt for new gnumeric
+
 * Thu Jun 17 2010 Julian Sikorski <belegdol at fedoraproject.org> - 0.12.1-1
 - Updated to 0.12.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-13/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	17 Jun 2010 19:53:55 -0000	1.29
+++ sources	26 Jul 2010 18:49:58 -0000	1.30
@@ -1 +1 @@
-a4cf96eac7e79638bc1e227602dc6569  gnome-chemistry-utils-0.12.1.tar.bz2
+82d02d581a875e1802160f4685934f80  gnome-chemistry-utils-0.12.2.tar.bz2

