- ver. 4.7.3

[packages/dasher.git] / dasher.spec

diff --git a/dasher.spec b/dasher.spec
index 3784a383befb001a2b1bd622f796258a2393a9fd..6cd7f162136c62b419dd228e845155153b1a4769 100644 (file)
--- a/dasher.spec
+++ b/dasher.spec
@@ -1,17 +1,16 @@
 Summary:       Predictive text entry application
 Summary(pl.UTF-8):     Przewidująca aplikacja do wprowadzania tekstu
 Name:          dasher
-Version:       4.6.0
-Release:       2
+Version:       4.7.3
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/dasher/4.6/%{name}-%{version}.tar.bz2
-# Source0-md5: ab9fce024bb2b1ea3cb479e82819d57d
+Source0:       http://ftp.gnome.org/pub/gnome/sources/dasher/4.7/%{name}-%{version}.tar.bz2
+# Source0-md5: f97dfd3c54f6d6c5f2873d4f82cb33c4
 Patch0:                %{name}-ac.patch
 Patch1:                %{name}-as-needed.patch
-Patch2:                %{name}-action-speech.patch
 URL:           http://www.inference.phy.cam.ac.uk/dasher/
-BuildRequires: GConf2-devel >= 2.18.0.1
+BuildRequires: GConf2-devel >= 2.20.0
 BuildRequires: ORBit2-devel >= 1:2.14.7
 BuildRequires: at-spi-devel >= 1.20.0
 BuildRequires: atk-devel >= 1.20.0
@@ -22,10 +21,10 @@ BuildRequires:      gnome-doc-utils
 BuildRequires: gnome-speech-devel >= 0.4.10
 BuildRequires: gnome-vfs2-devel >= 2.20.0
 BuildRequires: gtk+2-devel >= 2:2.12.0
-BuildRequires: intltool >= 0.35.5
+BuildRequires: intltool >= 0.36.2
 BuildRequires: libbonobo-devel >= 2.20.0
 BuildRequires: libglade2-devel >= 2.6.0
-BuildRequires: libgnomeui-devel >= 2.18.1
+BuildRequires: libgnomeui-devel >= 2.20.0
 BuildRequires: libtool
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: xorg-lib-libXtst-devel
@@ -33,6 +32,8 @@ Requires(post,postun):        gtk+2
 Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): scrollkeeper
 Requires(post,preun):  GConf2
+# sr@Latn vs. sr@latin
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,7 +65,6 @@ minutę.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
 
 %build
 %{__glib_gettextize}
@@ -88,6 +88,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name} --with-gnome --all-name
 
 %clean