rpms/dia/F-7 dia-0.96.1-64bit.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 dia.spec, 1.18, 1.19 sources, 1.5, 1.6 dia-0.95-python-2.5.patch, 1.1, NONE dia-0.95-sigpipe.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13864

Modified Files:
	.cvsignore dia.spec sources 
Added Files:
	dia-0.96.1-64bit.patch 
Removed Files:
	dia-0.95-python-2.5.patch dia-0.95-sigpipe.patch 
Log Message:
* Sat Jun  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.96.1-1
- New upstream release 0.96.1
- Add yelp Requires so that the help will always work (bz 243330)


dia-0.96.1-64bit.patch:

--- NEW FILE dia-0.96.1-64bit.patch ---
--- 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 <config.h>
 
+/* so we get fdopen declared even when compiling with -ansi */
+#define _POSIX_C_SOURCE 2
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dia/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Mar 2007 12:39:26 -0000	1.5
+++ .cvsignore	9 Jun 2007 08:25:27 -0000	1.6
@@ -1 +1 @@
-dia-0.96.tar.bz2
+dia-0.96.1.tar.bz2


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/F-7/dia.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dia.spec	1 Apr 2007 11:24:27 -0000	1.18
+++ dia.spec	9 Jun 2007 08:25:27 -0000	1.19
@@ -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 @@
 %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 @@
 
 
 %changelog
+* Sat Jun  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 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 <j.w.r.degoede at hhs.nl> 1:0.96-1
 - New upstream release 0.96
 - Drop upstreamed python-25 and sigpipe patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dia/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Mar 2007 12:39:26 -0000	1.5
+++ sources	9 Jun 2007 08:25:27 -0000	1.6
@@ -1 +1 @@
-0c173dd5f46672efb77952ecbd884bfd  dia-0.96.tar.bz2
+7b81b22baa2df55efe4845865dddc7b6  dia-0.96.1.tar.bz2


--- dia-0.95-python-2.5.patch DELETED ---


--- dia-0.95-sigpipe.patch DELETED ---