提交: 5d79eaecd60bf60b58c63f42cc753e1eb7815b9d - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修订版: 5d79eaecd60bf60b58c63f42cc753e1eb7815b9d (tree)
• 时间: 2004-04-28 04:01:02
• 作者: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Doc changes, mark version as 0.94-devel

更改概述

• modified: configure.in
• modified: dia.spec
• modified: doc/en/Makefile.am
• modified: doc/en/usage-canvas.xml
• delete: doc/en/{dia-manual.xml => dia.xml}
• modified: doc/pl/Makefile.am
• modified: doc/pl/usage-canvas.xml
• delete: doc/pl/{dia-manual.xml => dia.xml}

差异

--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this -*- autoconf -*- file with autoconf to produce a 
 dnl configure script.
-AC_INIT(dia, 0.93-pre1, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.93-devel, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 

--- a/dia.spec
+++ b/dia.spec
@@ -1,21 +1,25 @@
 %define name dia
 # This is the full Dia version
-%define ver 0.93
+%define ver 0.94
 
 Summary: A gtk+ based diagram creation program.
 Name: %name
 Version: %ver
 # This indicates changes to the spec file after last time %ver has changed.
-Release: pre1
+Release: devel
 Copyright: GPL
 Group: Applications/
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{ver}.tar.gz
-URL: http://www.lysator.liu.se/~alla/dia/dia.html
+URL: http://www.gnome.org/projects/dia/
 BuildRoot: /var/tmp/%{name}-%{ver}-root
 
-Requires: libxml2 >= 2.3.9 gtk2 pango >= 1.1.5 freetype >= 2.0.9
+Requires: libxml2 >= 2.3.9 gtk2 pango >= 1.1.5 freetype2 >= 2.0.9
+Requires: libgnome libgnomeui popt
+Requires: python python-gtk
 BuildRequires: libxml2-devel >= 2.3.9 gtk2-devel pango-devel >= 1.1.5 
-BuildRequires: freetype-devel >= 2.0.9 intltool > 0.21
+BuildRequires: freetype2-devel >= 2.0.9 intltool > 0.21
+BuildRequires: libgnome-devel libgnomeui-devel popt-devel
+BuildRequires: python python-gtk
 
 %description
 Dia is a GNU program designed to be much like the Windows
@@ -26,6 +30,9 @@ 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.
 
 %changelog
+* Mon Mar 29 2004 Lars Clausen <[e-mail]>
+- change url to www.gnome.org, fix freetype2 stuff, add python and gnome
+- dependencies
 * Thu Feb 4 2003 Lars Clausen <[e-mail]>
 - update requirements.
 - update prerelease number, move to release field.
@@ -57,9 +64,9 @@ gzip compressed).  It has print support, and can export to a number of formats s
 unset LINGUAS || :
 
 if [ -x ./configure ]; then
-  CFLAGS=$RPM_OPT_FLAGS ./configure --prefix=%{_prefix} --enable-gnome
+  CFLAGS=$RPM_OPT_FLAGS ./configure --prefix=%{_prefix} --enable-gnome --with-python
 else 
-  CFLAGS=$RPM_OPT_FLAGS ./autogen.sh --prefix=%{_prefix} --enable-gnome
+  CFLAGS=$RPM_OPT_FLAGS ./autogen.sh --prefix=%{_prefix} --enable-gnome --with-python
 fi  
 make
 

--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -1,5 +1,5 @@
 figdir=graphics
-docname=dia-manual
+docname=dia
 lang=en
 omffile=
 entities=
@@ -9,7 +9,7 @@ dist-hook: app-dist-hook
 
 EXTRA_DIST += \
 	dia.1 \
-	dia-manual.xml \
+	dia.xml \
 	graphics/line_props.png \
 	graphics/home_network.png \
 	graphics/line_icon.png \

--- a/doc/en/dia-manual.xml
+++ b/doc/en/dia.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.93-pre1">
+    <!ENTITY VERSION "0.94-devel">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/en/usage-canvas.xml
+++ b/doc/en/usage-canvas.xml
@@ -82,6 +82,6 @@
 
 <!--
 Local Variables:
-sgml-parent-document: "dia-manual.sgml"
+sgml-parent-document: "dia.xml"
 End:
 -->

--- a/doc/pl/Makefile.am
+++ b/doc/pl/Makefile.am
@@ -1,5 +1,5 @@
 figdir=graphics
-docname=dia-manual
+docname=dia
 lang=pl
 omffile=
 entities=
@@ -8,7 +8,7 @@ include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
 EXTRA_DIST += \
-	dia-manual.xml \
+	dia.xml \
 	graphics/line_props.png \
 	graphics/home_network.png \
 	graphics/greendots.png

--- a/doc/pl/dia-manual.xml
+++ b/doc/pl/dia.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"[
-<!ENTITY VERSION "0.93-pre1">
+<!ENTITY VERSION "0.94-devel">
 <!ENTITY INTRODUCTION SYSTEM "intro.sgml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.sgml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.sgml">

--- a/doc/pl/usage-canvas.xml
+++ b/doc/pl/usage-canvas.xml
@@ -82,6 +82,6 @@
 
 <!--
 Local Variables:
-sgml-parent-document: "dia-manual.sgml"
+sgml-parent-document: "dia.xml"
 End:
 -->