[dia] 0.97.1

[Peter Robinson]

commit 99f9f6e6f236535f5419ffb70370c7e294f64ac3
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Dec 8 13:56:03 2011 +0000

    0.97.1

 .gitignore             |    2 +-
 dia-export-crash.patch |   31 -------------------------------
 dia-noglib.patch       |   12 ++++++++++++
 dia.spec               |   21 ++++++++++-----------
 sources                |    2 +-
 5 files changed, 24 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 316cc5d..36f58ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-dia-0.97.tar.bz2
+/dia-0.97.1.tar.bz2
diff --git a/dia-noglib.patch b/dia-noglib.patch
new file mode 100644
index 0000000..766f543
--- /dev/null
+++ b/dia-noglib.patch
@@ -0,0 +1,12 @@
+--- dia-0.97.1/objects/custom/shape_typeinfo.c.orig	2011-12-08 12:41:12.136625698 +0000
++++ dia-0.97.1/objects/custom/shape_typeinfo.c	2011-12-08 12:41:44.584639234 +0000
+@@ -27,8 +27,7 @@
+ #include "custom_util.h"
+ #include <string.h>
+ #include <stdarg.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstdio.h>
++#include <glib.h>
+ #include <libxml/parser.h>
+ 
+ /*
diff --git a/dia.spec b/dia.spec
index 2f458ec..a89dab8 100644
--- a/dia.spec
+++ b/dia.spec
@@ -1,14 +1,14 @@
 Name:           dia
-Version:        0.97
-Release:        7%{?dist}
+Version:        0.97.1
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.gnome.org/projects/dia/
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
-Patch0:		dia-export-crash.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         dia-noglib.patch
+
 BuildRequires:  libgnomeui-devel pygtk2-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 BuildRequires:  gettext
@@ -25,7 +25,8 @@ and can export to PostScript(TM).
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .noglib
+
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
@@ -34,12 +35,11 @@ mv usage-layers.xml.UTF-8 doc/en/usage-layers.xml
 
 
 %build
-%configure --enable-gnome --enable-db2html 
+%configure --enable-gnome --enable-db2html
 make %{?_smp_mflags}
  
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %name
 
@@ -70,10 +70,6 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 
-%clean
-rm -fr $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog KNOWN_BUGS NEWS README TODO THANKS
@@ -93,6 +89,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec  8 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1:0.97.1-1
+- 0.97.1
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 1:0.97-7
 - Rebuild for new libpng
 
diff --git a/sources b/sources
index 1a9fbad..41e0515 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d11f9aaa5a4923f0a5533962c87bdfb  dia-0.97.tar.bz2
+57e44bb9f387559a0506b52a134deaf0  dia-0.97.1.tar.bz2