summaryrefslogtreecommitdiffstats
path: root/redhat/kdesdk
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-08-09 12:08:44 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-08-09 12:08:44 +0200
commit1ba5d654bf6727176acecf598267568e1764a360 (patch)
tree0350f793dba4ab45601244d5478d8ed559394a14 /redhat/kdesdk
parentf07d66d3a500f97e3feb957bd024633b72861cc1 (diff)
downloadtde-packaging-1ba5d654bf6727176acecf598267568e1764a360.tar.gz
tde-packaging-1ba5d654bf6727176acecf598267568e1764a360.zip
RHEL/Fedora: fix packaging for base packages, for MGA/MDV
Diffstat (limited to 'redhat/kdesdk')
-rw-r--r--redhat/kdesdk/trinity-kdesdk-3.5.12.spec6
-rw-r--r--redhat/kdesdk/trinity-kdesdk-3.5.13.spec18
2 files changed, 13 insertions, 11 deletions
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
index 7458317d2..ded3104de 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
@@ -188,9 +188,11 @@ for f in crystalsvg hicolor locolor ; do
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
%files
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
index 6d5ee5cde..b28a83ac8 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
@@ -52,7 +52,7 @@ BuildRequires: trinity-tdelibs-devel
# for kbugbuster/libkcal
BuildRequires: trinity-tdepim-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}db5.1-devel
+#BuildRequires: %{_lib}db4.8-devel
%else
BuildRequires: db4-devel
%endif
@@ -345,7 +345,7 @@ This package contains the KBabel development files.
This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-kbabel-devel
-%{tde_includedir}/kbabel/
+%{tde_tdeincludedir}/kbabel/
%{tde_libdir}/libkbabelcommon.la
%{tde_libdir}/libkbabelcommon.so
%{tde_libdir}/libkbabeldictplugin.la
@@ -505,7 +505,7 @@ Included are:
This package is part of Trinity, and a component of the TDE SDK module.
%files misc
-%{tde_includedir}/kprofilemethod.h
+%{tde_tdeincludedir}/kprofilemethod.h
%{tde_tdelibdir}/kabcformat_kdeaccounts.la
%{tde_tdelibdir}/kabcformat_kdeaccounts.so
%{tde_tdelibdir}/scheck.so
@@ -716,7 +716,7 @@ loaded dynamically using KLibLoader.
This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-kspy
-%{tde_includedir}/kspy.h
+%{tde_tdeincludedir}/kspy.h
%{tde_libdir}/libkspy.la
%{tde_libdir}/libkspy.so
%{tde_libdir}/libkspy.so.*
@@ -822,9 +822,9 @@ Development files for libcvsservice are included in this package.
This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-libcvsservice-devel
-%{tde_includedir}/cvsjob_stub.h
-%{tde_includedir}/cvsservice_stub.h
-%{tde_includedir}/repository_stub.h
+%{tde_tdeincludedir}/cvsjob_stub.h
+%{tde_tdeincludedir}/cvsservice_stub.h
+%{tde_tdeincludedir}/repository_stub.h
%{tde_libdir}/libcvsservice.la
%{tde_libdir}/libcvsservice.so
%{tde_libdir}/lib[kt]deinit_cvsaskpass.la
@@ -1003,7 +1003,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_libdir}/libkunittestgui.la
%{tde_libdir}/libkunittestgui.so
#%{tde_libdir}/libkunittestgui.so.*
-%{tde_includedir}/kunittest/runnergui.h
+%{tde_tdeincludedir}/kunittest/runnergui.h
%post -n trinity-kunittest
/sbin/ldconfig || :
@@ -1053,7 +1053,7 @@ cd build
%cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
-DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \