summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kopete-otr
diff options
context:
space:
mode:
authorFrancois Andriot <[email protected]>2012-05-05 11:11:35 +0200
committerFrancois Andriot <[email protected]>2012-05-05 11:11:35 +0200
commit01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9 (patch)
tree44a49e67fe0e2b487938d3af116a8804950c8ca7 /redhat/applications/kopete-otr
parent4a5605e233305678da64153c9664a0d06f00bcbe (diff)
downloadtde-packaging-01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9.tar.gz
tde-packaging-01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9.zip
RHEL/Fedora: more application fixes ...
Diffstat (limited to 'redhat/applications/kopete-otr')
-rw-r--r--redhat/applications/kopete-otr/trinity-kopete-otr.spec21
1 files changed, 12 insertions, 9 deletions
diff --git a/redhat/applications/kopete-otr/trinity-kopete-otr.spec b/redhat/applications/kopete-otr/trinity-kopete-otr.spec
index 390c5c14e..ec87c5a5e 100644
--- a/redhat/applications/kopete-otr/trinity-kopete-otr.spec
+++ b/redhat/applications/kopete-otr/trinity-kopete-otr.spec
@@ -1,7 +1,7 @@
# Default version for this component
%define kdecomp kopete-otr
%define version 0.7
-%define release 1
+%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -57,11 +57,11 @@ unset QTDIR; . /etc/profile.d/qt.sh
# 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" \
- -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+ -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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -87,13 +87,13 @@ export PATH="%{_bindir}:${PATH}"
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
/sbin/ldconfig || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
/sbin/ldconfig || :
@@ -120,6 +120,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%Changelog
+* Wed May 02 2012 Francois Andriot <[email protected]> - 0.7-2
+- Rebuild for Fedora 17
+
* Sat Dec 03 2011 Francois Andriot <[email protected]> - 0.7-1
- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16