rpms/dia/devel .cvsignore, NONE, 1.1 dia-0.92.2-dtd.patch, NONE, 1.1 dia-0.94-fallbacktoxpmicons.patch, NONE, 1.1 dia-0.94-gcc4.patch, NONE, 1.1 dia-0.94-help.patch, NONE, 1.1 dia-0.94-rh165337.patch, NONE, 1.1 dia-0.94-svgimport-fix.patch, NONE, 1.1 dia.spec, NONE, 1.1 sources, NONE, 1.1
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Mon Oct 17 10:54:41 UTC 2005
Author: caolanm
Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4489
Added Files:
.cvsignore dia-0.92.2-dtd.patch
dia-0.94-fallbacktoxpmicons.patch dia-0.94-gcc4.patch
dia-0.94-help.patch dia-0.94-rh165337.patch
dia-0.94-svgimport-fix.patch dia.spec sources
Log Message:
initial version
--- NEW FILE .cvsignore ---
dia-0.94.tar.bz2
dia-0.92.2-dtd.patch:
--- NEW FILE dia-0.92.2-dtd.patch ---
--- dia-0.92.2/doc/en/dia.xml.dtdfix 2003-12-10 14:15:20.000000000 +0100
+++ dia-0.92.2/doc/en/dia.xml 2003-12-10 14:21:04.000000000 +0100
@@ -4,7 +4,7 @@
<!DOCTYPE book
- PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"
+ PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
[
dia-0.94-fallbacktoxpmicons.patch:
--- NEW FILE dia-0.94-fallbacktoxpmicons.patch ---
--- dia-0.94/app/interface.c.orit 2005-03-10 08:29:36.000000000 +0000
+++ dia-0.94/app/interface.c 2005-03-10 08:30:44.000000000 +0000
@@ -877,6 +877,17 @@
GError* gerror = NULL;
pixbuf = gdk_pixbuf_new_from_file(sheet_obj->pixmap_file, &gerror);
+ if (pixbuf == NULL) {
+ int len = strlen(sheet_obj->pixmap_file);
+ if ((len > 4) && !strcmp(sheet_obj->pixmap_file+len-4, ".png"))
+ {
+ GError* gerrortwo = NULL;
+ strcpy(sheet_obj->pixmap_file+len-4, ".xpm");
+ pixbuf = gdk_pixbuf_new_from_file(sheet_obj->pixmap_file, &gerrortwo);
+ if (gerrortwo) g_error_free (gerrortwo);
+ }
+ }
+
if (pixbuf != NULL) {
gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, &mask, 1.0);
gdk_pixbuf_unref(pixbuf);
@@ -885,6 +896,7 @@
g_warning("failed to load pixbuf for file %s; cause=%s",
sheet_obj->pixmap_file,gerror?gerror->message:"[NULL]");
}
+ if (gerror) g_error_free (gerror);
} else {
DiaObjectType *type;
type = object_get_type(sheet_obj->object_type);
dia-0.94-gcc4.patch:
--- NEW FILE dia-0.94-gcc4.patch ---
--- dia-0.94/objects/custom/shape_info.h.orig 2005-03-02 20:24:14.032831627 +0000
+++ dia-0.94/objects/custom/shape_info.h 2005-03-02 20:24:22.465555597 +0000
@@ -166,7 +166,6 @@
void shape_info_realise(ShapeInfo* info);
void shape_info_print(ShapeInfo *info);
-void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle *s);
/*MC 11/03 handy g_new0 variant for struct with variable size */
#define g_new0_ext(struct_type, ext_size) \
dia-0.94-help.patch:
--- NEW FILE dia-0.94-help.patch ---
--- dia-0.94/app/commands.c.help 2004-08-16 03:56:03.000000000 -0400
+++ dia-0.94/app/commands.c 2004-09-03 10:29:38.315355000 -0400
@@ -524,7 +524,7 @@
const char *dentry;
GError *error = NULL;
- helpdir = dia_get_data_directory("help");
+ helpdir = g_strdup ("/usr/share/gnome/help/dia");
if (!helpdir) {
message_warning(_("Could not find help directory"));
return;
@@ -552,11 +552,11 @@
G_DIR_SEPARATOR_S "dia-manual.chm", NULL);
if (!g_file_test(helpindex, G_FILE_TEST_EXISTS)) {
helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
- G_DIR_SEPARATOR_S "index.html", NULL);
+ G_DIR_SEPARATOR_S "dia.xml", NULL);
}
#else
helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
- G_DIR_SEPARATOR_S "index.html", NULL);
+ G_DIR_SEPARATOR_S "dia.xml", NULL);
#endif
bestscore = score;
}
@@ -573,7 +573,7 @@
ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL);
#else
command = getenv("BROWSER");
- command = g_strdup_printf("%s 'file://%s' &", command ? command : "netscape", helpindex);
+ command = g_strdup_printf("%s '%s' &", command ? command : "yelp", helpindex);
system(command);
g_free(command);
#endif
--- dia-0.94/doc/en/Makefile.am.help 2004-08-16 03:56:07.000000000 -0400
+++ dia-0.94/doc/en/Makefile.am 2004-09-03 09:54:36.957260000 -0400
@@ -2,16 +2,8 @@
docname=dia
lang=en
omffile=
-entities=
-
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
-
-EXTRA_DIST += \
- dia.1 \
- dia.dbk \
+entities= \
authors.xml \
- dia.xml \
entities.xml \
intro.xml \
license.xml \
@@ -23,7 +15,15 @@
usage-objects-selecting.xml \
usage-objects-special.xml \
usage-objects.xml \
- usage-quickstart.xml \
+ usage-quickstart.xml
+
+include $(top_srcdir)/xmldocs.make
+dist-hook: app-dist-hook
+
+EXTRA_DIST += \
+ dia.1 \
+ dia.dbk \
+ dia.xml \
graphics/line_props.png \
graphics/home_network.png \
graphics/line_icon.png \
--- dia-0.94/doc/en/dia.xml.help 2004-09-03 09:54:36.923294000 -0400
+++ dia-0.94/doc/en/dia.xml 2004-09-03 09:54:36.963253000 -0400
@@ -5,7 +5,7 @@
<!DOCTYPE book
PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[
<!ENTITY VERSION "0.94">
dia-0.94-rh165337.patch:
--- NEW FILE dia-0.94-rh165337.patch ---
--- dia-0.94.orig/app/display.c 2005-08-08 13:34:02.000000000 +0100
+++ dia-0.94/app/display.c 2005-08-08 13:31:29.000000000 +0100
@@ -71,7 +71,7 @@
update_zoom_status(DDisplay *ddisp)
{
GtkWidget *zoomcombo;
- gchar zoom_text[7];
+ gchar zoom_text[8];
zoomcombo = ddisp->zoom_status;
sprintf (zoom_text, "%.1f%%",
dia-0.94-svgimport-fix.patch:
--- NEW FILE dia-0.94-svgimport-fix.patch ---
--- dia-0.94-pre6/plug-ins/svg/svg-import.c.fix 2004-08-18 13:40:04.708925898 -0400
+++ dia-0.94-pre6/plug-ins/svg/svg-import.c 2004-08-18 13:40:31.827386707 -0400
@@ -554,6 +554,8 @@
ptprop = g_ptr_array_index(props,0);
ptprop->point_data = start;
+ end.x = start.x + width;
+ end.y = start.y + height;
ptprop = g_ptr_array_index(props,1);
ptprop->point_data = end;
--- NEW FILE dia.spec ---
%define pango_version 1.1.5
%define freetype_version 2.0.9
%define libxml2_version 2.3.9
Name: dia
Summary: A diagram drawing program.
Version: 0.94
Release: 14
Epoch: 1
Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
Group: Applications/Multimedia
License: GPL
URL: http://www.lysator.liu.se/~alla/dia/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: libxml2 >= %{libxml2_version}, pango >= %{pango_version}
Requires: glib2, gtk2, libgnome, libgnomeui, libart_lgpl, libxslt
Requires: scrollkeeper, freetype >= %{freetype_version}
Requires: /usr/share/desktop-menu-patches/redhat-diagrams.desktop
Prereq: /usr/bin/scrollkeeper-update
BuildRequires: libxml2-devel >= %{libxml2_version}, intltool > 0.21
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: freetype-devel >= %{freetype_version}
BuildRequires: glib2-devel, gtk2-devel, libgnome-devel, libgnomeui-devel
BuildRequires: docbook-utils docbook-dtds docbook-style-dsssl docbook-style-xsl
BuildRequires: openjade, libpng-devel, automake17, libart_lgpl-devel,
BuildRequires: libxslt-devel
Patch0: dia-0.94-svgimport-fix.patch
Patch1: dia-0.92.2-dtd.patch
Patch2: dia-0.94-help.patch
Patch3: dia-0.94-gcc4.patch
Patch4: dia-0.94-fallbacktoxpmicons.patch
Patch5: dia-0.94-rh165337.patch
%description
The Dia drawing program is designed to be like the Windows(TM) Visio
program. Dia can be used to draw different types of diagrams, and
includes support for UML static structure diagrams (class diagrams),
entity relationship modeling, and network diagrams. Dia can load and
save diagrams to a custom file format, can load and save in .xml format,
and can export to PostScript(TM).
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .svgimportfix
%patch1 -p1 -b .dtd
%patch2 -p1 -b .help
%patch3 -p1 -b .gcc4
%patch4 -p1 -b .fallbacktoxpmicons
%patch5 -p1 -b .rh165337
%build
aclocal-1.7
libtoolize --force
automake-1.7
DB2HTML="/usr/bin/db2html -V '%%use-id-as-filename%%'"
export DB2HTML
autoconf
%configure --enable-gnome --enable-db2html --with-cairo=no
## XXXX PGB - work around compiler bug
#perl -pi -e "s|-O2||g" plug-ins/hpgl/Makefile
CFLAGS=$RPM_OPT_FLAGS make
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
# We use a symlink to the desktop-menu-patches file instead.
#desktop-file-install --vendor net --delete-original \
# --dir $RPM_BUILD_ROOT%{_datadir}/applications \
# --add-category X-Red-Hat-Extra \
# --add-category Office \
# $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/dia.desktop
rm $RPM_BUILD_ROOT%{_datadir}/applications/dia.desktop
# replace desktop file for -Base case
ln -sf %{_datadir}/desktop-menu-patches/redhat-diagrams.desktop $RPM_BUILD_ROOT%{_datadir}/applications/redhat-diagrams.desktop
# remove scrollkeeper stuff we don't include in the package
rm -rf $RPM_BUILD_ROOT/var
%find_lang %name
# 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*
%post
scrollkeeper-update
%postun
scrollkeeper-update
%clean
rm -fr $RPM_BUILD_ROOT
%files -f %{name}.lang
%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
%{_mandir}/*/*
%{_datadir}/dia
%{_datadir}/applications
%{_datadir}/gnome/help/dia
%{_datadir}/mime-info/*
%{_datadir}/pixmaps/*
%changelog
* Mon Oct 17 2005 Caolan McNamara <caolanm at redhat.com>
- move to extras
* Tue Apr 16 2005 Caolan McNamara <caolanm at redhat.com>
- rebuild for new cairo soname
* Mon Apr 8 2005 Caolan McNamara <caolanm at redhat.com>
- rh#165337# crash on >= 1000% xoom
* Thu Apr 7 2005 Caolan McNamara <caolanm at redhat.com>
- rh#154087# non existing links
* Fri Mar 25 2005 Florian La Roche <laroche at redhat.com>
- add PreReq: for scrollkeeper-update
* Wed Mar 16 2005 Caolan McNamara <caolanm at redhat.com>
- rh#151207# add Requires
* Mon Mar 14 2005 Caolan McNamara <caolanm at redhat.com>
- rh#150942# add BuildRequires
* Wed Mar 9 2005 Caolan McNamara <caolanm at redhat.com>
- rh#150305# add dia-0.94-fallbacktoxpmicons.patch
* Wed Mar 2 2005 Caolan McNamara <caolanm at redhat.com>
- rebuild with gcc4
- gnome#169019# gcc4 patch
* Fri Sep 03 2004 Matthias Clasen <mclasen at redhat.com>
- Fix a problem with the help patch
* Fri Sep 03 2004 Matthias Clasen <mclasen at redhat.com>
- Update to final 0.94 tarball
- Make the help button work (#131622)
* Wed Aug 18 2004 Dan Williams <dcbw at redhat.com>
- Update to 0.94-pre6
- Fix RH #110738
* Thu Jul 22 2004 Dan Williams <dcbw at redhat.com>
- Update to 0.94-pre1
- Add BuildRequires: libpng-devel (RH #125287)
* Fri Jun 25 2004 Dan Williams <dcbw at redhat.com>
- Update to 0.93
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Tue Feb 24 2004 Alexander Larsson <alexl at redhat.com> 1:0.92.2-3
- fix freetype issue
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Tue Dec 9 2003 Alexander Larsson <alexl at redhat.com> 1:0.92.2-1
- update to 0.92.2
* Mon Oct 13 2003 Alexander Larsson <alexl at redhat.com> 1:0.91-2
- Fix font size (backport from cvs). Fixes bug #106045
- Fix libxslt issue (bug #106863)
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed May 28 2003 Alexander Larsson <alexl at redhat.com> 1:0.91-1
- Update to 0.91
- Remove printing patch, it doesn't nearly apply yet, and might
not be needed since dia is all utf8:y now.
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Fri Jan 10 2003 Alexander Larsson <alexl at redhat.com> 0.90-9
- Remove duplicate desktop files
* Fri Dec 6 2002 Havoc Pennington <hp at redhat.com>
- rebuild
* Tue Sep 03 2002 Akira TAGOH <tagoh at redhat.com> 0.90-8
- dia-0.90-printing.patch: applied to support CJK printing. (#67733)
* Thu Aug 29 2002 Owen Taylor <otaylor at redhat.com>
- Fix problems with the manual DTD
* Wed Aug 28 2002 Owen Taylor <otaylor at redhat.com>
- Pass --enable-db2html to configure so we get docs
* Fri Aug 23 2002 Alexander Larsson <alexl at redhat.com> 0.90-6
- Made desktopfile symlink absolute, fixes #71991
* Tue Aug 13 2002 Havoc Pennington <hp at redhat.com>
- remove libpng10 patches, now using libpng12, #71416
* Mon Jul 29 2002 Havoc Pennington <hp at redhat.com>
- put pristine upstream tarball back
- fix up desktop files
* Tue Jul 23 2002 Karsten Hopp <karsten at redhat.de>
- fix menu entry (#69564)
* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Tue Jun 11 2002 root <alexl at redhat.com> 0.90-1
- Updated to 0.90 from upstream. Removed outdated patches, updated png10 patch.
* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Wed Jan 30 2002 Bill Nottingham <notting at redhat.com>
- rebuild against png10
* Thu Jan 24 2002 Havoc Pennington <hp at redhat.com>
- rebuild in rawhide
* Thu Jul 19 2001 Havoc Penningtoon <hp at redhat.com>
- Add some more build requires, #44732
* Tue Jul 10 2001 Alexander Larsson <alexl at redhat.com>
- Disable doc generation, since it breaks.
* Mon Jul 9 2001 Alexander Larsson <alexl at redhat.com>
- Updated from upstream (0.88.1)
- Removed source1 (ja.po) since it was in upstream
- Disabled patch1 since it breaks 8bit non-multibyte locales.
- Updated patch 3
* 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>
- langify
- use %%{_tmppath}
* Fri Feb 09 2001 Akira TAGOH <tagoh at redhat.com>
- -2
- Fixed install po.
- Updated Japanese translation.
Note: Please remove Source1: when release the next upstream version.
- Added Japanese patch.
- -3
- Fixed text render bug.
* Mon Jan 29 2001 Preston Brown <pbrown at redhat.com>
- upgraded to fix i18n issues (#24875)
* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
- Up Epoch and release
* Fri Aug 04 2000 Havoc Pennington <hp at redhat.com>
- Whatever, 15321 was already fixed (it's under plain Applications),
change the group back
* Fri Aug 04 2000 Havoc Pennington <hp at redhat.com>
- Put it in Applications/Graphics bug 15321
* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild
* Tue Jun 6 2000 Tim Powers <timp at redhat.com>
- fixed manpage location
- use %%makinstall
* Mon May 1 2000 Matt Wilson <msw at redhat.com>
- updates to 0.84, added alpha back in
* Mon Nov 8 1999 Tim Powers <timp at redhat.com>
- updated to 0.81
* Mon Aug 30 1999 Tim Powers <timp at redhat.com>
- changed group
* Tue Aug 17 1999 Tim Powers <timp at redhat.com>
- exludearch alpha dumps core when you do anything
* Mon Jul 12 1999 Tim Powers <timp at redhat.com>
- rebuilt for 6.1
* Wed Apr 28 1999 Preston Brown <pbrown at redhat.com>
- initial build for Powertools 6.0
--- NEW FILE sources ---
63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2
More information about the fedora-extras-commits
mailing list