RPM packaging: update for R14

4 files changed, 19 insertions, 16 deletions

diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index fd64b2898..081bc1235 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -108,7 +108,7 @@ BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
 %if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_xine 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{pclinuxos}
+%if 0%{?pclinuxos}
 BuildRequires: %{_lib}xine-devel
 %else
 BuildRequires: %{_lib}xine1.2-devel
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index dfdca669f..c21e6f726 100644
--- a/redhat/applications/kpilot/kpilot-14.0.0.spec
+++ b/redhat/applications/kpilot/kpilot-14.0.0.spec
@@ -66,7 +66,7 @@ software does for Windows.  KPilot can back-up and restore your Palm Pilot
 and synchronize the built-in applications with their TDE counterparts.
 
 
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -112,6 +112,11 @@ export PATH="%{tde_bindir}:${PATH}"
 # Unwanted files
 %__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kpilot.desktop          Utility  PDA SyncUtility X-KDE-Utilities-Peripherals
+%suse_update_desktop_file -u -r %{?buildroot}%{tde_tdeappdir}/kpalmdoc.desktop        Utility  PDA X-TDE-Utilities-File
+%endif
 
 
 %clean
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
index a19ade93c..31a80d8be 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
@@ -111,6 +111,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-power.directory
 %__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-system.directory
 
+%__rm -f %{buildroot}%{tde_datadir}/applications/tde/laptop.desktop
+
 %clean
 %__rm -rf %{buildroot}
 
@@ -134,7 +136,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 %{tde_datadir}/applications/tde/audioencoding.desktop
 %{tde_datadir}/applications/tde/defaultapplication.desktop
 %{tde_datadir}/applications/tde/kcm_knetworkconfmodule_ss.desktop
-%{tde_datadir}/applications/tde/laptop.desktop
+#%{tde_datadir}/applications/tde/laptop.desktop
 %{tde_datadir}/applications/tde/medianotifications.desktop
 %{tde_datadir}/applications/tde/systemsettings.desktop
 %{tde_datadir}/apps/systemsettings/systemsettingsui.rc
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
index bff026e15..f22b66404 100644
--- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec
+++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
@@ -112,15 +112,14 @@ This package is part of tdesvn-trinity.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# Moves HTML files to the correect location
-find . -name "*.cmake" -exec %__sed -i {} \
-  -e "s,/doc/HTML,/doc/tde/HTML,g" \
-  \;
+rm -f src/svnqt/CMakeLists.txt.orig
+rm -fr src/svnqt/cache/sqlite3/
+
 
 
 %build
 unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
 
 if ! rpm -E %%cmake|grep -q "cd build"; then
@@ -142,7 +141,6 @@ fi
   -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
-  -DDATA_INSTALL_DIR=%{tde_datadir} \
   -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
@@ -217,11 +215,11 @@ fi
 %{tde_tdelibdir}/tdesvnpart.la
 %{tde_tdelibdir}/tdesvnpart.so
 %{tde_datadir}/applications/tde/tdesvn.desktop
-%{tde_datadir}/tdeconf_update/tdesvn-use-external-update.sh
-%{tde_datadir}/tdeconf_update/tdesvnpartrc-use-external.upd
-%{tde_datadir}/tdesvn/tdesvnui.rc
-%{tde_datadir}/tdesvnpart/tdesvn_part.rc
-%{tde_datadir}/konqueror/servicemenus/tdesvn_subversion.desktop
+%{tde_datadir}/apps/tdeconf_update/tdesvn-use-external-update.sh
+%{tde_datadir}/apps/tdeconf_update/tdesvnpartrc-use-external.upd
+%{tde_datadir}/apps/tdesvn/tdesvnui.rc
+%{tde_datadir}/apps/tdesvnpart/tdesvn_part.rc
+%{tde_datadir}/apps/konqueror/servicemenus/tdesvn_subversion.desktop
 %{tde_datadir}/config.kcfg/tdesvn_part.kcfg
 %{tde_datadir}/icons/hicolor/*/*/*.png
 %{tde_datadir}/icons/hicolor/*/*/*.svgz
@@ -239,8 +237,6 @@ fi
 %{tde_libdir}/libtdesvnevents.so
 %{tde_libdir}/libtdesvnhelpers.la
 %{tde_libdir}/libtdesvnhelpers.so
-#%{tde_datadir}/tdesvn/icons/hicolor/*/apps/tdesvn.png
-#%{tde_datadir}/tdesvn/icons/hicolor/scalable/apps/tdesvn.svgz
 
 %files -n trinity-libsvnqt
 %defattr(-,root,root,-)