X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dia.spec;h=3431e52a4db8064157548f28d502b55cf0b2e499;hb=de74c1092baea2082cee452f2a43ba8aa514fbd7;hp=2cdc847f0232d29c5831894580919d72e089500b;hpb=91a0bfb19c66ba181e97a2680f81f24e469f9b30;p=packages%2Fdia.git

diff --git a/dia.spec b/dia.spec
index 2cdc847..3431e52 100644
--- a/dia.spec
+++ b/dia.spec
@@ -1,31 +1,49 @@
 
-%define pre pre3
+#%%define	snap	20030908.0723
+%define		pre		pre3
 
-Summary:	Dia - a gtk+ based diagram creation program
+Summary:	Dia - a GTK+ based diagram creation program
 Summary(es):	Programa para dibujo de diagramas
 Summary(pl):	Dia - program do tworzenia diagramów
 Summary(pt_BR):	Programa para desenho de diagramas
 Summary(ru):	ðÒÏÇÒÁÍÍÁ ÄÌÑ ÒÉÓÏ×ÁÎÉÑ ÄÉÁÇÒÁÍÍ
 Summary(uk):	ðÒÏÇÒÁÍÁ ÄÌÑ ÍÁÌÀ×ÁÎÎÑ Ä¦ÁÇÒÁÍ
-Summary(zh_CN):	»ùÓÚgtk+µÄÁ÷³Ìͼ³ÌÐò
+Summary(zh_CN):	»ùÓÚGTK+µÄÁ÷³Ìͼ³ÌÐò
 Name:		dia
-Version:	0.91
-Release:	0.%{pre}
+Version:	0.94
+Release:	8
 Epoch:		1
 License:	GPL
 Group:		X11/Applications/Graphics
 Vendor:		James Henstridge <james@daa.com.au>
-# this for final releases
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/dia/%{version}/%{name}-%{version}-%{pre}.tar.bz2
-# this only for snapshots
-#Source0:	http://www.crans.org/~chepelov/dia/snapshots/%{name}-CVS-%(echo %snap | sed 's/\./-/').tar.gz
-URL:		http://www.lysator.liu.se/~alla/dia/dia.html
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/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:		dia-state.patch
+#Patch1:		%{name}-home_etc.patch
+Patch2:		%{name}-locale-names.patch
+Patch3:		%{name}-python.patch
+Patch4:		%{name}-desktop.patch
+Patch5:		%{name}-gcc4.patch
+URL:		http://www.gnome.org/projects/dia/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	intltool
-BuildRequires:	libgnomeui-devel
+BuildRequires:	howl-devel >= 0.9.10
+BuildRequires:	intltool >= 0.21
+BuildRequires:	libart_lgpl-devel
+BuildRequires:	libgnomeui-devel >= 2.0.0
+BuildRequires:	libpng-devel
+BuildRequires:	libtool
+BuildRequires:	libxml2-devel >= 2.3.9
 BuildRequires:	libxslt-devel
+BuildRequires:	popt-devel
+BuildRequires:	python-devel >= 1:2.3
+BuildRequires:	python-pygtk-devel
+Requires(post,postun):	desktop-file-utils
+Requires:	python-modules >= 2.3
+Requires:	python-pygtk-gtk
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -76,14 +94,26 @@ PostScript(TM).
 Á ÔÁËÏÖ ÅËÓÐÏÒÔÕ×ÁÔÉ §È × PostScript(TM).
 
 %prep
-#%setup -q
-%setup -q -n %{name}-%{version}-%{pre}
-#%setup -q -n dia-cvs-snapshot
+%setup -q
+#%patch0 -p1
+#%patch1 -p1 - obsoleted?
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+mv po/{no,nb}.po
 
 %build
-#./autogen.sh
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
 %configure \
-	--enable-gnome
+	--enable-gnome \
+	--with-python
+
 %{__make}
 
 %install
@@ -91,30 +121,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	Applicationsdir=%{_datadir}/applications
-
-#Fixme!!!!!!
-#Dirty hack for desktop file
-echo "Categories=Application;Office;" >> $RPM_BUILD_ROOT%{_datadir}/applications/dia.desktop
-
-# for libxslt plugin; DIA_PLUGIN_PATH is required by libxslt plugin, so set
-# it before running dia app
-mv $RPM_BUILD_ROOT%{_bindir}/dia $RPM_BUILD_ROOT%{_bindir}/dia.bin
+	Applicationsdir=%{_desktopdir}
 
-cat > $RPM_BUILD_ROOT%{_bindir}/dia <<END
-#!/bin/sh
-
-DIA_PLUGIN_PATH=%{_datadir}/dia/plugins
-export DIA_PLUGIN_PATH
-
-exec %{_bindir}/dia.bin
-END
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
 
 %find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_desktop_database_post
+
+%postun
+%update_desktop_database_postun
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README TODO
@@ -126,7 +147,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_mandir}/man1/*
 
-%{_datadir}/applications/dia.desktop
 %{_datadir}/dia
-%{_datadir}/mime-info/*
+%{_desktopdir}/dia.desktop
 %{_pixmapsdir}/*