summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-27 06:57:59 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-27 06:57:59 +0100
commitf75e8edaa10670760752423d4061a020062167da (patch)
tree3ca2fbdff00f933ed69afd0de88f0209f34819f8
parent3559f9d85a1ff3956b654faf45f333093148a041 (diff)
downloadtde-packaging-f75e8edaa10670760752423d4061a020062167da.tar.gz
tde-packaging-f75e8edaa10670760752423d4061a020062167da.zip
RPM Packaging: update R14 packages
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-14.0.0.spec3
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec43
-rw-r--r--redhat/tdemultimedia/tdemultimedia-14.0.0.spec4
3 files changed, 37 insertions, 13 deletions
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index d950d847b..031b326c5 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -152,9 +152,6 @@ This package contains the development files.
# Fix empty ChangeLog cause invalid macro in 'configure.ac'
echo "%{name} (%{version})" >ChangeLog
-# Fix invalid return value
-sed -i "src/get-carddav-report.c" -e "89s/TRUE/NULL/"
-
./autogen.sh
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
index 22e50b160..a93b07673 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
@@ -82,6 +82,9 @@ Requires: trinity-tdewebdev >= %{version}
Group: User Interface/Desktops
Summary: Meta-package to install all TDE applications
+# Warning, k9copy requires ffmpeg
+# Warning, tderadio requires libmp3lame
+
Requires: trinity-abakus
Requires: trinity-amarok
Requires: trinity-basket
@@ -133,7 +136,6 @@ Requires: trinity-koffice-suite
Requires: trinity-konversation
Requires: trinity-kopete-otr
Requires: trinity-kpicosim
-Requires: trinity-kpilot
Requires: trinity-krecipes
Requires: trinity-krename
Requires: trinity-krusader
@@ -154,7 +156,6 @@ Requires: trinity-kvpnc
Requires: trinity-mplayerthumbs
Requires: trinity-piklab
Requires: trinity-potracegui
-Requires: trinity-rosegarden
Requires: trinity-smb4k
Requires: trinity-smartcardauth
Requires: trinity-soundkonverter
@@ -167,12 +168,7 @@ Requires: trinity-tdeio-ftps
Requires: trinity-tdeio-locate
Requires: trinity-tdeio-sword
Requires: trinity-tdeio-umountwrapper
-Requires: trinity-tdenetworkmanager
-Requires: trinity-tdepowersave
Requires: trinity-tderadio
-%if 0%{?pclinuxos} == 0
-Requires: trinity-tdesudo
-%endif
Requires: trinity-tdesvn
Requires: trinity-tdmtheme
Requires: trinity-tellico
@@ -181,8 +177,32 @@ Requires: trinity-twin-style-crystal
Requires: trinity-wlassistant
Requires: trinity-yakuake
-# Obsolete stuff in R14
+# PCLinuxOS does not have sudo ...
+%if 0%{?pclinuxos} == 0
+Requires: trinity-tdesudo
+%endif
+
+# RHEL5: pilot library is too old
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+Requires: trinity-kpilot
+%endif
+
+# Network management
+# RHEL 6 and openSUSE 11.x: knetworkmanager8
+%if 0%{?rhel} == 6
+Requires: trinity-knetworkmanager
+%endif
+%if 0%{?suse_version} && 0%{?suse_version} <= 1140
+Requires: trinity-knetworkmanager
+%endif
+# Other distros use tdenetworkmanager (since R14)
+%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+Requires: trinity-tdenetworkmanager
+%endif
+
+# Power management
Obsoletes: trinity-tde-guidance-powermanager
+Requires: trinity-tdepowersave
# Decoration-related stuff (not installed by default)
#Requires: trinity-kgtk-qt3
@@ -190,6 +210,12 @@ Obsoletes: trinity-tde-guidance-powermanager
#Requires: trinity-gtk3-tqt-engine
#Requires: trinity-qt4-tqt-theme-engine
+# On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
+%if 0%{?rhel} == 5 || 0%{?rhel} == 7
+%else
+Requires: trinity-rosegarden
+%endif
+
# Compiz-related stuff does not work (obsolete)
#Requires: trinity-compizconfig-backend-kconfig
#Requires: trinity-desktop-effects-kde
@@ -265,6 +291,7 @@ Requires: %{name}-devel = %{version}
%package -n trinity-repo
Group: User Interface/Desktops
Summary: Yum configuration files for Trinity
+Requires(pre): coreutils
%description -n trinity-repo
%{summary}
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index db96af80a..38a4f4bda 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -1308,8 +1308,8 @@ popd
%suse_update_desktop_file audiocd
%endif
-# Symlinks duplicate files
-%fdupes -s "%{?buildroot}%{tde_datadir}"
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
%clean