packages: dia/dia.spec - updated to 0.97 - removed obsolete -desktop.patch

[megabajt]

Author: megabajt                     Date: Fri May 15 21:38:38 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.97
- removed obsolete -desktop.patch

---- Files affected:
packages/dia:
   dia.spec (1.143 -> 1.144) 

---- Diffs:

================================================================
Index: packages/dia/dia.spec
diff -u packages/dia/dia.spec:1.143 packages/dia/dia.spec:1.144
--- packages/dia/dia.spec:1.143	Mon May  4 20:38:43 2009
+++ packages/dia/dia.spec	Fri May 15 23:38:33 2009
@@ -8,13 +8,13 @@
 Summary(uk.UTF-8):	Програма для малювання діаграм
 Summary(zh_CN.UTF-8):	基于GTK+的流程图程序
 Name:		dia
-Version:	0.96.1
-Release:	6
+Version:	0.97
+Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Applications/Graphics
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/dia/0.96/%{name}-%{version}.tar.bz2
-# Source0-md5:	7b81b22baa2df55efe4845865dddc7b6
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/dia/0.97/%{name}-%{version}.tar.bz2
+# Source0-md5:	3d11f9aaa5a4923f0a5533962c87bdfb
 Source1:	http://dia-installer.de/shapes/central_data_processing/central_data_processing.zip
 # Source1-md5:	103865b35609d2a0f8a0e034c49cf130
 Source2:	http://dia-installer.de/shapes/chemistry_lab/chemistry_lab.zip
@@ -38,17 +38,16 @@
 Source11:	http://dia-installer.de/shapes/scenegraph/scenegraph.zip
 # Source11-md5:	2bca8efa9bae10c13968ebacc9f1a00b
 Patch0:		%{name}-python.patch
-Patch1:		%{name}-desktop.patch
 URL:		http://www.gnome.org/projects/dia/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	cairo-devel
+BuildRequires:	cairo-devel >= 1.0.0
 BuildRequires:	docbook-utils
 BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel >= 2:2.6.0
-BuildRequires:	intltool >= 0.21
+BuildRequires:	intltool >= 0.35.0
+BuildRequires:	libEMF-devel
 BuildRequires:	libart_lgpl-devel >= 2.0
-BuildRequires:	libgnomeprint-devel >= 2.0.0
 BuildRequires:	libgnomeui-devel >= 2.0.0
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
@@ -57,11 +56,14 @@
 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:	rpmbuild(find_lang) >= 1.23
+BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	rpm-pythonprov
+BuildRequires:	sed >= 4.0
+BuildRequires:	unzip
+BuildRequires:	zlib-devel
 Requires(post,postun):	desktop-file-utils
 Requires:	python-modules >= 1:2.3
 Requires:	python-pygtk-gtk
@@ -126,10 +128,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
-%{__sed} -i -e s#sr\@Latn#sr\@latin# configure.in
-mv -f po/sr\@{Latn,latin}.po
+%{__sed} -i -e s#sr at Latn#sr at latin# po/LINGUAS
+mv -f po/sr@{Latn,latin}.po
 
 %build
 %{__intltoolize}
@@ -141,8 +142,6 @@
 %{__sed} -i -e 's|/lib/|/%{_lib}/|' configure
 %configure \
 	--enable-gnome \
-	--with-gnomeprint \
-	--with-cairo \
 	--with-python \
 	--with-xslt-prefix=%{_libdir}
 
@@ -152,12 +151,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	desktopdir=%{_desktopdir}
-
-rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
-
-%find_lang %{name} --with-gnome
+	DESTDIR=$RPM_BUILD_ROOT
 
 unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE1}
 unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE2}
@@ -174,33 +168,35 @@
 # Conflicts with Assorted/square.shape
 sed -i "s at Square@Square2@" $RPM_BUILD_ROOT%{_datadir}/%{name}/shapes/chemistry_lab/square.shape
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/dia/*.la
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
+
+%find_lang %{name} --with-gnome --with-omf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_desktop_database_post
+%update_icon_cache hicolor
 
 %postun
 %update_desktop_database_postun
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
-
+%attr(755,root,root) %{_bindir}/dia
 %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/*
-
+%{_docdir}/dia
+%{_mandir}/man1/dia.1*
+%lang(fr) %{_mandir}/fr/man1/dia.1*
+%{_iconsdir}/hicolor/*/*/*.png
+%{_iconsdir}/hicolor/*/*/*.svg
 %{_datadir}/dia
 %{_desktopdir}/dia.desktop
-%{_pixmapsdir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -208,6 +204,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.144  2009/05/15 21:38:33  megabajt
+- updated to 0.97
+- removed obsolete -desktop.patch
+
 Revision 1.143  2009/05/04 18:38:43  uzsolt
 - additional shapes
 - rel 6
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dia/dia.spec?r1=1.143&r2=1.144&f=u