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 kdemultimedia, kdetoys, kdewebdev HTML directory location

Browse Source
pull/3/head
Francois Andriot 13 years ago
parent e2bd7a7c7d
commit de01351811
3 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File

16
redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
Unescape View File

@ -2,7 +2,7 @@
%if "%{?version}" == "" %if "%{?version}" == ""
%define version 3.5.13 %define version 3.5.13
%endif %endif
%define release 3 %define release 4
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
@ -136,8 +136,9 @@ Requires: %{name} = %{version}-%{release}
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s,/usr/include/tqt,%{_includedir}/tqt,g" -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/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@ -281,7 +282,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
# kaboodle # kaboodle
%doc rpmdocs/kaboodle/ %doc rpmdocs/kaboodle/
%doc %lang(en) %{_docdir}/HTML/en/kaboodle/ %doc %lang(en) %{tde_docdir}/HTML/en/kaboodle/
%{_bindir}/kaboodle %{_bindir}/kaboodle
%{tde_libdir}/libkaboodlepart.* %{tde_libdir}/libkaboodlepart.*
%{_datadir}/applications/kde/kaboodle.desktop %{_datadir}/applications/kde/kaboodle.desktop
@ -290,7 +291,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/services/kaboodle* %{_datadir}/services/kaboodle*
# noatun # noatun
%doc %lang(en) %{_docdir}/HTML/en/noatun/ %doc %lang(en) %{tde_docdir}/HTML/en/noatun/
%{_bindir}/noatun %{_bindir}/noatun
%{_libdir}/kconf_update_bin/noatun20update %{_libdir}/kconf_update_bin/noatun20update
%{tde_libdir}/noatun* %{tde_libdir}/noatun*
@ -304,7 +305,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/mimelnk/interface/x-winamp-skin.desktop %{_datadir}/mimelnk/interface/x-winamp-skin.desktop
# juk # juk
%doc %lang(en) %{_docdir}/HTML/en/juk/ %doc %lang(en) %{tde_docdir}/HTML/en/juk/
%{_bindir}/juk %{_bindir}/juk
%{_datadir}/applications/kde/juk.desktop %{_datadir}/applications/kde/juk.desktop
%{_datadir}/apps/juk/ %{_datadir}/apps/juk/
@ -411,6 +412,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_libdir}/libyafxplayer.so %exclude %{_libdir}/libyafxplayer.so
%changelog %changelog
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Fix HTML directory location
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 * Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE - Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE

12
redhat/kdetoys/trinity-kdetoys-3.5.13.spec
Unescape View File

@ -2,7 +2,7 @@
%if "%{?version}" == "" %if "%{?version}" == ""
%define version 3.5.13 %define version 3.5.13
%endif %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 TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
@ -61,8 +61,9 @@ and user to be logged-in to KDE.
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s,/usr/include/tqt,%{_includedir}/tqt,g" -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/aclocal/libtool.m4" "admin/libtool.m4.in"
@ -150,13 +151,16 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%{_datadir}/apps/* %{_datadir}/apps/*
%{_datadir}/icons/hicolor/*/*/* %{_datadir}/icons/hicolor/*/*/*
%{_datadir}/service*/*.desktop %{_datadir}/service*/*.desktop
%doc %lang(en) %{_docdir}/HTML/en/* %doc %lang(en) %{tde_docdir}/HTML/en/*
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%changelog %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 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15 - Initial release for RHEL 6, RHEL 5 and Fedora 15

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

@ -2,7 +2,7 @@
%if "%{?version}" == "" %if "%{?version}" == ""
%define version 3.5.13 %define version 3.5.13
%endif %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 TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
@ -98,13 +98,14 @@ Requires: trinity-kdelibs
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s,/usr/include/tqt,%{_includedir}/tqt,g" -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
-e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
%patch0 -p0 -b .javascript %patch0 -p0 -b .javascript
%patch1 -p1 -b .kxsldbg-icons %patch1 -p1 -b .kxsldbg-icons
install -m644 -p %{SOURCE5} kxsldbg/ %__install -m644 -p %{SOURCE5} kxsldbg/
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@ -116,10 +117,6 @@ unset QTDIR || : ; source /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%if 0%{?fedora} >= 15
#export CXXFLAGS="${CXXFLAGS} -fpermissive"
%endif
%configure \ %configure \
--includedir=%{tde_includedir} \ --includedir=%{tde_includedir} \
--disable-rpath \ --disable-rpath \
@ -151,7 +148,7 @@ done
cp -a php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc/ cp -a php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc/
# make symlinks relative # make symlinks relative
pushd %{buildroot}%{_docdir}/HTML/en pushd %{buildroot}%{tde_docdir}/HTML/en
for i in *; do for i in *; do
if [ -d $i -a -L $i/common ]; then if [ -d $i -a -L $i/common ]; then
rm -f $i/common rm -f $i/common
@ -209,7 +206,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/mimelnk/application/* %{_datadir}/mimelnk/application/*
%{_datadir}/services/* %{_datadir}/services/*
%{_datadir}/servicetypes/* %{_datadir}/servicetypes/*
%doc %lang(en) %{_docdir}/HTML/en/* %doc %lang(en) %{tde_docdir}/HTML/en/*
%files libs %files libs
@ -224,6 +221,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog %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 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15 - Initial release for RHEL 6, RHEL 5 and Fedora 15

Write Preview
Loading…
Cancel
Save