301175d9 | 2017-01-13 16:44:40 | Francois Andriot |
RPM packaging: fix tdefilereplace/kfilereplace package conflict |
||
M redhat/main/tdeutils/tdeutils-14.0.0.spec M redhat/main/tdewebdev/tdewebdev-14.0.0.spec |
||
diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec index d174abe..28464b8 100644 --- a/redhat/main/tdeutils/tdeutils-14.0.0.spec +++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec @@ -774,6 +774,9 @@ Summary: Batch search-and-replace component for TDE Group: Applications/Utilities +Obsoletes: trinity-kfilereplace < %{version}-%{release} +Provides: trinity-kfilereplace = %{version}-%{release} + %description -n trinity-tdefilereplace TDEFileReplace is an embedded component for TDE that acts as a batch search-and-replace tool. It allows you to replace one expression with @@ -785,6 +788,7 @@ This package is part of Trinity, as a component of the TDE utilities module. %files -n trinity-tdefilereplace +%defattr(-,root,root,-) %{tde_bindir}/tdefilereplace %{tde_tdelibdir}/libtdefilereplacepart.la %{tde_tdelibdir}/libtdefilereplacepart.so diff --git a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec index 3c13397..799100b 100644 --- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec +++ b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec @@ -376,6 +376,9 @@ Summary: Batch search-and-replace component for TDE Group: Applications/Utilities +Obsoletes: trinity-kfilereplace < %{version}-%{release} +Provides: trinity-kfilereplace = %{version}-%{release} + %description -n trinity-tdefilereplace TDEFileReplace is an embedded component for TDE that acts as a batch search-and-replace tool. It allows you to replace one expression with @@ -387,6 +390,7 @@ This package is part of Trinity, as a component of the TDE utilities module. %files -n trinity-tdefilereplace +%defattr(-,root,root,-) %{tde_bindir}/tdefilereplace %{tde_tdelibdir}/libtdefilereplacepart.la %{tde_tdelibdir}/libtdefilereplacepart.so |