.gear/rules | 2 + .../tags/bab8914bda5a8dd70d98cbd140fcc0f34571d0d4 | 6 + .gear/tags/list | 1 + acinclude.m4 | 6 +- dia.spec | 351 ++++++++++++++++++++ doc/Makefile.am | 2 +- doc/en/Makefile.am | 4 - 7 files changed, 364 insertions(+), 8 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..ba43a74 --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: DIA_0_97:. +diff: DIA_0_97:. . diff --git a/.gear/tags/bab8914bda5a8dd70d98cbd140fcc0f34571d0d4 b/.gear/tags/bab8914bda5a8dd70d98cbd140fcc0f34571d0d4 new file mode 100644 index 0000000..ec94d30 --- /dev/null +++ b/.gear/tags/bab8914bda5a8dd70d98cbd140fcc0f34571d0d4 @@ -0,0 +1,6 @@ +object c0bd0066adc968b29edb8e34cb1f2ddcee93faff +type commit +tag DIA_0_97 +tagger Hans Breuer 1241376779 +0200 + +Release dia-0.97 diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..98fc631 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +bab8914bda5a8dd70d98cbd140fcc0f34571d0d4 DIA_0_97 diff --git a/acinclude.m4 b/acinclude.m4 index 57a2188..9355345 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -223,9 +223,9 @@ AC_DEFUN([AM_CHECK_PYTHON_LIB], [AC_REQUIRE([AM_PATH_PYTHON]) AC_REQUIRE([AM_CHECK_PYTHON_HEADERS]) -AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a) +AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.so) -py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config" +py_config_dir="${libdir}/python${PYTHON_VERSION}/config" py_makefile="${py_config_dir}/Makefile" if test -f "$py_makefile"; then @@ -235,7 +235,7 @@ dnl extra required libs py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile` dnl now the actual libpython - if test -e "${py_config_dir}/libpython${PYTHON_VERSION}.a"; then + if test -e "${libdir}/libpython${PYTHON_VERSION}.so"; then PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs" AC_MSG_RESULT(found) else diff --git a/dia.spec b/dia.spec new file mode 100644 index 0000000..6acb3fe --- /dev/null +++ b/dia.spec @@ -0,0 +1,351 @@ +Name: dia +Version: 0.97 +Release: alt2 + +Summary: A gtk+ based diagram creation program +Summary(ru_RU.UTF-8): Программа для создания диаграмм, основанная на GTK+ + +License: GPL +Group: Office +Url: http://www.gnome.org/projects/dia + +Packager: Valery Inozemtsev + +%py_provides dia +Obsoletes: %name-gnome %name-python + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires: dblatex docbook-style-xsl docbook-utils gcc-c++ intltool libart_lgpl-devel libgtk+2-devel libxslt-devel +BuildRequires: python-devel python-module-PyXML python-module-pygtk python-modules-email python-modules-encodings xsltproc + + +%description +Dia is a GNU program designed to be much like the Windows +program 'Visio'. It can be used to draw different kind of diagrams. + +It can be used to draw a variety of diagram types, including UML, Network, +flowchart and others. The native file format for Dia is XML (optionally +gzip compressed). It has print support, and can export to a number of +formats such as EPS, SVG, CGM and PNG. + +%description -l ru_RU.UTF-8 +Программа Dia разработана как альтернатива Visio для Windows(TM). Dia +можно использовать для рисования различных типов диаграмм, она +включает поддержку структурных статических диаграмм UML (диаграмм +классов), моделирование отношений объектов и сетевых диаграмм. Dia +может загружать и сохранять диаграммы в собственном формате и в +формате .xml, а также экспортировать их в различные форматы, такие как +PostScript(TM), SVG, CGM или PNG. + +%add_findprov_lib_path %_libdir/%name + +%prep +%setup -q +%patch -p1 + +install -m644 data/icons/48x48/apps/%name.png app/pixmaps/%name-app.png + +%build +intltoolize --force +%autoreconf +%configure \ + --enable-db2html \ + --with-hardbooks \ + --with-python \ + --disable-gnome \ + --disable-static +%make_build + +%install +%make DESTDIR=%buildroot install + +%find_lang %name + +%files -f %name.lang +%doc README TODO NEWS AUTHORS +%_bindir/%name +%dir %_libdir/%name +%_libdir/%name/*.so +%_datadir/%name +%_datadir/mime-info/* +%_desktopdir/*.desktop +%_iconsdir/hicolor/*/apps/%name.* +%_man1dir/* + +%changelog +* Sun May 03 2009 Valery Inozemtsev 0.97-alt2 +- 0.97 release + +* Mon Apr 20 2009 Valery Inozemtsev 0.97-alt1.pre3 +- 0.97 pre3 + +* Mon Mar 30 2009 Valery Inozemtsev 0.97-alt1.pre2 +- 0.97 pre2 + +* Fri Dec 28 2007 Valery Inozemtsev 0.96.1-alt3 +- fixed build with new auto* + +* Sun Jul 15 2007 Valery Inozemtsev 0.96.1-alt2 +- build help (close #5807) + +* Sat Mar 31 2007 Valery Inozemtsev 0.96.1-alt1 +- 0.96.1 + +* Wed Mar 28 2007 Valery Inozemtsev 0.96-alt1 +- 0.96 release + +* Thu Mar 22 2007 Valery Inozemtsev 0.96-alt0.0pre9 +- 0.96-pre9 + +* Sat Mar 17 2007 Valery Inozemtsev 0.96-alt0.0pre8 +- 0.96-pre8 + +* Sun Jan 14 2007 Valery Inozemtsev 0.96-alt0.0pre1 +- 0.96-pre1 + +* Tue Aug 15 2006 Valery Inozemtsev 0.95-alt0.1cvs20060813 +- CVS snapshot 2006-08-13 +- spec cleanup + +* Mon May 29 2006 Vitaly Lipatov 0.95-alt0.1cvs20060514 +- CVS snapshot +- fix Source URL +- disable translations + +* Sat Apr 08 2006 Vitaly Lipatov 0.95-alt0.1cvs20060408 +- CVS snapshot about dia 0.9.5pre8 + +* Tue Feb 21 2006 Vitaly Lipatov 0.94-alt13cvs20051206 +- CVS snapshot about dia 0.9.5pre4 +- update ALT patch +- remove INSTALL + +* Tue Dec 06 2005 Vitaly Lipatov 0.94-alt12cvs20051206 +- new CVS snapshot +- some spec changes + +* Mon Oct 03 2005 Vitaly Lipatov 0.94-alt12cvs20051003 +- new CVS snapshot (fixes some segfaults) +- change russian description (get from PLD :)) +- add autotest after build (disabled by default) +- Note: http://bugzilla.gnome.org/show_bug.cgi?id=317637 is not fixed yet? + +* Tue Sep 06 2005 Vitaly Lipatov 0.94-alt11cvs20050825 +- change %_libdir to %_libdir +- hack SegFault: mark danger places where object is undefined +- change autosave time to every 1 minute + +* Mon Aug 29 2005 Vitaly Lipatov 0.94-alt10cvs20050825 +- fix bug #7774 +- fix broken export via GUI dialog +- move scrollkeeper to -gnome package + +* Thu Aug 25 2005 Vitaly Lipatov 0.94-alt9cvs20050825 +- new CVS snapshot + +* Mon Aug 01 2005 Vitaly Lipatov 0.94-alt9cvs20050730 +- new CVS snapshot +- fix bug #7075 (broken eps export in non C locale) +- move to dia-gnome some libs linked with gnome + +* Fri Jul 08 2005 Vitaly Lipatov 0.94-alt8cvs20050313.1 +- x86_64 support from mouse@ (fix bug# 7266) + +* Mon Mar 21 2005 Vitaly Lipatov 0.94-alt8cvs20050313 +- add buildrequire for python version 2.4 + +* Sun Mar 20 2005 Vitaly Lipatov 0.94-alt7cvs20050313 +- fix SegFault during exit (thanks crux@) +- build with python 2.4 + +* Sun Mar 13 2005 Vitaly Lipatov 0.94-alt6cvs20050313 +- fix bug #2441 (there is new problem with SigFault during exit :( ) + +* Sun Feb 06 2005 Vitaly Lipatov 0.94-alt5cvs20050205 +- CVS version (really only from this build) +- patch for filename encoding issues + +* Fri Dec 31 2004 Vitaly Lipatov 0.94-alt4 +- fix spec for libdia.so is gtk only compiled + +* Sun Dec 26 2004 Vitaly Lipatov 0.94-alt3 +- disable GNOME build for main dia package +- add dia-gnome package (with all GNOME dependenses) + +* Tue Nov 30 2004 Vitaly Lipatov 0.94-alt2 +- disable python support due libpython2.3a missing +- spec file comformed to GNOME program packaging policy +- add patch for encoding issues + +* Thu Sep 02 2004 Vitaly Lipatov 0.94-alt1 +- release +- remove old patches (upstreamed) +- fixed bug #4938 + +* Fri Jul 23 2004 Vitaly Lipatov 0.94-alt0.3pre2 +- new version (pre2) +- update ru.po +- add patch for fix filedialog's encoding issues + +* Sun Jun 20 2004 Vitaly Lipatov 0.93-alt3 +- add patch for fix batch mode (bug #2441) +- add patch for recoding console messages + +* Sat May 29 2004 Vitaly Lipatov 0.93-alt2 +- change URL (Dia page moved to gnome.org) +- update ru.po +- remove oaf-slay from pre script + +* Thu May 20 2004 Vitaly Lipatov 0.93-alt1 +- new version +- remove COPYING from doc + +* Sun Jan 04 2004 Vitaly Lipatov 0.92-alt2 +- add gcc-c++ in requires +- rebuild with gcc 3.3 + +* Fri Oct 24 2003 Vitaly Lipatov 0.92-alt1 +- release of 0.92 + +* Wed Sep 24 2003 Vitaly Lipatov 0.92-alt0.2pre +- new version + +* Tue Apr 01 2003 Vitaly Lipatov 0.91-alt2 +- remove incorrect stylesheets.xml before build +- remove .so loading from xslt plug-in + +* Tue Mar 18 2003 Vitaly Lipatov 0.91-alt1 +- new version (Gnome2) +- ru.po update + +* Thu Jan 30 2003 Vitaly Lipatov 0.90-alt6 +- build without python support via pygtk2 problems (bug #2052) +- buildrequires update + +* Mon Jan 06 2003 Vitaly Lipatov 0.90-alt5 +- moved to Office/Graphs menu group +- add genericname +- built with python again + +* Thu Nov 14 2002 AEN 0.90-alt4 +- rebuilt in curent environment w/o python + +* Mon Oct 28 2002 Vitaly Lipatov 0.90-alt3 +- spec cleanup +- ru.po update +- tested with gcc-3.2 + +* Sun Jun 04 2002 Vitaly Lipatov 0.90-alt2 +- ru.po update +- spec cleaned +- patch for old russian files detected +- NB! old files are not supported for libxml1 problem + +* Mon Jun 03 2002 AEN 0.90-alt1 +- new version +- fonts patch updated + +* Wed Mar 13 2002 AEN 0.88.1-alt6 +- crash in meny tools fixed + +* Tue Jan 29 2002 AEN 0.88.1-alt5 +- rebuilt with python-2.2. + +* Fri Dec 27 2001 AEN 0.88.1-alt4 +- builtwith python +- mdk patches + +* Thu Oct 11 2001 AEN 0.88.1-alt3 +- rebuilt with libpng.so.3 +- PreReq: oaf + +* Wed May 22 2001 AEN 0.88.1-alt2 +- restore conv patch + +* Wed May 22 2001 AEN 0.88.1-alt1 +- new version + +* Mon May 14 2001 AEN 0.88-alt1 +- new version +- printing fixed + +* Wed Feb 28 2001 AEN 0.86-ipl6mdk +- rebuild with new libraries + +* Sat Jan 20 2001 AEN +- add missing files + +* Sat Jan 13 2001 AEN +- RE adaptation +- new fonts patch + +* Thu Oct 26 2000 Renaud Chaillat 0.86-3mdk +- recompiled with gnome-print 0.24 + +* Thu Sep 7 2000 Vincent Saugey 0.86-2mdk +- Adding many icons on various format + +* Mon Aug 7 2000 Vincent Saugey 0.86-1mdk +- Up to 0.86 + +* Tue Jul 25 2000 Geoffrey Lee 0.85-2mdk +- macroszification +- rebuild for BM + +* Fri May 19 2000 Chmouel Boudjnah 0.85-1mdk +- Up to 0.85 + +* Mon May 15 2000 Pixel 0.84-6mdk +- add buildrequires libxml + +* Fri May 5 2000 Vincent Saugey 0.84-5mdk +- Remove locale to prevent crash + +* Fri Apr 28 2000 Vincent Saugey 0.84-4mdk +- Add dependencie to ISO font + +* Mon Apr 17 2000 Vincent Saugey 0.84-3mdk +- Corrected group +- Add icon + +* Mon Mar 27 2000 Vincent Saugey 0.84-2mdk +- add menu + +* Mon Mar 07 2000 Vincent Saugey 0.84-1mdk +- v0.84 + +* Mon Jan 03 2000 Lenny Cartier +- v0.83 +- used srpm provided by Gwenael Letellier + +* Mon Dec 20 1999 Lenny Cartier + +- bz2 archive + +* Fri Dec 17 1999 Frederic Lepied + +- 0.82 +- first mandrake version. + +* Sun Oct 17 1999 Miles Lott + +- Build for 0.80 +- added version string to setup line + +* Sun Sep 05 1999 James Henstridge + +- added $(prefix)/share/dia to files list. + +* Thu Apr 29 1999 Enrico Scholz + +- Made %%setup quiet +- Enabled build from cvs +- Removed superfluous mkdir's +- using DESTDIR and install-strip + +* Fri Aug 28 1998 Francis J. Lacoste + +- First RPM release. + diff --git a/doc/Makefile.am b/doc/Makefile.am index 3d5a093..cef4ba0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ docname = dia -SUBDIRS = en fr eu pl +SUBDIRS = en EXTRA_DIST = \ custom-shapes \ diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index 8730f7b..fa12473 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -142,10 +142,6 @@ pngfigures = \ graphics/zigzagline-rightclick.png -epsfigures = \ - ps/graphics/color_selector.eps \ - ps/graphics/preferences_fig.eps - htmlstyle = \ html.xsl