Accepting request 509641 from KDE:Applications
- Replace %lang_package with evaluated macro to be able to add proper Provides/Obsoletes to avoid file conflicts during installation - Rename -lang package to dolphin-part-lang and recommend it by the dolphin-part package, the translations are used by the kpart too * Avoid boo#1027925 in the context of boo#1047665 OBS-URL: https://build.opensuse.org/request/show/509641 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dolphin?expand=0&rev=29
This commit is contained in:
commit
71e5254c9d
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jul 12 07:08:49 UTC 2017 - fabian@ritter-vogt.de
|
||||||
|
|
||||||
|
- Replace %lang_package with evaluated macro to be able to add proper
|
||||||
|
Provides/Obsoletes to avoid file conflicts during installation
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 7 11:12:50 UTC 2017 - wbauer@tmo.at
|
||||||
|
|
||||||
|
- Rename -lang package to dolphin-part-lang and recommend it by the
|
||||||
|
dolphin-part package, the translations are used by the kpart too
|
||||||
|
* Avoid boo#1027925 in the context of boo#1047665
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jun 07 17:42:40 CEST 2017 - lbeltrame@kde.org
|
Wed Jun 07 17:42:40 CEST 2017 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
23
dolphin.spec
23
dolphin.spec
@ -69,19 +69,19 @@ Requires: dolphin-part = %{version}-%{release}
|
|||||||
Recommends: kio-extras5
|
Recommends: kio-extras5
|
||||||
Recommends: konsole-part
|
Recommends: konsole-part
|
||||||
Obsoletes: dolphin5
|
Obsoletes: dolphin5
|
||||||
Recommends: %{name}-lang
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains the default file manager of KDE Workspaces.
|
This package contains the default file manager of KDE Workspaces.
|
||||||
|
|
||||||
%package -n dolphin-part
|
%package part
|
||||||
Summary: KDE File Manager
|
Summary: KDE File Manager
|
||||||
Group: Productivity/File utilities
|
Group: Productivity/File utilities
|
||||||
Obsoletes: dolphin5-part
|
Obsoletes: dolphin5-part
|
||||||
|
Recommends: %{name}-part-lang
|
||||||
%requires_ge kio
|
%requires_ge kio
|
||||||
|
|
||||||
%description -n dolphin-part
|
%description part
|
||||||
This package contains the libraries used by Dolphin and Konqueror.
|
This package contains the libraries used by Dolphin and Konqueror.
|
||||||
|
|
||||||
%package -n libdolphinvcs5
|
%package -n libdolphinvcs5
|
||||||
@ -102,7 +102,20 @@ Provides: dolphin5-devel = %{version}
|
|||||||
This package contains the libraries used by Dolphin and Konqueror.
|
This package contains the libraries used by Dolphin and Konqueror.
|
||||||
|
|
||||||
%if %{with lang}
|
%if %{with lang}
|
||||||
%lang_package
|
%package -n %{name}-part-lang
|
||||||
|
Summary: Translations for package %{name}
|
||||||
|
Group: System/Localization
|
||||||
|
Requires: %{name}-part = %{version}
|
||||||
|
Provides: %{name}-lang = %{version}
|
||||||
|
Obsoletes: %{name}-lang < %{version}
|
||||||
|
|
||||||
|
Provides: %{name}-part-lang-all = %{version}
|
||||||
|
Supplements: packageand(bundle-lang-other:%{name}-part)
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description -n %{name}-part-lang
|
||||||
|
|
||||||
|
Provides translations for the "%{name}" package.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
@ -192,7 +205,7 @@ This package contains the libraries used by Dolphin and Konqueror.
|
|||||||
%{_includedir}/dolphinvcs_export.h
|
%{_includedir}/dolphinvcs_export.h
|
||||||
|
|
||||||
%if %{with lang}
|
%if %{with lang}
|
||||||
%files lang -f %{name}.lang
|
%files part-lang -f %{name}.lang
|
||||||
%doc COPYING*
|
%doc COPYING*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user