X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dia.spec;h=359ec6694db328ab73f429942c533aaef13f9721;hb=c7849e0915355938c48dcd71c476f90386091571;hp=4133a1f9c0ec3c974c1a9e487a530626554c96c7;hpb=c56d7e7da2600fdaafd109c696ecc3e947d18b06;p=packages%2Fdia.git

diff --git a/dia.spec b/dia.spec
index 4133a1f..359ec66 100644
--- a/dia.spec
+++ b/dia.spec
@@ -6,13 +6,15 @@ Summary(ru):	
 Summary(uk):	ðÒÏÇÒÁÍÁ ÄÌÑ ÍÁÌÀ×ÁÎÎÑ Ä¦ÁÇÒÁÍ
 Summary(zh_CN):	»ùÓÚGTK+µÄÁ÷³Ìͼ³ÌÐò
 Name:		dia
-Version:	0.95
-Release:	1
+%define		_ver	0.96
+%define		_extraver	pre3
+Version:	%{_ver}.%{_extraver}
+Release:	0.5
 Epoch:		1
 License:	GPL
 Group:		X11/Applications/Graphics
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/dia/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	d319921a91d4600df3578a4a64416393
+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
@@ -90,9 +92,9 @@ PostScript(TM).
 Á ÔÁËÏÖ ÅËÓÐÏÒÔÕ×ÁÔÉ §È × PostScript(TM).
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_ver}-%{_extraver}
 %patch0 -p1
-%patch1 -p1
+%patch1 -p0
 #%patch2 -p1 -- needs check
 
 %build
@@ -112,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	Applicationsdir=%{_desktopdir}
+	desktopdir=%{_desktopdir}
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
 
@@ -135,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/dia
 %attr(755,root,root) %{_libdir}/dia/lib*.so
 %{_libdir}/dia/lib*.la
+%{_docdir}/dia/*.xml
+%dir %{_docdir}/dia
+%dir %{_docdir}/dia/graphics
+%{_docdir}/dia/graphics/*.png
 
 %{_mandir}/man1/*