summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec')
-rw-r--r--redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec40
1 files changed, 10 insertions, 30 deletions
diff --git a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec
index 27d2f55e5..83aa3617a 100644
--- a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec
+++ b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec
@@ -1,7 +1,7 @@
# Default version for this component
%define kdecomp kdbusnotification
%define version 0.1
-%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"
@@ -56,11 +56,12 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
# 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"
@@ -83,36 +84,10 @@ export PATH="%{_bindir}:${PATH}"
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
- done
- popd
- fi
-done
-fi
-
-
%clean
%__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,-)
@@ -122,5 +97,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%Changelog
+* Tue May 01 2012 Francois Andriot <[email protected]> - 0.1-2
+- Rebuilt for Fedora 17
+- Fix HTML directory location
+- Removes post and postun
+
* Sun Oct 30 2011 Francois Andriot <[email protected]> - 0.1-1
- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15