summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbator <albator@arcadia.vtf>2011-09-10 19:23:44 +0200
committeralbator <albator@arcadia.vtf>2011-09-10 19:23:44 +0200
commit89bffdf4611085447a41efc0c2c8f49b46a3c942 (patch)
treeccc39d341b91b7a0745dee84e1611555b71232ea
parentf14a4cc47a9364e56b0fe7db659499b33cb951ae (diff)
downloadtde-packaging-89bffdf4611085447a41efc0c2c8f49b46a3c942.tar.gz
tde-packaging-89bffdf4611085447a41efc0c2c8f49b46a3c942.zip
Slight updates on basic components
-rw-r--r--redhat/components.txt4
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec9
-rwxr-xr-xredhat/kdebase/trinity-kdebase-3.5.13.spec7
-rwxr-xr-xredhat/kdelibs/trinity-kdelibs-3.5.13.spec4
4 files changed, 20 insertions, 4 deletions
diff --git a/redhat/components.txt b/redhat/components.txt
index 9a4b4836d..c756a28f6 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -5,3 +5,7 @@ dependencies/arts
kdelibs
kdebase
kdebindings
+kdeutils
+kdepim
+kdesdk
+kdevelop
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
index 3a35c6866..1764eda3d 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
@@ -7,6 +7,9 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
+%define cmake_modules_dir %{_datadir}/cmake
+%else
+%define cmake_modules_dir %{_datadir}/cmake/Modules
%endif
# TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
@@ -77,9 +80,9 @@ sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \
-e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,'
# Install 'cmake' modules for a specific package (for later use)
-%__mkdir_p %{?buildroot}%{_usr}/share/cmake/Modules
+%__mkdir_p %{?buildroot}%{cmake_modules_dir}
for i in cmake/modules/*.cmake; do
- install -m 644 $i %{?buildroot}%{_usr}/share/cmake/Modules
+ install -m 644 $i %{?buildroot}%{cmake_modules_dir}
done
%clean
@@ -94,7 +97,7 @@ done
%{_libdir}/*.so
%{_libdir}/*.la
%{_libdir}/pkgconfig/*.pc
-%{_usr}/share/cmake/Modules/*.cmake
+%{cmake_modules_dir}/*.cmake
%changelog
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index e665696e7..c7e369e28 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -2,6 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
+%define release 0
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -12,7 +13,7 @@
Name: trinity-kdebase
Version: %{version}
-Release: 0%{?dist}%{?_variant}
+Release: %{?release}%{?dist}%{?_variant}
License: GPL
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
@@ -34,6 +35,7 @@ BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel
BuildRequires: trinity-kdelibs-devel
BuildRequires: qt3-devel >= 3.3.8d
+BuildRequires: cmake >= 2.8
BuildRequires: openssl-devel
BuildRequires: avahi-devel avahi-qt3-devel
BuildRequires: imake
@@ -136,6 +138,9 @@ Protocol handlers (KIOslaves) for personal information management, including:
%patch5 -p1
%patch6 -p1
+# Gets the cmake modules in current build directory
+%__mkdir_p cmake/modules
+%__cp -f %{_datadir}/cmake/*.* cmake/modules
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index 569f1942d..052e51b12 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -71,6 +71,10 @@ format for easy browsing
%prep
%setup -q -n kdelibs
+# Gets the cmake modules in current build directory
+%__mkdir_p cmake/modules
+%__cp -f %{_datadir}/cmake/*.* cmake/modules
+
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh