Hello community,

here is the log from the commit of package dia for openSUSE:Factory checked in 
at 2012-01-05 19:10:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dia (Old)
 and      /work/SRC/openSUSE:Factory/.dia.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dia", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/dia/dia.changes  2011-10-04 18:08:58.000000000 
+0200
+++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes     2012-01-05 
19:10:31.000000000 +0100
@@ -1,0 +2,19 @@
+Wed Jan  4 09:47:29 UTC 2012 - [email protected]
+
+- Update to version 0.97.2:
+  + More colors for SADT.
+  + Various bug fixes, including:
+    - crashes
+    - fixes to SVG, PNG and Xfig exports
+  + Updated translations.
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+- Drop dia-python-acinclude.patch: fixed upstream.
+
+-------------------------------------------------------------------
+Thu Dec  1 21:09:34 UTC 2011 - [email protected]
+
+- Add dia-glib-2.31.patch: Fix build with glib 2.31.
+
+-------------------------------------------------------------------

Old:
----
  dia-0.97.1.tar.bz2
  dia-python-acinclude.patch

New:
----
  dia-0.97.2.tar.xz
  dia-glib-2.31.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dia.spec ++++++
--- /var/tmp/diff_new_pack.Kr685Z/_old  2012-01-05 19:10:32.000000000 +0100
+++ /var/tmp/diff_new_pack.Kr685Z/_new  2012-01-05 19:10:32.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dia
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           dia
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -36,27 +35,29 @@
 BuildRequires:  swig
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-License:        GPLv2+
-Group:          Productivity/Graphics/Other
+# Only needed because we don't (and won't) support building xz tarballs by 
default... See bnc#697467
+BuildRequires:  xz
 Requires:       ghostscript-fonts-std
 Requires:       python-gtk
 # for xdg-open
 Requires:       xdg-utils
 Summary:        A Diagram Creation Program
-Version:        0.97.1
-Release:        11
-Source:         
ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
+License:        GPL-2.0+
+Group:          Productivity/Graphics/Other
+Version:        0.97.2
+Release:        0
+Source:         
http://download.gnome.org/sources/dia/0.97/%{name}-%{version}.tar.xz
 Source1:        font-test-japanese.dia
 Source2:        font-test-czech.dia
 Source3:        font-test-german-euro.dia
 # PATCH-FIX-OPENSUSE dia-0.92.2-no-strict-aliasing.patch
 Patch3:         dia-0.92.2-no-strict-aliasing.patch
-# PATCH-FIX-UPSTREAM bgo581533 dia-python-acinclude.patch
-Patch14:        dia-python-acinclude.patch
 # PATCH-FIX-OPENSUSE dia-remove-datetime.patch [email protected] -- Do not put 
date/time in the compiled binary (needed for build-compare)
 Patch17:        dia-remove-datetime.patch
 # PATCH-FIX-UPSTREAM dia-swig-2x.patch bgo#651127 [email protected] -- Support 
swig 2.x
 Patch18:        dia-swig-2x.patch
+# PATCH-FIX-UPSTREAM dia-glib-2.31.patch bgo#655335 [email protected] -- 
Fix build with glib 2.31.
+Patch19:        dia-glib-2.31.patch
 Url:            http://live.gnome.org/Dia
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Recommends:     %{name}-lang
@@ -79,9 +80,9 @@
 %setup -q
 translation-update-upstream
 %patch3
-%patch14
 %patch17 -p1
 %patch18
+%patch19 -p1
 cp $RPM_SOURCE_DIR/font-test*dia .
 
 %build

++++++ dia-glib-2.31.patch ++++++
Index: dia-0.97.1/objects/custom/shape_typeinfo.c
===================================================================
--- dia-0.97.1.orig/objects/custom/shape_typeinfo.c
+++ dia-0.97.1/objects/custom/shape_typeinfo.c
@@ -27,7 +27,7 @@
 #include "custom_util.h"
 #include <string.h>
 #include <stdarg.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 #include <libxml/parser.h>
 
Index: dia-0.97.1/plug-ins/pgf/render_pgf.c
===================================================================
--- dia-0.97.1.orig/plug-ins/pgf/render_pgf.c
+++ dia-0.97.1/plug-ins/pgf/render_pgf.c
@@ -61,7 +61,7 @@ TODO:
 #endif
 #include <errno.h>
 
-#include <glib/gprintf.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 
 #include "intl.h"
Index: dia-0.97.1/tests/test-boundingbox.c
===================================================================
--- dia-0.97.1.orig/tests/test-boundingbox.c
+++ dia-0.97.1/tests/test-boundingbox.c
@@ -28,7 +28,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#if GLIB_CHECK_VERSION(2,16,0)
+#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
 #include <glib/gtestutils.h>
 #endif
 #include "dialib.h"
Index: dia-0.97.1/tests/test-objects.c
===================================================================
--- dia-0.97.1.orig/tests/test-objects.c
+++ dia-0.97.1/tests/test-objects.c
@@ -28,7 +28,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#if GLIB_CHECK_VERSION(2,16,0)
+#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
 #include <glib/gtestutils.h>
 #endif
 



-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to