rpms/gnome-chemistry-utils/devel fonts.patch, NONE, 1.1 formalcharges.patch, NONE, 1.1 gnome-chemistry-utils.spec, 1.62, 1.63

[belegdol]

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12857

Modified Files:
	gnome-chemistry-utils.spec 
Added Files:
	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


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: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- gnome-chemistry-utils.spec	25 Jul 2010 20:30:05 -0000	1.62
+++ gnome-chemistry-utils.spec	26 Jul 2010 18:47:13 -0000	1.63
@@ -1,6 +1,6 @@
 Name:           gnome-chemistry-utils
 Version:        0.12.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
@@ -9,6 +9,8 @@ URL:            http://www.nongnu.org/gc
 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
@@ -80,6 +82,8 @@ This package contains the mozilla plugin
 %prep
 %setup -q
 %patch0 -p0 -b .30495
+%patch1 -p0 -b .fonts
+%patch2 -p0 -b .formalcharges
 
 
 %build
@@ -238,8 +242,13 @@ 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
+- 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)