| 3559f9d8 | 2014-10-26 13:27:45 | François Andriot |
RPM Packaging: update R14 packages |
||
|
M redhat/applications/tde-guidance/tde-guidance-14.0.0.spec M redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec M redhat/applications/tdepowersave/tdepowersave-14.0.0.spec M redhat/libraries/python-trinity/python-trinity-14.0.0.spec M redhat/tdeartwork/tdeartwork-14.0.0.spec M redhat/tdelibs/tdelibs-14.0.0.spec M redhat/tdemultimedia/tdemultimedia-14.0.0.spec |
||
diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
index 4a835ee..e173201 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -32,7 +32,7 @@
Name: trinity-%{tde_pkg}
Summary: A collection of system administration tools for Trinity
Version: 0.8.0svn20080103
-Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
index a1c9792..5df7945 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
@@ -53,7 +53,7 @@
# NETWORKMANAGER support
%if 0%{?rhel} || 0%{?fedora}
-%if 0%{?fedora} >= 20
+%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
BuildRequires: NetworkManager-devel
Requires: NetworkManager
%else
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index 268c2d3..42b4a21 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -26,7 +26,7 @@
Name: trinity-%{tde_pkg}
Version: 0.7.3
-Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
Summary: Power management applet for Trinityfiles or directories.
License: GPLv2+
diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec
index 4b248ac..4b19fb5 100644
--- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec
+++ b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec
@@ -51,12 +51,12 @@
# PYTHON support
BuildRequires: python
-BuildRequires: trinity-python-tqt-devel
-Requires: trinity-python-tqt
+BuildRequires: python-tqt-devel
+Requires: python-tqt
# SIP
-BuildRequires: trinity-sip4-tqt-devel >= 4.10.5
-Requires: trinity-sip4-tqt >= 4.10.5
+BuildRequires: sip4-tqt-devel >= 4.10.5
+Requires: sip4-tqt >= 4.10.5
Obsoletes: python-trinity < %{version}-%{release}
Provides: python-trinity = %{version}-%{release}
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index c0d5a01..76db53e 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -60,14 +60,17 @@
# XSCREENSAVER support
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?with_xscreensaver}
-%if 0%{?rhel} == 0 || 0%{?rhel} <= 6
+
+%if 0%{?rhel} == 0 || 0%{?rhel} <= 6 || 0%{?with_xscreensaver}
%define with_xscreensaver 1
%if 0%{?mgaversion} || 0%{?mdkversion}
+
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xscrnsaver-devel
%else
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
+
BuildRequires: xscreensaver
BuildRequires: xscreensaver-base
BuildRequires: xscreensaver-extrusion
@@ -534,7 +537,9 @@
%{tde_datadir}/applnk/System/ScreenSavers/epicycle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/eruption.desktop
%{tde_datadir}/applnk/System/ScreenSavers/euler2d.desktop
+%if 0%{?rhel} != 7
%{tde_datadir}/applnk/System/ScreenSavers/extrusion.desktop
+%endif
%{tde_datadir}/applnk/System/ScreenSavers/fadeplot.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fireworkx.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flame.desktop
@@ -632,41 +637,34 @@
%{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop
%endif
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?fedora} >= 15 || 0%{?pclinuxos}
%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
%endif
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?rhel} >= 7 || 0%{?fedora} >= 15 || 0%{?pclinuxos}
%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
%endif
-%if 0%{?fedora} >= 15 || 0%{?pclinuxos}
-%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
-%endif
-
-%if 0%{?fedora} >= 18 || 0%{?pclinuxos} || 0%{?mgaversion} >= 4
+%if 0%{?fedora} >= 18 || 0%{?pclinuxos} || 0%{?mgaversion} >= 4 || 0%{?rhel} >= 7
%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
%{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
%endif
-%if 0%{?fedora} >= 20 || 0%{?mgaversion} >= 4
+%if 0%{?fedora} >= 20 || 0%{?mgaversion} >= 4 || 0%{?rhel} >= 7
%{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop
%endif
-%if 0%{?fedora} >= 20
+%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop
%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop
+%endif
+
+%if 0%{?fedora} >= 20
%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop
%endif
@@ -674,7 +672,7 @@
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index bbc25d7..4071cb3 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -550,7 +550,7 @@
##########
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index 1e0fb1b..db96af8 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -1212,7 +1212,7 @@
##########
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
|
||
| f75e8eda | 2014-10-27 00:57:59 | François Andriot |
RPM Packaging: update R14 packages |
||
|
M redhat/dependencies/libcarddav/libcarddav-14.0.0.spec M redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec M redhat/tdemultimedia/tdemultimedia-14.0.0.spec |
||
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index d950d84..031b326 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -152,9 +152,6 @@
# 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 22e50b1..a93b076 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 @@
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-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-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-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,14 +177,44 @@
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
+
** Diff limit reached (max: 250 lines) **
|
||
| c5819e7d | 2014-10-27 00:58:41 | François Andriot |
merge |
||
|
M debian/lenny/tdenetwork/debian/control M debian/squeeze/tdenetwork/debian/control M ubuntu/maverick/tdenetwork/debian/control |
||
** Diff limit reached (max: 250 lines) ** |
||