Author: ankry Date: Sun Nov 4 17:06:54 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 3
---- Files affected: SPECS: epiphany.spec (1.160 -> 1.161) , epiphany-extensions.spec (1.89 -> 1.90) , evolution.spec (1.224 -> 1.225) , evolution-data-server.spec (1.108 -> 1.109) , evolution-exchange.spec (1.27 -> 1.28) ---- Diffs: ================================================================ Index: SPECS/epiphany.spec diff -u SPECS/epiphany.spec:1.160 SPECS/epiphany.spec:1.161 --- SPECS/epiphany.spec:1.160 Fri Nov 2 19:40:41 2007 +++ SPECS/epiphany.spec Sun Nov 4 18:06:48 2007 @@ -9,7 +9,7 @@ Summary(pl.UTF-8): Epiphany - przeglądarka WWW dla GNOME Name: epiphany Version: 2.20.1 -Release: 2 +Release: 3 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany/2.20/%{name}-%{version}.tar.bz2 @@ -65,6 +65,8 @@ %requires_eq xulrunner %endif Obsoletes: python-epiphany +# [EMAIL PROTECTED] vs. [EMAIL PROTECTED] +Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %if %{without webkit} @@ -152,6 +154,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/%{basever}/plugins/*.la +[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \ + mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin} %find_lang %{name} --with-gnome %clean @@ -216,6 +220,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.161 2007/11/04 17:06:48 ankry +- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 3 + Revision 1.160 2007/11/02 18:40:41 sls - BR: enchant-devel >= 1.0 ================================================================ Index: SPECS/epiphany-extensions.spec diff -u SPECS/epiphany-extensions.spec:1.89 SPECS/epiphany-extensions.spec:1.90 --- SPECS/epiphany-extensions.spec:1.89 Mon Oct 22 21:31:59 2007 +++ SPECS/epiphany-extensions.spec Sun Nov 4 18:06:48 2007 @@ -4,7 +4,7 @@ Summary(pl.UTF-8): Zbiór rozszerzeń dla Epiphany Name: epiphany-extensions Version: 2.20.1 -Release: 2 +Release: 3 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/2.20/%{name}-%{version}.tar.bz2 @@ -33,6 +33,8 @@ %requires_eq xulrunner Provides: epiphany-plugins Obsoletes: epiphany-plugins <= 0.1.2 +# [EMAIL PROTECTED] vs. [EMAIL PROTECTED] +Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # can be provided by mozilla or mozilla-embedded @@ -68,6 +70,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/%{basever}/extensions/{,libepilicious/}*.{la,py} +[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \ + mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin} %find_lang %{name}-%{basever} %find_lang %{name} --with-gnome cat %{name}.lang >> %{name}-%{basever}.lang @@ -108,6 +112,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.90 2007/11/04 17:06:48 ankry +- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 3 + Revision 1.89 2007/10/22 19:31:59 megabajt - release 2 (xulrunner 1.8.1.8) ================================================================ Index: SPECS/evolution.spec diff -u SPECS/evolution.spec:1.224 SPECS/evolution.spec:1.225 --- SPECS/evolution.spec:1.224 Sat Nov 3 15:01:35 2007 +++ SPECS/evolution.spec Sun Nov 4 18:06:48 2007 @@ -13,7 +13,7 @@ Summary(zh_CN.UTF-8): Evolution - GNOME个人和工作组信息管理工具(包括电子邮件，日历和地址薄) Name: evolution Version: 2.12.1 -Release: 2 +Release: 3 License: GPL v2 Group: Applications/Mail Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution/2.12/%{name}-%{version}.tar.bz2 @@ -84,6 +84,8 @@ Requires: scrollkeeper >= 0.1.4 Obsoletes: evolution2 Obsoletes: gnome-pim +# [EMAIL PROTECTED] vs. [EMAIL PROTECTED] +Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -293,6 +295,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info rm -r $RPM_BUILD_ROOT%{_desktopdir}/evolution.desktop +[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \ + mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin} %find_lang %{name} --all-name --with-gnome %clean @@ -530,6 +534,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.225 2007/11/04 17:06:48 ankry +- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 3 + Revision 1.224 2007/11/03 14:01:35 baggins - rel 2 ================================================================ Index: SPECS/evolution-data-server.spec diff -u SPECS/evolution-data-server.spec:1.108 SPECS/evolution-data-server.spec:1.109 --- SPECS/evolution-data-server.spec:1.108 Sat Nov 3 13:44:09 2007 +++ SPECS/evolution-data-server.spec Sun Nov 4 18:06:49 2007 @@ -13,7 +13,7 @@ Summary(pl.UTF-8): Serwer danych Evolution Name: evolution-data-server Version: 1.12.1 -Release: 2 +Release: 3 License: GPL Group: Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/1.12/%{name}-%{version}.tar.bz2 @@ -41,6 +41,8 @@ BuildRequires: rpmbuild(macros) >= 1.304 Requires(post,postun): scrollkeeper Requires: %{name}-libs = %{version}-%{release} +# [EMAIL PROTECTED] vs. [EMAIL PROTECTED] +Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define schemadir /usr/share/openldap/schema @@ -175,6 +177,8 @@ install -d $RPM_BUILD_ROOT%{schemadir} install addressbook/backends/ldap/evolutionperson.schema $RPM_BUILD_ROOT%{schemadir} +[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \ + mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin} %find_lang %{name} --all-name %clean @@ -252,6 +256,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.109 2007/11/04 17:06:49 ankry +- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 3 + Revision 1.108 2007/11/03 12:44:09 baggins - rel 2 ================================================================ Index: SPECS/evolution-exchange.spec diff -u SPECS/evolution-exchange.spec:1.27 SPECS/evolution-exchange.spec:1.28 --- SPECS/evolution-exchange.spec:1.27 Sat Nov 3 14:20:20 2007 +++ SPECS/evolution-exchange.spec Sun Nov 4 18:06:49 2007 @@ -5,7 +5,7 @@ Summary(pl.UTF-8): Wsparcie dla Microsoft Exchange w Evolution Name: evolution-exchange Version: 2.12.1 -Release: 2 +Release: 3 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution-exchange/2.12/%{name}-%{version}.tar.bz2 @@ -32,6 +32,8 @@ Requires: evolution >= 2.12.0 Requires: gtk+2 >= 2:2.12.0 Obsoletes: ximian-connector +# [EMAIL PROTECTED] vs. [EMAIL PROTECTED] +Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -78,6 +80,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/evolution-data-server-*/camel-providers/*.{la,a} +[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \ + mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin} %find_lang %{name}-2.12 %clean @@ -110,6 +114,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.28 2007/11/04 17:06:49 ankry +- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 3 + Revision 1.27 2007/11/03 13:20:20 baggins - rel 2 - BR openldap-evolution-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/epiphany.spec?r1=1.160&r2=1.161&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/epiphany-extensions.spec?r1=1.89&r2=1.90&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/evolution.spec?r1=1.224&r2=1.225&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/evolution-data-server.spec?r1=1.108&r2=1.109&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/evolution-exchange.spec?r1=1.27&r2=1.28&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
