TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RHEL/Fedora: fix kdeaccessibility, kdeadmin, kdeedu, kdegames HTML directory location

Browse Source
pull/3/head
Francois Andriot 13 years ago
parent de01351811
commit b9d5f70527
4 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File

20
redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec
Unescape View File

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%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"
@ -10,7 +10,7 @@
%define _docdir %{_prefix}/share/doc
%endif
# TDE 3.5.12 specific building variables
# TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8
%define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde
@ -69,8 +69,9 @@ Requires: trinity-kdelibs-devel
# 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@ -171,10 +172,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{tde_libdir}/*
# Misc docs
%doc %lang(en) %{_docdir}/HTML/en/kmag
%doc %lang(en) %{_docdir}/HTML/en/kmousetool
%doc %lang(en) %{_docdir}/HTML/en/kmouth
%doc %lang(en) %{_docdir}/HTML/en/kttsd
%doc %lang(en) %{tde_docdir}/HTML/en/kmag
%doc %lang(en) %{tde_docdir}/HTML/en/kmousetool
%doc %lang(en) %{tde_docdir}/HTML/en/kmouth
%doc %lang(en) %{tde_docdir}/HTML/en/kttsd
%files devel
@ -184,6 +185,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Fix HTML directory location
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15

19
redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
Unescape View File

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%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"
@ -69,8 +69,9 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
# 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@ -105,10 +106,10 @@ export PATH="%{_bindir}:${PATH}"
%if 0%{?rhel} > 1
comps="kcron kdat knetworkconf"
rm -rf %{buildroot}%{_docdir}/HTML/en/kuser \
%{buildroot}%{_docdir}/HTML/en/kpackage \
%{buildroot}%{_docdir}/HTML/en/ksysv \
%{buildroot}%{_docdir}/HTML/en/lilo-config
rm -rf %{buildroot}%{tde_docdir}/HTML/en/kuser \
%{buildroot}%{tde_docdir}/HTML/en/kpackage \
%{buildroot}%{tde_docdir}/HTML/en/ksysv \
%{buildroot}%{tde_docdir}/HTML/en/lilo-config
%else
comps="kcron kdat knetworkconf kpackage ksysv kuser"
mkdir -p %{buildroot}%{_datadir}/config \
@ -189,10 +190,12 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/service*/*.desktop
%{tde_libdir}/*
%{_libdir}/pkgconfig/*.pc
%doc %lang(en) %{_docdir}/HTML/en/*
%changelog
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Fix HTML directory location
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15

11
redhat/kdeedu/trinity-kdeedu-3.5.13.spec
Unescape View File

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%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"
@ -98,8 +98,9 @@ Requires: %{name} = %{version}-%{release}
# 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"
%if 0%{?rhel} > 0
rm -rf doc/kgeography kgeography
@ -215,7 +216,6 @@ update-desktop-database >& /dev/null ||:
%{_datadir}/icons/locolor/*/*/*
%{_datadir}/services/*
%{tde_libdir}/*
%doc %lang(en) %{_docdir}/HTML/en/*
%files libs
%defattr(-,root,root,-)
@ -230,6 +230,9 @@ update-desktop-database >& /dev/null ||:
%changelog
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Fix HTML directory location
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15

11
redhat/kdegames/trinity-kdegames-3.5.13.spec
Unescape View File

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%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"
@ -75,8 +75,9 @@ License: LGPLv2
# 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@ -175,7 +176,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/service*/*
%{tde_libdir}/*
%{_libdir}/libkdeinit_*.so
%doc %lang(en) %{_docdir}/HTML/en/*
%files libs
%defattr(-,root,root,-)
@ -192,6 +192,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Fix HTML directory location
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15

Write Preview
Loading…
Cancel
Save