[gnome-chemistry-utils/f15: 5/7] Revert "Updated to 0.13.6"

[belegdol]

commit a3111bb06dd132eb966216286b49f201f8ad1a03
Author: Julian Sikorski <belegdol at fedoraproject.org>
Date:   Mon Apr 23 18:12:49 2012 +0200

    Revert "Updated to 0.13.6"
    
    This reverts commit 2e7cd090f15854ddcd2c9e18fb2bb3a83146f69e.

 .gitignore                                 |    1 -
 gnome-chemistry-utils-0.13.5-destdir.patch |   31 ++++++++++++++++++++++++++++
 gnome-chemistry-utils-0.13.5-glib.patch    |   24 +++++++++++++++++++++
 gnome-chemistry-utils.spec                 |   10 ++++----
 sources                                    |    2 +-
 5 files changed, 61 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4911063..f7ac509 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@ gnome-chemistry-utils-0.12.3.tar.bz2
 /gnome-chemistry-utils-0.12.9.tar.xz
 /gnome-chemistry-utils-0.12.10.tar.xz
 /gnome-chemistry-utils-0.13.5.tar.xz
-/gnome-chemistry-utils-0.13.6.tar.xz
diff --git a/gnome-chemistry-utils-0.13.5-destdir.patch b/gnome-chemistry-utils-0.13.5-destdir.patch
new file mode 100644
index 0000000..8f91747
--- /dev/null
+++ b/gnome-chemistry-utils-0.13.5-destdir.patch
@@ -0,0 +1,31 @@
+diff -up gnome-chemistry-utils-0.13.5/pixmaps/Makefile.am.destdir gnome-chemistry-utils-0.13.5/pixmaps/Makefile.am
+--- gnome-chemistry-utils-0.13.5/pixmaps/Makefile.am.destdir	2011-11-11 17:50:38.000000000 +0100
++++ gnome-chemistry-utils-0.13.5/pixmaps/Makefile.am	2012-01-10 00:40:43.069240779 +0100
+@@ -1,10 +1,10 @@
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+-pixmapdir = $(DESTDIR)$(datadir)/gchemutils/@GCU_API_VER@/pixmaps
++pixmapdir = $(datadir)/gchemutils/@GCU_API_VER@/pixmaps
+ dist_pixmap_DATA = gcrystal_logo.png gchempaint_logo.png
+ 
+ 
+-iconsdir = $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
++iconsdir = $(datadir)/icons/hicolor/scalable/apps
+ dist_icons_DATA = \
+ 	gchem3d.svg \
+ 	gchemcalc.svg \
+diff -up gnome-chemistry-utils-0.13.5/pixmaps/Makefile.in.destdir gnome-chemistry-utils-0.13.5/pixmaps/Makefile.in
+--- gnome-chemistry-utils-0.13.5/pixmaps/Makefile.in.destdir	2011-11-11 17:55:17.000000000 +0100
++++ gnome-chemistry-utils-0.13.5/pixmaps/Makefile.in	2012-01-10 00:40:43.069240779 +0100
+@@ -287,9 +287,9 @@ x11_LIBS = @x11_LIBS@
+ xml_CFLAGS = @xml_CFLAGS@
+ xml_LIBS = @xml_LIBS@
+ MAINTAINERCLEANFILES = Makefile.in
+-pixmapdir = $(DESTDIR)$(datadir)/gchemutils/@GCU_API_VER@/pixmaps
++pixmapdir = $(datadir)/gchemutils/@GCU_API_VER@/pixmaps
+ dist_pixmap_DATA = gcrystal_logo.png gchempaint_logo.png
+-iconsdir = $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
++iconsdir = $(datadir)/icons/hicolor/scalable/apps
+ dist_icons_DATA = \
+ 	gchem3d.svg \
+ 	gchemcalc.svg \
diff --git a/gnome-chemistry-utils-0.13.5-glib.patch b/gnome-chemistry-utils-0.13.5-glib.patch
new file mode 100644
index 0000000..175a93f
--- /dev/null
+++ b/gnome-chemistry-utils-0.13.5-glib.patch
@@ -0,0 +1,24 @@
+diff -up gnome-chemistry-utils-0.13.5/programs/3d/document.cc.glib gnome-chemistry-utils-0.13.5/programs/3d/document.cc
+--- gnome-chemistry-utils-0.13.5/programs/3d/document.cc.glib	2011-11-11 17:50:50.000000000 +0100
++++ gnome-chemistry-utils-0.13.5/programs/3d/document.cc	2012-01-10 00:40:43.067240769 +0100
+@@ -28,7 +28,7 @@
+ #include "view.h"
+ #include "window.h"
+ #include <gcugtk/molecule.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+ 
+ gc3dDocument::gc3dDocument (gc3dApplication *App): gcugtk::Chem3dDoc (App, new gc3dView (this))
+ {
+diff -up gnome-chemistry-utils-0.13.5/programs/spectra/document.cc.glib gnome-chemistry-utils-0.13.5/programs/spectra/document.cc
+--- gnome-chemistry-utils-0.13.5/programs/spectra/document.cc.glib	2011-11-11 17:50:50.000000000 +0100
++++ gnome-chemistry-utils-0.13.5/programs/spectra/document.cc	2012-01-10 00:40:43.067240769 +0100
+@@ -27,7 +27,7 @@
+ #include "application.h"
+ #include "view.h"
+ #include "window.h"
+-#include <glib/gutils.h>
++#include <glib.h>
+ 
+ using namespace gcu;
+ using namespace std;
diff --git a/gnome-chemistry-utils.spec b/gnome-chemistry-utils.spec
index 30841e9..9ef8632 100644
--- a/gnome-chemistry-utils.spec
+++ b/gnome-chemistry-utils.spec
@@ -1,11 +1,13 @@
 Name:           gnome-chemistry-utils
-Version:        0.13.6
+Version:        0.13.5
 Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
 License:        GPLv2+
 URL:            http://www.nongnu.org/gchemutils/
 Source0:        http://download.savannah.nongnu.org/releases/gchemutils/0.13/%{name}-%{version}.tar.xz
+Patch0:         %{name}-%{version}-glib.patch
+Patch1:         %{name}-%{version}-destdir.patch
 
 BuildRequires:  bodr
 BuildRequires:  chemical-mime-data
@@ -69,6 +71,8 @@ This package contains the mozilla plugin.
 
 %prep
 %setup -q
+%patch0 -p1 -b .glib
+%patch1 -p1 -b .destdir
 
 %build
 %configure --disable-update-databases \
@@ -218,10 +222,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
-* Sat Feb 25 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.13.6-1
-- Updated to 0.13.6
-- Dropped upstreamed patches
-
 * Sat Jan 07 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.13.5-1
 - Updated to 0.13.5
 - Dropped obsolete Group, Buildroot, %%clean and %%defattr
diff --git a/sources b/sources
index 1e81a2a..1e54bbf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a5c5fa383a1bb5f749e99c02805cbed  gnome-chemistry-utils-0.13.6.tar.xz
+c7c51041cfb9b3e105e5905daf5f8aac  gnome-chemistry-utils-0.13.5.tar.xz