diff options
| author | François Andriot <albator78@libertysurf.fr> | 2022-04-05 17:51:42 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2022-04-05 17:56:43 +0200 |
| commit | bd0c60ec54702a60bdf02a5ba965fcbe43993ca4 (patch) | |
| tree | fc87c04c59d0dd6c7d10b7f0be1b7dc95fbabab4 /redhat/dependencies | |
| parent | 2b75ee27471222a97c33dc063efdb6523bb2152e (diff) | |
| download | tde-packaging-bd0c60ec.tar.gz tde-packaging-bd0c60ec.zip | |
RPM: various updates for TDE 14.0.12
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/dependencies')
| -rw-r--r-- | redhat/dependencies/polkit-tqt/polkit-tqt.spec | 1 | ||||
| -rw-r--r-- | redhat/dependencies/tqscintilla/tqscintilla.spec | 14 |
2 files changed, 10 insertions, 5 deletions
diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec index bc5d32ba7..c1c4fa1a3 100644 --- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec +++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec @@ -49,6 +49,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +BuildRequires: libtqt4-devel BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: trinity-dbus-1-tqt-devel BuildRequires: trinity-filesystem >= %{tde_version} diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec index 81f73c635..d46caa44b 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla.spec @@ -137,11 +137,6 @@ This package contains the documentation for tqscintilla. %files -n %{libtqscintilla}-doc %defattr(-,root,root,-) -%{_docdir}/libtqscintilla7/ -%exclude %{_docdir}/libtqscintilla7/ChangeLog -%exclude %{_docdir}/libtqscintilla7/LICENSE -%exclude %{_docdir}/libtqscintilla7/NEWS -%exclude %{_docdir}/libtqscintilla7/README /usr/share/doc/libtqscintilla/ ########## @@ -184,6 +179,15 @@ fi %__rm -rf %{?buildroot} %__make install -C build DESTDIR=%{?buildroot} +# Fix doc location +if [ -d %{?buildroot}%{_docdir}/lib64tqscintilla7 ]; then + %__mv -f %{?buildroot}%{_docdir}/lib64tqscintilla7 %{?buildroot}%{_docdir}/libtqscintilla7 +fi +if [ -d %{?buildroot}%{_docdir}/libtqscintilla7-1.7.1 ]; then + %__mv -f %{?buildroot}%{_docdir}/libtqscintilla7-1.7.1 %{?buildroot}%{_docdir}/libtqscintilla7 +fi + + # Fix headers location %__mv "%{?buildroot}%{_includedir}/tqt3" "%{?buildroot}%{_includedir}/tqscintilla" |