diff --git a/.cvsignore b/.cvsignore index 1bb4468..528e377 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dia-0.96.tar.bz2 +dia-0.96.1.tar.bz2 diff --git a/dia-0.95-python-2.5.patch b/dia-0.95-python-2.5.patch deleted file mode 100644 index c9bb9c6..0000000 --- a/dia-0.95-python-2.5.patch +++ /dev/null @@ -1,185 +0,0 @@ ---- plug-ins/python/pydia-color.c -+++ plug-ins/python/pydia-color.c -@@ -43,7 +43,7 @@ - static void - PyDiaColor_Dealloc(PyObject *self) - { -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* ---- plug-ins/python/pydia-cpoint.c -+++ plug-ins/python/pydia-cpoint.c -@@ -38,7 +38,7 @@ - static void - PyDiaConnectionPoint_Dealloc(PyDiaConnectionPoint *self) - { -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - static int ---- plug-ins/python/pydia-diagram.c -+++ plug-ins/python/pydia-diagram.c -@@ -50,7 +50,7 @@ - PyDiaDiagram_Dealloc(PyDiaDiagram *self) - { - g_object_unref(self->dia); -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - static int ---- plug-ins/python/pydia-diagramdata.c -+++ plug-ins/python/pydia-diagramdata.c -@@ -46,7 +46,7 @@ - PyDiaDiagramData_Dealloc(PyDiaDiagramData *self) - { - g_object_unref (self->data); -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - static int ---- plug-ins/python/pydia-display.c -+++ plug-ins/python/pydia-display.c -@@ -38,7 +38,7 @@ - static void - PyDiaDisplay_Dealloc(PyDiaDisplay *self) - { -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - static int ---- plug-ins/python/pydia-error.c -+++ plug-ins/python/pydia-error.c -@@ -84,7 +84,7 @@ - { - if (self->str) - g_string_free (self->str, TRUE); -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* ---- plug-ins/python/pydia-export.c -+++ plug-ins/python/pydia-export.c -@@ -37,7 +37,7 @@ - static void - PyDiaExportFilter_Dealloc(PyDiaExportFilter *self) - { -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - static int ---- plug-ins/python/pydia-font.c -+++ plug-ins/python/pydia-font.c -@@ -48,7 +48,7 @@ - { - if (self->font) - dia_font_unref (self->font); -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* ---- plug-ins/python/pydia-geometry.c -+++ plug-ins/python/pydia-geometry.c -@@ -135,7 +135,7 @@ - static void - PyDiaGeometry_Dealloc(void *self) - { -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* ---- plug-ins/python/pydia-handle.c -+++ plug-ins/python/pydia-handle.c -@@ -40,7 +40,7 @@ - static void - PyDiaHandle_Dealloc(PyDiaHandle *self) - { -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - static int ---- plug-ins/python/pydia-image.c -+++ plug-ins/python/pydia-image.c -@@ -45,7 +45,7 @@ - PyDiaImage_Dealloc(PyDiaImage *self) - { - dia_image_release (self->image); -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* ---- plug-ins/python/pydia-layer.c -+++ plug-ins/python/pydia-layer.c -@@ -38,7 +38,7 @@ - static void - PyDiaLayer_Dealloc(PyDiaLayer *self) - { -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - static int ---- plug-ins/python/pydia-object.c -+++ plug-ins/python/pydia-object.c -@@ -40,7 +40,7 @@ - static void - PyDiaObject_Dealloc(PyDiaObject *self) - { -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - static int -@@ -250,7 +250,7 @@ - static void - PyDiaObjectType_Dealloc(PyDiaObjectType *self) - { -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - static int ---- plug-ins/python/pydia-properties.c -+++ plug-ins/python/pydia-properties.c -@@ -46,7 +46,7 @@ - PyDiaProperties_Dealloc(PyDiaObject *self) - { - self->object = NULL; /* XXX: should dec ref */ -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* ---- plug-ins/python/pydia-property.c -+++ plug-ins/python/pydia-property.c -@@ -60,7 +60,7 @@ - PyDiaProperty_Dealloc(PyDiaProperty *self) - { - self->property->ops->free(self->property); -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* ---- plug-ins/python/pydia-text.c -+++ plug-ins/python/pydia-text.c -@@ -49,7 +49,7 @@ - PyDiaText_Dealloc(PyDiaText *self) - { - g_free (self->text_data); -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* diff --git a/dia-0.95-sigpipe.patch b/dia-0.95-sigpipe.patch deleted file mode 100644 index 964c185..0000000 --- a/dia-0.95-sigpipe.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- dia-0.95/app/paginate_psprint.c.sigpipe 2006-01-15 20:49:54.000000000 +0100 -+++ dia-0.95/app/paginate_psprint.c 2007-02-20 19:48:38.000000000 +0100 -@@ -23,6 +23,8 @@ - #include - #endif - -+/* so we get popen and sigaction even when compiling with -ansi */ -+#define _POSIX_C_SOURCE 2 - #include - #include /* strlen */ - #include -@@ -246,7 +247,7 @@ - * needed anymore because the pipe handling - which never worked on win32 - * anyway - is replace by "native" postscript printing now ... - */ -- void *old_action; -+ struct sigaction old_sigpipe_action, sigpipe_action; - #endif - - /* create the dialog */ -@@ -410,7 +411,9 @@ - #ifndef G_OS_WIN32 - /* set up a SIGPIPE handler to catch IO errors, rather than segfaulting */ - sigpipe_received = FALSE; -- old_action = signal(SIGPIPE, pipe_handler); -+ memset(&sigpipe_action, 0, sizeof(struct sigaction)); -+ sigpipe_action.sa_handler = pipe_handler; -+ sigaction(SIGPIPE, &sigpipe_action, &old_sigpipe_action); - #endif - - paginate_psprint(dia, file); -@@ -426,7 +429,7 @@ - - #ifndef G_OS_WIN32 - /* restore original behaviour */ -- signal(SIGPIPE, old_action); -+ sigaction(SIGPIPE, &old_sigpipe_action, NULL); - #endif - if (sigpipe_received) - message_error(_("Printing error: command '%s' caused sigpipe."), diff --git a/dia-0.96.1-64bit.patch b/dia-0.96.1-64bit.patch new file mode 100644 index 0000000..68ebf5c --- /dev/null +++ b/dia-0.96.1-64bit.patch @@ -0,0 +1,11 @@ +--- dia-0.96.1/app/load_save.c~ 2007-06-09 09:55:13.000000000 +0200 ++++ dia-0.96.1/app/load_save.c 2007-06-09 10:02:30.000000000 +0200 +@@ -17,6 +17,8 @@ + */ + #include + ++/* so we get fdopen declared even when compiling with -ansi */ ++#define _POSIX_C_SOURCE 2 + #ifdef HAVE_UNISTD_H + #include + #endif diff --git a/dia.spec b/dia.spec index 470f043..f0e38ce 100644 --- a/dia.spec +++ b/dia.spec @@ -1,21 +1,22 @@ Name: dia -Version: 0.96 +Version: 0.96.1 Release: 1%{?dist} Epoch: 1 Summary: Diagram drawing program Group: Applications/Multimedia License: GPL URL: http://www.gnome.org/projects/dia/ -Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.96/%{name}-%{version}.tar.bz2 Patch1: dia-0.92.2-dtd.patch Patch2: dia-0.95-pre6-help.patch Patch3: dia-0.94-fallbacktoxpmicons.patch Patch4: dia-0.96-python-detect.patch +Patch5: dia-0.96.1-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel python-devel pygtk2-devel desktop-file-utils BuildRequires: intltool docbook-utils docbook-style-dsssl docbook-style-xsl BuildRequires: gettext -Requires: hicolor-icon-theme +Requires: hicolor-icon-theme yelp %description The Dia drawing program is designed to be like the Windows(TM) Visio @@ -32,6 +33,7 @@ and can export to PostScript(TM). %patch2 -p1 -b .help %patch3 -p1 -b .fallbacktoxpmicons %patch4 -p1 -b .py-detect +%patch5 -p1 -b .64bit 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` @@ -100,6 +102,10 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Sat Jun 9 2007 Hans de Goede 1:0.96.1-1 +- New upstream release 0.96.1 +- Add yelp Requires so that the help will always work (bz 243330) + * Thu Mar 29 2007 Hans de Goede 1:0.96-1 - New upstream release 0.96 - Drop upstreamed python-25 and sigpipe patches diff --git a/sources b/sources index d060a90..4c9760d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c173dd5f46672efb77952ecbd884bfd dia-0.96.tar.bz2 +7b81b22baa2df55efe4845865dddc7b6 dia-0.96.1.tar.bz2