RPM packaging: fix tdefilereplace/kfilereplace package conflict

pull/3/head
Francois Andriot 8 years ago
parent b41b7bfead
commit 301175d963

@ -774,6 +774,9 @@ Here are just some examples of the things that can be done:
Summary: Batch search-and-replace component for TDE Summary: Batch search-and-replace component for TDE
Group: Applications/Utilities Group: Applications/Utilities
Obsoletes: trinity-kfilereplace < %{version}-%{release}
Provides: trinity-kfilereplace = %{version}-%{release}
%description -n trinity-tdefilereplace %description -n trinity-tdefilereplace
TDEFileReplace is an embedded component for TDE that acts as a batch TDEFileReplace is an embedded component for TDE that acts as a batch
search-and-replace tool. It allows you to replace one expression with search-and-replace tool. It allows you to replace one expression with
@ -785,6 +788,7 @@ application.
This package is part of Trinity, as a component of the TDE utilities module. This package is part of Trinity, as a component of the TDE utilities module.
%files -n trinity-tdefilereplace %files -n trinity-tdefilereplace
%defattr(-,root,root,-)
%{tde_bindir}/tdefilereplace %{tde_bindir}/tdefilereplace
%{tde_tdelibdir}/libtdefilereplacepart.la %{tde_tdelibdir}/libtdefilereplacepart.la
%{tde_tdelibdir}/libtdefilereplacepart.so %{tde_tdelibdir}/libtdefilereplacepart.so

@ -376,6 +376,9 @@ This package is part of TDE, as a component of the TDE web development module.
Summary: Batch search-and-replace component for TDE Summary: Batch search-and-replace component for TDE
Group: Applications/Utilities Group: Applications/Utilities
Obsoletes: trinity-kfilereplace < %{version}-%{release}
Provides: trinity-kfilereplace = %{version}-%{release}
%description -n trinity-tdefilereplace %description -n trinity-tdefilereplace
TDEFileReplace is an embedded component for TDE that acts as a batch TDEFileReplace is an embedded component for TDE that acts as a batch
search-and-replace tool. It allows you to replace one expression with search-and-replace tool. It allows you to replace one expression with
@ -387,6 +390,7 @@ application.
This package is part of Trinity, as a component of the TDE utilities module. This package is part of Trinity, as a component of the TDE utilities module.
%files -n trinity-tdefilereplace %files -n trinity-tdefilereplace
%defattr(-,root,root,-)
%{tde_bindir}/tdefilereplace %{tde_bindir}/tdefilereplace
%{tde_tdelibdir}/libtdefilereplacepart.la %{tde_tdelibdir}/libtdefilereplacepart.la
%{tde_tdelibdir}/libtdefilereplacepart.so %{tde_tdelibdir}/libtdefilereplacepart.so

Loading…
Cancel
Save