- updated files

[packages/dasher.git] / dasher.spec

diff --git a/dasher.spec b/dasher.spec
index f8c6386e60d73374a65b6c9e01411605f3d755ac..f519f8d48bc23078ea67e33749dcd62dbede5668 100644 (file)
--- a/dasher.spec
+++ b/dasher.spec
@@ -1,26 +1,33 @@
 Summary:       Predictive text entry application
 Summary(pl):   Przewiduj±ca aplikacja do wprowadzania tekstu
 Name:          dasher
-Version:       3.2.9
+Version:       4.0.2
 Release:       1
-License:       GPL
+License:       GPL v2
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.2/%{name}-%{version}.tar.bz2
-# Source0-md5: 84e1269ed7c8f7a17e82a62148971842
-Patch0:                %{name}-locale-names.patch
+Source0:       http://ftp.gnome.org/pub/gnome/sources/dasher/4.0/%{name}-%{version}.tar.bz2
+# Source0-md5: 47cf27594abb51ea97f3a8fdb276736d
+Patch0:                %{name}-desktop.patch
+Patch1:                %{name}-ac.patch
 URL:           http://www.inference.phy.cam.ac.uk/dasher/
 BuildRequires: GConf2-devel
 BuildRequires: ORBit2-devel
 BuildRequires: at-spi-devel
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
+BuildRequires: bonobo-devel
+BuildRequires: expat-devel
+BuildRequires: gail-devel
 BuildRequires: gnome-speech-devel
 BuildRequires: gnome-vfs2-devel
-BuildRequires: intltool >= 0.18
+BuildRequires: intltool >= 0.33
 BuildRequires: libbonobo-devel
 BuildRequires: libglade2-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: libtool
+BuildRequires: libwnck-devel
+BuildRequires: rpmbuild(macros) >= 1.197
+Requires(post,postun): scrollkeeper
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,8 +58,7 @@ minut
 %prep
 %setup -q
 %patch0 -p1
-
-mv po/{no,nb}.po
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -63,7 +69,6 @@ mv po/{no,nb}.po
        --with-gnome \
        --with-speech \
        --with-a11y
-
 %{__make}
 
 %install
@@ -72,13 +77,18 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p /usr/bin/scrollkeeper-update
-%postun        -p /usr/bin/scrollkeeper-update
+%post
+%scrollkeeper_update_post
+
+%postun
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -86,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
 %{_desktopdir}/%{name}.desktop
-%{_iconsdir}/%{name}.png
+%{_iconsdir}/hicolor/48x48/apps/%{name}.png
+%{_iconsdir}/hicolor/scalable/apps/%{name}.svg
 %{_mandir}/man1/%{name}*
 %{_omf_dest_dir}/%{name}