X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dia.spec;h=f34ac78740859addd2edc86bd1fe2b7777651f10;hb=5fa2c4167b8b0173456867480d67783e612f85c4;hp=0763ecd79d86482e5d394cf199264c745efa6902;hpb=c11e6c11ffafc2cd8efc767455ec1dfa797fb6db;p=packages%2Fdia.git

diff --git a/dia.spec b/dia.spec
index 0763ecd..f34ac78 100644
--- a/dia.spec
+++ b/dia.spec
@@ -1,7 +1,3 @@
-
-#%%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
@@ -10,36 +6,41 @@ Summary(ru):	
 Summary(uk):	ðÒÏÇÒÁÍÁ ÄÌÑ ÍÁÌÀ×ÁÎÎÑ Ä¦ÁÇÒÁÍ
 Summary(zh_CN):	»ùÓÚGTK+µÄÁ÷³Ìͼ³ÌÐò
 Name:		dia
-Version:	0.94
-Release:	3
+%define		_ver	0.96
+%define		_extraver	pre3
+Version:	%{_ver}.%{_extraver}
+Release:	0.5
 Epoch:		1
 License:	GPL
 Group:		X11/Applications/Graphics
-Vendor:		James Henstridge <james@daa.com.au>
-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
-URL:		http://www.lysator.liu.se/~alla/dia/dia.html
-BuildRequires:	autoconf
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/dia/%{_ver}/%{name}-%{_ver}-%{_extraver}.tar.bz2
+# Source0-md5:	abcb045a4f0c88d9d91ca2dbcdc7be37
+Patch0:		%{name}-python.patch
+Patch1:		%{name}-desktop.patch
+Patch2:		%{name}-gcc4.patch
+URL:		http://www.gnome.org/projects/dia/
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	docbook-utils
 BuildRequires:	gettext-devel
+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-devel >= 2.3
+BuildRequires:	python-PyXML
+BuildRequires:	python-devel >= 1:2.3
 BuildRequires:	python-pygtk-devel
-Requires:	python-modules >= 2.3
+BuildRequires:	rpm-pythonprov
+Requires(post,postun):	desktop-file-utils
+Requires:	python-modules >= 1:2.3
 Requires:	python-pygtk-gtk
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -91,14 +92,10 @@ PostScript(TM).
 Á ÔÁËÏÖ ÅËÓÐÏÒÔÕ×ÁÔÉ §È × PostScript(TM).
 
 %prep
-%setup -q
-#%patch0 -p1
-#%patch1 -p1 - obsoleted?
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-mv po/{no,nb}.po
+%setup -q -n %{name}-%{_ver}-%{_extraver}
+%patch0 -p1
+%patch1 -p0
+#%patch2 -p1 -- needs check
 
 %build
 %{__libtoolize}
@@ -117,7 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	Applicationsdir=%{_desktopdir}
+	desktopdir=%{_desktopdir}
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
 
 %find_lang %{name} --with-gnome
 
@@ -125,12 +124,10 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-umask 022
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
+%update_desktop_database_post
 
 %postun
-umask 022
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
+%update_desktop_database_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -140,10 +137,12 @@ umask 022
 %dir %{_libdir}/dia
 %attr(755,root,root) %{_libdir}/dia/lib*.so
 %{_libdir}/dia/lib*.la
+%{_docdir}/dia/*.xml
+%dir %{_docdir}/dia/graphics
+%{_docdir}/dia/graphics/*.png
 
 %{_mandir}/man1/*
 
 %{_datadir}/dia
-%{_datadir}/mime-info/*
 %{_desktopdir}/dia.desktop
 %{_pixmapsdir}/*