Author: megabajt Date: Sun Dec 19 19:38:09 2010 GMT Module: packages Tag: HEAD ---- Log message: - added Obsoletes for openoffice.org packages
---- Files affected: packages/libreoffice: libreoffice.spec (1.870 -> 1.871) ---- Diffs: ================================================================ Index: packages/libreoffice/libreoffice.spec diff -u packages/libreoffice/libreoffice.spec:1.870 packages/libreoffice/libreoffice.spec:1.871 --- packages/libreoffice/libreoffice.spec:1.870 Sun Dec 19 20:13:46 2010 +++ packages/libreoffice/libreoffice.spec Sun Dec 19 20:38:03 2010 @@ -277,6 +277,7 @@ Requires: %{name}-web = %{epoch}:%{version}-%{release} Requires: %{name}-writer = %{epoch}:%{version}-%{release} Requires: %{name}-xsltfilter = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org ExclusiveArch: %{ix86} %{x8664} ppc sparc sparcv9 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -328,6 +329,7 @@ Obsoletes: openoffice-i18n-en Obsoletes: openoffice-i18n-en-kde Obsoletes: openoffice-libs-kde +Obsoletes: openoffice.org-libs-kde %description libs-kde LibreOffice productivity suite - KDE Interface. @@ -343,6 +345,7 @@ Obsoletes: openoffice-i18n-en Obsoletes: openoffice-i18n-en-gtk Obsoletes: openoffice-libs-gtk +Obsoletes: openoffice.org-libs-gtk %description libs-gtk LibreOffice productivity suite - GTK+ Interface. @@ -388,6 +391,7 @@ Obsoletes: openoffice-i18n-ro Obsoletes: openoffice-i18n-ro-gtk Obsoletes: openoffice-libs +Obsoletes: openoffice.org-core Obsoletes: openoffice.org-dirs Obsoletes: openoffice.org-i18n-fo Obsoletes: openoffice.org-i18n-fo-gtk @@ -425,6 +429,7 @@ Group: Libraries Requires: %{name}-core = %{epoch}:%{version}-%{release} Requires: python +Obsoletes: openoffice.org-pyuno %description pyuno Cool Python bindings for the LibreOffice UNO component model. @@ -442,6 +447,7 @@ Group: X11/Applications Requires(post,postun): desktop-file-utils Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-base %description base GUI database frontend for LibreOffice. Allows creation and @@ -459,6 +465,7 @@ Requires(post,postun): desktop-file-utils Requires: %{name}-core = %{epoch}:%{version}-%{release} Requires: %{name}-writer = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-web %description web Web publishing application of LibreOffice. @@ -472,6 +479,7 @@ Group: X11/Applications Requires(post,postun): desktop-file-utils Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-writer %description writer Wordprocessor application of LibreOffice. @@ -485,6 +493,7 @@ Group: X11/Applications Requires: %{name}-pyuno = %{epoch}:%{version}-%{release} Requires: %{name}-writer = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-emailmerge %description emailmerge Enables LibreOffice Writer module to enable mail merge to email. @@ -499,6 +508,7 @@ Group: X11/Applications Requires(post,postun): desktop-file-utils Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-calc %description calc Spreadsheet application of LibreOffice. @@ -512,6 +522,7 @@ Group: X11/Applications Requires(post,postun): desktop-file-utils Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-draw %description draw Drawing application of LibreOffice. @@ -525,6 +536,7 @@ Group: X11/Applications Requires(post,postun): desktop-file-utils Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-impress %description impress Presentation application of LibreOffice. @@ -538,6 +550,7 @@ Group: X11/Applications Requires(post,postun): desktop-file-utils Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-math %description math Math editor of LibreOffice. @@ -550,6 +563,7 @@ Summary(pl.UTF-8): Dodatkowy moduł graphicfilter dla LibreOffice Group: X11/Applications Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-graphicfilter %description graphicfilter Graphicfilter module for LibreOffice, provides additional SVG and @@ -564,6 +578,7 @@ Summary(pl.UTF-8): Dodatkowy moduł xsltfilter dla LibreOffice Group: X11/Applications Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-xsltfilter %description xsltfilter xsltfilter module for LibreOffice, provides additional docbook and @@ -579,6 +594,7 @@ Summary(pl.UTF-8): Dodatkowy moduł javafilter dla LibreOffice Group: X11/Applications Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-javafilter %description javafilter javafilter module for LibreOffice, provides additional aportisdoc, @@ -593,6 +609,7 @@ Summary(pl.UTF-8): Narzędzia testowe dla LibreOffice Group: Development/Libraries Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-testtools %description testtools QA tools for LibreOffice, enables automated testing. @@ -604,6 +621,7 @@ %package ure Summary: UNO Runtime Environment Group: Libraries +Obsoletes: openoffice.org-ure %description ure UNO is the component model of LibreOffice. UNO offers @@ -621,6 +639,7 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release} Requires: browser-plugins >= 2.0 Requires: browser-plugins(%{_target_base_arch}) +Obsoletes: browser-plugin-openoffice.org %description -n browser-plugin-%{name} LibreOffice plugin for WWW browsers. @@ -641,6 +660,7 @@ Obsoletes: openoffice-i18n-af-gtk Obsoletes: openoffice.org-i18n-af-gtk Obsoletes: openoffice.org-i18n-af-kde +Obsoletes: openoffice.org-i18n-af %description i18n-af This package provides resources containing menus and dialogs in @@ -659,6 +679,7 @@ Obsoletes: openoffice-i18n-ar-gtk Obsoletes: openoffice.org-i18n-ar-gtk Obsoletes: openoffice.org-i18n-ar-kde +Obsoletes: openoffice.org-i18n-ar %description i18n-ar This package provides resources containing menus and dialogs in Arabic @@ -673,6 +694,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku asamskim dla Indii Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-as_IN %description i18n-as_IN This package provides resources containing menus and dialogs in @@ -687,6 +709,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku białoruskim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-be_BY %description i18n-be_BY This package provides resources containing menus and dialogs in @@ -705,6 +728,7 @@ Obsoletes: openoffice-i18n-bg-gtk Obsoletes: openoffice.org-i18n-bg-gtk Obsoletes: openoffice.org-i18n-bg-kde +Obsoletes: openoffice.org-i18n-bg %description i18n-bg This package provides resources containing menus and dialogs in @@ -719,6 +743,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku bengalskim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-bn %description i18n-bn This package provides resources containing menus and dialogs in Bangla @@ -733,6 +758,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku bengalskim dla Bangladeszu Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-bn_BD %description i18n-bn_BD This package provides resources containing menus and dialogs in Bangla @@ -747,6 +773,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku bengalskim dla Indii Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-bn_IN %description i18n-bn_IN This package provides resources containing menus and dialogs in Bangla @@ -761,6 +788,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku tybetańskim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-bo %description i18n-bo This package provides resources containing menus and dialogs in Tibetan @@ -775,6 +803,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku bretońskim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-br %description i18n-br This package provides resources containing menus and dialogs in Breton @@ -789,6 +818,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku boro Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-brx %description i18n-brx This package provides resources containing menus and dialogs in Bodo @@ -803,6 +833,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku bośniackim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-bs %description i18n-bs This package provides resources containing menus and dialogs in @@ -818,6 +849,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku ... Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-by %description i18n-by This package provides resources containing menus and dialogs in @@ -836,6 +868,7 @@ Obsoletes: openoffice-i18n-ca-gtk Obsoletes: openoffice.org-i18n-ca-gtk Obsoletes: openoffice.org-i18n-ca-kde +Obsoletes: openoffice.org-i18n-ca %description i18n-ca This package provides resources containing menus and dialogs in @@ -854,6 +887,7 @@ Obsoletes: openoffice-i18n-cs-gtk Obsoletes: openoffice.org-i18n-cs-gtk Obsoletes: openoffice.org-i18n-cs-kde +Obsoletes: openoffice.org-i18n-cs %description i18n-cs This package provides resources containing menus and dialogs in Czech @@ -872,6 +906,7 @@ Obsoletes: openoffice-i18n-cy-gtk Obsoletes: openoffice.org-i18n-cy-gtk Obsoletes: openoffice.org-i18n-cy-kde +Obsoletes: openoffice.org-i18n-cy %description i18n-cy This package provides resources containing menus and dialogs in @@ -890,6 +925,7 @@ Obsoletes: openoffice-i18n-da-gtk Obsoletes: openoffice.org-i18n-da-gtk Obsoletes: openoffice.org-i18n-da-kde +Obsoletes: openoffice.org-i18n-da %description i18n-da This package provides resources containing menus and dialogs in Danish @@ -908,6 +944,7 @@ Obsoletes: openoffice-i18n-de-gtk Obsoletes: openoffice.org-i18n-de-gtk Obsoletes: openoffice.org-i18n-de-kde +Obsoletes: openoffice.org-i18n-de %description i18n-de This package provides resources containing menus and dialogs in German @@ -922,6 +959,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku dogri Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-dgo %description i18n-dgo This package provides resources containing menus and dialogs in Dogri @@ -936,6 +974,7 @@ Summary(pl.UTF-8): Openoffice.org - interfejs w języku dżongkha Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-dz %description i18n-dz This package provides resources containing menus and dialogs in @@ -954,6 +993,7 @@ Obsoletes: openoffice-i18n-el-gtk Obsoletes: openoffice.org-i18n-el-gtk Obsoletes: openoffice.org-i18n-el-kde +Obsoletes: openoffice.org-i18n-el %description i18n-el This package provides resources containing menus and dialogs in Greek @@ -968,6 +1008,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku anglieskim dla Wielkiej Brytanii Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-en_GB %description i18n-en_GB This package provides resources containing menus and dialogs in @@ -982,6 +1023,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku anglieskim dla Południowej Afryki Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-en_ZA %description i18n-en_ZA This package provides resources containing menus and dialogs in @@ -996,6 +1038,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku esperanto Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-eo %description i18n-eo This package provides resources containing menus and dialogs in @@ -1014,6 +1057,7 @@ Obsoletes: openoffice-i18n-es-gtk Obsoletes: openoffice.org-i18n-es-gtk Obsoletes: openoffice.org-i18n-es-kde +Obsoletes: openoffice.org-i18n-es %description i18n-es This package provides resources containing menus and dialogs in @@ -1032,6 +1076,7 @@ Obsoletes: openoffice-i18n-et-gtk Obsoletes: openoffice.org-i18n-et-gtk Obsoletes: openoffice.org-i18n-et-kde +Obsoletes: openoffice.org-i18n-et %description i18n-et This package provides resources containing menus and dialogs in @@ -1049,6 +1094,7 @@ Obsoletes: openoffice-i18n-eu Obsoletes: openoffice-i18n-eu-gtk Obsoletes: openoffice-i18n-eu-kde +Obsoletes: openoffice.org-i18n-eu %description i18n-eu This package provides resources containing menus and dialogs in Basque @@ -1066,6 +1112,7 @@ Obsoletes: openoffice-i18n-fa Obsoletes: openoffice-i18n-fa-gtk Obsoletes: openoffice-i18n-fa-kde +Obsoletes: openoffice.org-i18n-fa %description i18n-fa This package provides resources containing menus and dialogs in @@ -1084,6 +1131,7 @@ Obsoletes: openoffice-i18n-fi-gtk Obsoletes: openoffice.org-i18n-fi-gtk Obsoletes: openoffice.org-i18n-fi-kde +Obsoletes: openoffice.org-i18n-fi %description i18n-fi This package provides resources containing menus and dialogs in @@ -1102,6 +1150,7 @@ Obsoletes: openoffice-i18n-fr-gtk Obsoletes: openoffice.org-i18n-fr-gtk Obsoletes: openoffice.org-i18n-fr-kde +Obsoletes: openoffice.org-i18n-fr %description i18n-fr This package provides resources containing menus and dialogs in French @@ -1120,6 +1169,7 @@ Obsoletes: openoffice-i18n-ga-gtk Obsoletes: openoffice.org-i18n-ga-gtk Obsoletes: openoffice.org-i18n-ga-kde +Obsoletes: openoffice.org-i18n-ga %description i18n-ga This package provides resources containing menus and dialogs in Irish @@ -1134,6 +1184,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku gaelickim szkockim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-gd %description i18n-gd This package provides resources containing menus and dialogs in @@ -1152,6 +1203,7 @@ Obsoletes: openoffice-i18n-gl-gtk Obsoletes: openoffice.org-i18n-gl-gtk Obsoletes: openoffice.org-i18n-gl-kde +Obsoletes: openoffice.org-i18n-gl %description i18n-gl This package provides resources containing menus and dialogs in @@ -1166,6 +1218,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku gudźarati Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-gu_IN %description i18n-gu_IN This package provides resources containing menus and dialogs in @@ -1180,6 +1233,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku gudźarati Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-gu %description i18n-gu This package provides resources containing menus and dialogs in @@ -1198,6 +1252,7 @@ Obsoletes: openoffice-i18n-he-gtk Obsoletes: openoffice.org-i18n-he-gtk Obsoletes: openoffice.org-i18n-he-kde +Obsoletes: openoffice.org-i18n-he %description i18n-he This package provides resources containing menus and dialogs in Hebrew @@ -1216,6 +1271,7 @@ Obsoletes: openoffice-i18n-hi-gtk Obsoletes: openoffice.org-i18n-hi-gtk Obsoletes: openoffice.org-i18n-hi-kde +Obsoletes: openoffice.org-i18n-hi_IN %description i18n-hi_IN This package provides resources containing menus and dialogs in Hindi @@ -1234,6 +1290,7 @@ Obsoletes: openoffice-i18n-hr-gtk Obsoletes: openoffice.org-i18n-hr-gtk Obsoletes: openoffice.org-i18n-hr-kde +Obsoletes: openoffice.org-i18n-hr %description i18n-hr This package provides resources containing menus and dialogs in @@ -1252,6 +1309,7 @@ Obsoletes: openoffice-i18n-hu-gtk Obsoletes: openoffice.org-i18n-hu-gtk Obsoletes: openoffice.org-i18n-hu-kde +Obsoletes: openoffice.org-i18n-hu %description i18n-hu This package provides resources containing menus and dialogs in @@ -1266,6 +1324,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku islandzkim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-is %description i18n-is This package provides resources containing menus and dialogs in @@ -1284,6 +1343,7 @@ Obsoletes: openoffice-i18n-it-gtk Obsoletes: openoffice.org-i18n-it-gtk Obsoletes: openoffice.org-i18n-it-kde +Obsoletes: openoffice.org-i18n-it %description i18n-it This package provides resources containing menus and dialogs in @@ -1302,6 +1362,7 @@ Obsoletes: openoffice-i18n-ja-gtk Obsoletes: openoffice.org-i18n-ja-gtk Obsoletes: openoffice.org-i18n-ja-kde +Obsoletes: openoffice.org-i18n-ja %description i18n-ja This package provides resources containing menus and dialogs in Japan @@ -1316,6 +1377,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku gruzińskim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-ka %description i18n-ka This package provides resources containing menus and dialogs in @@ -1331,6 +1393,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku ... Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-kid %description i18n-kid This package provides resources containing menus and dialogs in ... @@ -1345,6 +1408,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku kazachskim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-kk %description i18n-kk This package provides resources containing menus and dialogs in Kazakh @@ -1359,6 +1423,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku khmerskim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-km %description i18n-km This package provides resources containing menus and dialogs in Khmer @@ -1376,6 +1441,7 @@ Obsoletes: openoffice-i18n-kn Obsoletes: openoffice-i18n-kn-gtk Obsoletes: openoffice-i18n-kn-kde +Obsoletes: openoffice.org-i18n-kn_IN %description i18n-kn_IN This package provides resources containing menus and dialogs in @@ -1394,6 +1460,7 @@ Obsoletes: openoffice-i18n-ko-gtk Obsoletes: openoffice.org-i18n-ko-gtk Obsoletes: openoffice.org-i18n-ko-kde +Obsoletes: openoffice.org-i18n-ko %description i18n-ko This package provides resources containing menus and dialogs in Korean @@ -1408,6 +1475,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku konkani Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-kok %description i18n-kok This package provides resources containing menus and dialogs in @@ -1422,6 +1490,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku kaszmirskim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-ks %description i18n-ks This package provides resources containing menus and dialogs in @@ -1436,6 +1505,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku kurdyjskim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-ku %description i18n-ku This package provides resources containing menus and dialogs in @@ -1450,6 +1520,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku kirgiskim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-ky %description i18n-ky This package provides resources containing menus and dialogs in @@ -1464,6 +1535,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku laotańskim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-lo %description i18n-lo This package provides resources containing menus and dialogs in Lao @@ -1482,6 +1554,7 @@ Obsoletes: openoffice-i18n-lt-gtk Obsoletes: openoffice.org-i18n-lt-gtk Obsoletes: openoffice.org-i18n-lt-kde +Obsoletes: openoffice.org-i18n-lt %description i18n-lt This package provides resources containing menus and dialogs in @@ -1496,6 +1569,7 @@ Summary(pl.UTF-8): LibreOffice - interfejs w języku łotewskim Group: I18n Requires: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: openoffice.org-i18n-lv %description i18n-lv This package provides resources containing menus and dialogs in <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libreoffice/libreoffice.spec?r1=1.870&r2=1.871&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit