diff options
author | Francois Andriot <francois.andriot@free.fr> | 2012-05-07 01:06:08 +0200 |
---|---|---|
committer | Francois Andriot <francois.andriot@free.fr> | 2012-05-07 01:06:08 +0200 |
commit | 9750a057f2f36c5b88a5bc53c0a051b605dac061 (patch) | |
tree | 4f205d3ed4ecf8d2df665b566674d12372363c7f /redhat/applications/kwin-style-crystal | |
parent | 6bb431be79e8f75c26bbf0f81749fa7738965f65 (diff) | |
download | tde-packaging-9750a057f2f36c5b88a5bc53c0a051b605dac061.tar.gz tde-packaging-9750a057f2f36c5b88a5bc53c0a051b605dac061.zip |
RHEL/Fedora: massive updates for Fedora 17 (TDE 3.5.13 entire build)
Diffstat (limited to 'redhat/applications/kwin-style-crystal')
-rw-r--r-- | redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec index c5eb4da3b..fdfe31fbc 100644 --- a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec +++ b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec @@ -6,7 +6,7 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables @@ -55,11 +55,12 @@ And it is of course nice to look at. Upstream says: # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -85,14 +86,6 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - %files %defattr(-,root,root,-) |