SPECS: evolution.spec - updated to 2.12.2 - use better way to fix ...

megabajt megabajt at pld-linux.org
Mon Nov 26 17:35:36 CET 2007


Author: megabajt                     Date: Mon Nov 26 16:35:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 2.12.2
- use better way to fix locale name
- use --with-omf

---- Files affected:
SPECS:
   evolution.spec (1.225 -> 1.226) 

---- Diffs:

================================================================
Index: SPECS/evolution.spec
diff -u SPECS/evolution.spec:1.225 SPECS/evolution.spec:1.226
--- SPECS/evolution.spec:1.225	Sun Nov  4 18:06:48 2007
+++ SPECS/evolution.spec	Mon Nov 26 17:35:31 2007
@@ -12,12 +12,12 @@
 Summary(pt_BR.UTF-8):	Cliente de email integrado com calendário e catálogo de endereços
 Summary(zh_CN.UTF-8):	Evolution - GNOME个人和工作组信息管理工具(包括电子邮件,日历和地址薄)
 Name:		evolution
-Version:	2.12.1
-Release:	3
+Version:	2.12.2
+Release:	1
 License:	GPL v2
 Group:		Applications/Mail
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	392623efa9b79ede17ce90512f2c3c0a
+# Source0-md5:	085d4c3a4360ca8024e6c00a25dc38cf
 Source1:	%{name}-gg16.png
 Source2:	%{name}-gg48.png
 Source3:	%{name}-addressbook.desktop
@@ -65,8 +65,11 @@
 BuildRequires:	pkgconfig
 BuildRequires:	psmisc
 BuildRequires:	python
+# support for --with-omf in find-lang.sh
+BuildRequires:	rpm-build >= 4.4.9-10
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper >= 0.1.4
+BuildRequires:	sed >= 4.0
 BuildRequires:	which
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
@@ -232,6 +235,9 @@
 %patch3 -p1
 %patch4 -p1
 
+sed -i -e s#sr\@Latn#sr\@latin# po/LINGUAS
+mv po/sr\@{Latn,latin}.po
+
 %build
 %{__glib_gettextize}
 %{__intltoolize}
@@ -295,9 +301,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
 rm -r $RPM_BUILD_ROOT%{_desktopdir}/evolution.desktop
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang %{name} --all-name --with-gnome
+%find_lang %{name} --all-name --with-omf --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -391,8 +395,6 @@
 
 %{_iconsdir}/hicolor/*/apps/*
 
-%{_omf_dest_dir}/%{name}
-
 %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
 
 %files libs
@@ -534,6 +536,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.226  2007-11-26 16:35:31  megabajt
+- updated to 2.12.2
+- use better way to fix locale name
+- use --with-omf
+
 Revision 1.225  2007-11-04 17:06:48  ankry
 - sr at Latn -> sr at latin, rel. 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/evolution.spec?r1=1.225&r2=1.226&f=u



More information about the pld-cvs-commit mailing list