summaryrefslogtreecommitdiffstats
path: root/redhat/extras/knoda/trinity-knoda.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/extras/knoda/trinity-knoda.spec')
-rw-r--r--redhat/extras/knoda/trinity-knoda.spec20
1 files changed, 8 insertions, 12 deletions
diff --git a/redhat/extras/knoda/trinity-knoda.spec b/redhat/extras/knoda/trinity-knoda.spec
index 8f643cd31..7b5ddfc28 100644
--- a/redhat/extras/knoda/trinity-knoda.spec
+++ b/redhat/extras/knoda/trinity-knoda.spec
@@ -1,13 +1,10 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-
# TDE 3.5.13 specific building variables
+%define tde_version 14.0.1
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
@@ -22,7 +19,7 @@
Name: trinity-knoda
Version: 0.8.3
-Release: 1%{?dist}%{?_variant}
+Release: 1%{?dist}
Summary: A database frontend for TDE.
Group: Applications/Productivity
@@ -30,7 +27,7 @@ License: GPLv2+
URL: http://sourceforge.net/projects/knoda/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-0.8.3.tar.gz
+Source0: http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-%{tde_version}.tar.gz
BuildRequires: desktop-file-utils
BuildRequires: trinity-tdelibs-devel
@@ -51,7 +48,7 @@ Requires: %{name} = %{version}-%{release}
%{summary}
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@@ -60,13 +57,14 @@ Requires: %{name} = %{version}-%{release}
%setup -q -n knoda-%{version}
%__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/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
%configure \
@@ -138,7 +136,7 @@ done
%{tde_datadir}/applnk/Office/knoda.desktop
%{tde_datadir}/apps/hk_kdeclasses/
%{tde_datadir}/apps/knoda/
-%{tde_datadir}/config/magic/hk_classes.magic
+%{tde_confdir}/magic/hk_classes.magic
%{tde_tdedocdir}/HTML/en/knoda/
%{tde_datadir}/icons/hicolor/*/apps/knoda.png
%{tde_datadir}/icons/locolor/*/apps/knoda.png
@@ -238,5 +236,3 @@ done
%changelog
-* Mon Apr 08 2013 Francois Andriot <francois.andriot@free.fr> - 0.5b-1
-- Initial release for TDE 3.5.13.2