diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2017-01-13 23:44:40 +0100 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2017-01-13 23:44:40 +0100 |
| commit | 301175d963491a3766c16673331f2da0c3fcb75e (patch) | |
| tree | cc2f5d52eb6fc6900ba9fc95eed8cbebb4e736c2 | |
| parent | b41b7bfead545f7984501d0575ad309c9cb0ec73 (diff) | |
| download | tde-packaging-301175d963491a3766c16673331f2da0c3fcb75e.tar.gz tde-packaging-301175d963491a3766c16673331f2da0c3fcb75e.zip | |
RPM packaging: fix tdefilereplace/kfilereplace package conflict
| -rw-r--r-- | redhat/main/tdeutils/tdeutils-14.0.0.spec | 4 | ||||
| -rw-r--r-- | redhat/main/tdewebdev/tdewebdev-14.0.0.spec | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec index d174abe63..28464b8b3 100644 --- a/redhat/main/tdeutils/tdeutils-14.0.0.spec +++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec @@ -774,6 +774,9 @@ Here are just some examples of the things that can be done: 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 @@ application. 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 3c1339762..799100ba8 100644 --- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec +++ b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec @@ -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 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 @@ application. 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 |