diff options
| author | François Andriot <[email protected]> | 2020-03-23 23:16:54 +0100 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2020-03-23 23:18:23 +0100 |
| commit | c4b59fb86a7a696ce0d2d07c3984cfd2082ace0f (patch) | |
| tree | 058f7b92332eda5069386377c14e1af1e821d512 | |
| parent | 9251563228aebdbf6d53856ee518d5cc427f9788 (diff) | |
| download | tde-packaging-c4b59fb86a7a696ce0d2d07c3984cfd2082ace0f.tar.gz tde-packaging-c4b59fb86a7a696ce0d2d07c3984cfd2082ace0f.zip | |
RPM: fix invalid app folder in gtk-qt-engine and libkipi
| -rw-r--r-- | redhat/applications/gtk-qt-engine/gtk-qt-engine.spec | 16 | ||||
| -rw-r--r-- | redhat/libraries/libkipi/libkipi.spec | 8 |
2 files changed, 11 insertions, 13 deletions
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec index bf5b5431b..063375a68 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec @@ -141,7 +141,7 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DDATA_INSTALL_DIR=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ .. @@ -157,9 +157,9 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang gtkqtengine # Adds TDE's specific GTKRC -%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh" -%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4" -%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4" +%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh" +%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4" +%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4" %clean @@ -172,10 +172,10 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/kcm_kcmgtk.la %{tde_tdelibdir}/kcm_kcmgtk.so %{tde_appdir}/kcmgtk.desktop -%dir %{tde_datadir}/kgtk -%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh -%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 -%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 +%dir %{tde_datadir}/apps/kgtk +%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh +%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4 +%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4 %{tde_tdedocdir}/HTML/en/kcmgtk/ # The following files are outside TDE's directory diff --git a/redhat/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec index 5be3e1bdb..e1e4299c6 100644 --- a/redhat/libraries/libkipi/libkipi.spec +++ b/redhat/libraries/libkipi/libkipi.spec @@ -123,7 +123,7 @@ Homepage: http://www.kipi-plugins.org/ %defattr(-,root,root,-) %{tde_libdir}/libkipi.so.0 %{tde_libdir}/libkipi.so.0.1.1 -%{tde_datadir}/kipi/ +%{tde_datadir}/apps/kipi/ %{tde_datadir}/icons/hicolor/*/apps/kipi.png %{tde_datadir}/servicetypes/kipiplugin.desktop @@ -185,7 +185,8 @@ fi -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ - -DDATA_INSTALL_DIR="%{tde_datadir}" \ + -DDATA_INSTALL_DIR="%{tde_datadir}/apps" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ -DSERVICETYPES_INSTALL_DIR="%{tde_datadir}/servicetypes" \ -DICON_INSTALL_DIR="%{tde_datadir}/icons" \ \ @@ -211,7 +212,4 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} - - - %changelog |