diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-08-17 23:16:27 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-08-17 23:16:27 +0200 |
| commit | 3981ced036cda6b6a52203f600990c360571d1f5 (patch) | |
| tree | 573b36b17eb54ce4e9178a41b3df12dce56bed34 /redhat/applications/kiosktool | |
| parent | 9e497b5b5e1f50f9d3b6df85008b1b2a9aeb45f6 (diff) | |
| download | tde-packaging-3981ced036cda6b6a52203f600990c360571d1f5.tar.gz tde-packaging-3981ced036cda6b6a52203f600990c360571d1f5.zip | |
RPM Packaging: update packages for 3.5.13.2 under Fedora 19
Diffstat (limited to 'redhat/applications/kiosktool')
| -rw-r--r-- | redhat/applications/kiosktool/kiosktool-3.5.13.2.spec | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec index 2d5d8bb0e..d37887fe3 100644 --- a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec +++ b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec @@ -26,7 +26,7 @@ Name: trinity-%{tde_pkg} Version: 1.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} Summary: tool to configure the TDE kiosk framework License: GPLv2+ @@ -40,8 +40,13 @@ URL: http://www.trinitydesktop.org/ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gettext +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: gettext %description @@ -58,12 +63,6 @@ groups of users. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# 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|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__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" @@ -72,8 +71,6 @@ groups of users. %build unset QTDIR || : ; source /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - %configure \ --prefix=%{tde_prefix} \ @@ -89,10 +86,8 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ - \ - --with-extra-includes=%{tde_includedir}/tqt \ - + --enable-rpath + %__make %{?_smp_mflags} @@ -133,6 +128,9 @@ update-desktop-database >& /dev/null ||: %{tde_datadir}/apps/kiosktool/kiosktoolui.rc %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-6 +- Build for Fedora 19 + * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-5 - Rebuild with NDEBUG option |