- updated to 0.95 (following AC-branch; fixes CVE-2006-1550)

- removed obsolete locale_names patch

Changed files:
    dia.spec -> 1.121

diff --git a/dia.spec b/dia.spec
index 01bc6c979ad45b7e3b33d0ed072ff85c97270600..4133a1f9c0ec3c974c1a9e487a530626554c96c7 100644 (file)
--- a/dia.spec
+++ b/dia.spec
@@ -1,9 +1,3 @@
-# TODO
-# - CVE-2006-1550   http://security.gentoo.org/glsa/glsa-200604-14.xml
-
-#%%define      snap    20030908.0723
-%define                pre             pre3
-
 Summary:       Dia - a GTK+ based diagram creation program
 Summary(es):   Programa para dibujo de diagramas
 Summary(pl):   Dia - program do tworzenia diagramów
@@ -12,38 +6,39 @@ Summary(ru): 
 Summary(uk):   ðÒÏÇÒÁÍÁ ÄÌÑ ÍÁÌÀ×ÁÎÎÑ Ä¦ÁÇÒÁÍ
 Summary(zh_CN):        »ùÓÚGTK+µÄÁ÷³Ìͼ³ÌÐò
 Name:          dia
-Version:       0.94
-Release:       8
+Version:       0.95
+Release:       1
 Epoch:         1
 License:       GPL
 Group:         X11/Applications/Graphics
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/dia/0.94/%{name}-%{version}.tar.bz2
-# Source0-md5: 63584224912dab49fed8d2cf87ea2d85
-## this only for snapshots
-##Source0:     http://www.crans.org/~chepelov/dia/snapshots/%{name}-CVS-%(echo %{snap} | tr . -).tar.gz
-#Patch0:       %{name}-state.patch
-#Patch1:       %{name}-home_etc.patch
-Patch2:                %{name}-locale-names.patch
-Patch3:                %{name}-python.patch
-Patch4:                %{name}-desktop.patch
-Patch5:                %{name}-gcc4.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/dia/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: d319921a91d4600df3578a4a64416393
+Patch0:                %{name}-python.patch
+Patch1:                %{name}-desktop.patch
+Patch2:                %{name}-gcc4.patch
 URL:           http://www.gnome.org/projects/dia/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
+BuildRequires: docbook-utils
 BuildRequires: gettext-devel
-BuildRequires: howl-devel >= 0.9.10
+BuildRequires: gtk+2-devel >= 2:2.6.0
 BuildRequires: intltool >= 0.21
-BuildRequires: libart_lgpl-devel
+BuildRequires: libart_lgpl-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0.0
 BuildRequires: libpng-devel
-BuildRequires: libtool
+BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:1.5
 BuildRequires: libxml2-devel >= 2.3.9
 BuildRequires: libxslt-devel
+BuildRequires: libxslt-progs
+BuildRequires: pkgconfig
 BuildRequires: popt-devel
+BuildRequires: python-PyXML
 BuildRequires: python-devel >= 1:2.3
 BuildRequires: python-pygtk-devel
+BuildRequires: rpm-pythonprov
 Requires(post,postun): desktop-file-utils
-Requires:      python-modules >= 2.3
+Requires:      python-modules >= 1:2.3
 Requires:      python-pygtk-gtk
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -96,14 +91,9 @@ PostScript(TM).
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1 - obsoleted?
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-mv po/{no,nb}.po
+%patch0 -p1
+%patch1 -p1
+#%patch2 -p1 -- needs check
 
 %build
 %{__libtoolize}