rpms/dia/devel dia-0.95-python-2.5.patch, NONE, 1.1 dia-0.95-sigpipe.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 dia.spec, 1.15, 1.16 sources, 1.3, 1.4 dia-0.95-diagram_ungroup_selected_v2.patch, 1.1, NONE dia-0.95-formatstring.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Feb 21 12:08:04 UTC 2007
- Previous message: rpms/perl-Test-LongString/FC-5 .cvsignore, 1.4, 1.5 perl-Test-LongString.spec, 1.6, 1.7 sources, 1.4, 1.5
- Next message: rpms/dia/FC-6 dia-0.95-sigpipe.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 dia.spec, 1.15, 1.16 sources, 1.3, 1.4 dia-0.95-diagram_ungroup_selected_v2.patch, 1.1, NONE dia-0.95-formatstring.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19854
Modified Files:
.cvsignore dia.spec sources
Added Files:
dia-0.95-python-2.5.patch dia-0.95-sigpipe.patch
Removed Files:
dia-0.95-diagram_ungroup_selected_v2.patch
dia-0.95-formatstring.patch
Log Message:
* Tue Feb 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-8
- Upgrade to upstream bugfix release 0.95-1
- Drop upstreamed ungroup and formatstring patches
- Add a patch for python-2.5 support
- Fix exit due to sigpipe when entering an invalid print command (bz 229101)
dia-0.95-python-2.5.patch:
--- NEW FILE dia-0.95-python-2.5.patch ---
--- 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);
}
/*
dia-0.95-sigpipe.patch:
--- NEW FILE dia-0.95-sigpipe.patch ---
--- 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 <config.h>
#endif
+/* so we get popen and sigaction even when compiling with -ansi */
+#define _POSIX_C_SOURCE 2
#include <stdio.h>
#include <string.h> /* strlen */
#include <signal.h>
@@ -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."),
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 25 Apr 2006 19:56:20 -0000 1.3
+++ .cvsignore 21 Feb 2007 12:07:31 -0000 1.4
@@ -1 +1 @@
-dia-0.95.tar.bz2
+dia-0.95-1.tar.bz2
Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dia.spec 28 Aug 2006 11:24:08 -0000 1.15
+++ dia.spec 21 Feb 2007 12:07:31 -0000 1.16
@@ -1,21 +1,22 @@
-Name: dia
-Version: 0.95
-Release: 7%{?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
+Name: dia
+Version: 0.95
+Release: 8%{?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}-1.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.95-formatstring.patch
-Patch5: dia-0.95-diagram_ungroup_selected_v2.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
-BuildRequires: intltool docbook-utils docbook-style-dsssl docbook-style-xsl
+Patch4: dia-0.95-sigpipe.patch
+Patch5: dia-0.95-python-2.5.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
%description
The Dia drawing program is designed to be like the Windows(TM) Visio
@@ -27,14 +28,15 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-1
%patch1 -p1 -b .dtd
%patch2 -p1 -b .help
%patch3 -p1 -b .fallbacktoxpmicons
-%patch4 -p1 -b .formatstring
-%patch5 -p0 -b .ungroup
+%patch4 -p1 -b .sigpipe
+%patch5 -p0 -b .py25
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`
%build
@@ -46,6 +48,9 @@
rm -rf $RPM_BUILD_ROOT
%makeinstall
+# stop rpmlint from complaining
+chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/python/gtkcons.py
+
# remove scrollkeeper stuff we don't include in the package
rm -rf $RPM_BUILD_ROOT/var
@@ -54,14 +59,14 @@
# Since we're not using the cairo stuff, but a stub plugin still
# gets built, Dia complains it doesn't have an init function. So
# kill the plugin
-rm -f $RPM_BUILD_ROOT%{_libdir}/dia/libcairo*
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/libcairo*
# below is the desktop file and icon stuff.
desktop-file-install --vendor fedora --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
--add-category Office \
- $RPM_BUILD_ROOT%{_datadir}/applications/dia.desktop
+ --remove-category Application \
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia-diagram.png \
$RPM_BUILD_ROOT%{_datadir}/pixmaps/dia_gnome_icon.png \
@@ -71,15 +76,11 @@
%post
touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%clean
@@ -90,20 +91,26 @@
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog KNOWN_BUGS INSTALL NEWS README TODO THANKS doc/custom-shapes doc/diagram.dtd doc/shape.dtd doc/sheet.dtd
%doc samples/
-%{_bindir}/dia
-%{_libdir}/dia
+%{_bindir}/%{name}
+%{_libdir}/%{name}
%{_mandir}/*/*
-%{_datadir}/dia
-%{_datadir}/applications/fedora-dia.desktop
+%{_datadir}/%{name}
+%{_datadir}/applications/fedora-%{name}.desktop
%dir %{_datadir}/gnome
%dir %{_datadir}/gnome/help
-%{_datadir}/gnome/help/dia
+%{_datadir}/gnome/help/%{name}
%dir %{_datadir}/mime-info
%{_datadir}/mime-info/*
%{_datadir}/icons/hicolor/48x48/apps/*.png
%changelog
+* Tue Feb 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-8
+- Upgrade to upstream bugfix release 0.95-1
+- Drop upstreamed ungroup and formatstring patches
+- Add a patch for python-2.5 support
+- Fix exit due to sigpipe when entering an invalid print command (bz 229101)
+
* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-7
- FE6 Rebuild
@@ -280,7 +287,7 @@
* Fri Jun 15 2001 Havoc Penningtoon <hp at redhat.com>
- add some BuildRequires
-* Fri Feb 23 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Fri Feb 23 2001 Trond Eivind Glomsrød <teg at redhat.com>
- langify
- use %%{_tmppath}
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 25 Apr 2006 19:56:20 -0000 1.3
+++ sources 21 Feb 2007 12:07:31 -0000 1.4
@@ -1 +1 @@
-d319921a91d4600df3578a4a64416393 dia-0.95.tar.bz2
+bd4d5bd71b60b9ce11610256534e4d82 dia-0.95-1.tar.bz2
--- dia-0.95-diagram_ungroup_selected_v2.patch DELETED ---
--- dia-0.95-formatstring.patch DELETED ---
- Previous message: rpms/perl-Test-LongString/FC-5 .cvsignore, 1.4, 1.5 perl-Test-LongString.spec, 1.6, 1.7 sources, 1.4, 1.5
- Next message: rpms/dia/FC-6 dia-0.95-sigpipe.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 dia.spec, 1.15, 1.16 sources, 1.3, 1.4 dia-0.95-diagram_ungroup_selected_v2.patch, 1.1, NONE dia-0.95-formatstring.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list