| 0c8b974d | 2014-10-26 05:04:55 | François Andriot |
RPM Packaging: update tdegraphics |
||
|
M redhat/applications/kpilot/kpilot-14.0.0.spec M redhat/applications/tde-guidance/tde-guidance-14.0.0.spec M redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec M redhat/tdebase/tdebase-14.0.0.spec M redhat/tdegraphics/tdegraphics-14.0.0.spec M redhat/tdewebdev/tdewebdev-14.0.0.spec |
||
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index 3ae6d12..dfdca66 100644
--- a/redhat/applications/kpilot/kpilot-14.0.0.spec
+++ b/redhat/applications/kpilot/kpilot-14.0.0.spec
@@ -49,7 +49,7 @@
BuildRequires: desktop-file-utils
# FLEX
-%if 0%{?suse_version} || 0%{?mgaversion}
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?rhel}
BuildRequires: flex
%else
BuildRequires: flex-devel
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 3f54995..4a835ee 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -59,15 +59,15 @@
BuildRequires: gcc-c++
# SIP support
-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
# PYTHON-QT support
-BuildRequires: trinity-python-tqt-devel
+BuildRequires: python-tqt-devel
BuildRequires: trinity-python-trinity-devel
BuildRequires: trinity-pytqt-tools
-Requires: trinity-python-tqt
+Requires: python-tqt
Requires: trinity-python-trinity
Requires: trinity-pytdeextensions
Requires: python
@@ -125,10 +125,10 @@
# Files from powermanager
%if 0%{?with_powermanager}
%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%endif
%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
%exclude %{tde_datadir}/apps/guidance/pics/processor.png
+%endif
%post
touch --no-create %{tde_datadir}/icons/crystalsvg || :
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
index 99c52e1..581d142 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
@@ -47,17 +47,17 @@
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-python-tqt-devel
+BuildRequires: python-tqt-devel >= %{?epoch:%{epoch}:}3.18.1
BuildRequires: trinity-python-trinity-devel
BuildRequires: trinity-pytqt-tools
-Requires: trinity-python-tqt
+Requires: python-tqt
Requires: trinity-python-trinity
Requires: trinity-libpythonize0 = %{version}-%{release}
# 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: trinity-pykdeextensions < %{version}-%{release}
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 7b786d1..cbca91d 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -44,7 +44,7 @@
Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: Trinity Base Programs
-Group: User Interface/Desktops
+Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
@@ -111,6 +111,11 @@
%if 0%{?suse_version}
# for set_permissions macro
PreReq: permissions
+%endif
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs} && 0%{?suse_version}
@@ -609,7 +614,7 @@
%package devel
Summary: %{summary} - Development files
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: %{name} = %{version}-%{release}
Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10
Requires: trinity-tdelibs-devel >= %{tde_version}
@@ -646,7 +651,7 @@
%package tdeio-pim-plugins
Summary: PIM TDEIOslaves from %{name}
-Group: Environment/Libraries
+Group: System/GUI/Other
Provides: trinity-kdebase-pim-ioslaves = %{version}-%{release}
Obsoletes: trinity-kdebase-pim-ioslaves < %{version}-%{release}
@@ -685,7 +690,7 @@
%package runtime-data-common
Summary: Shared common files for Trinity and KDE4
-Group: Environment/Libraries
+Group: System/GUI/Other
Provides: tdebase-runtime-data-common = %{version}-%{release}
Obsoletes: tdebase-runtime-data-common < %{version}-%{release}
@@ -726,7 +731,7 @@
%package -n trinity-kappfinder
Summary: Non-TDE application finder for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-kappfinder
@@ -759,7 +764,7 @@
%package -n trinity-libkateinterfaces
Summary: Common libraries used by kwrite and kate
-Group: Environment/Libraries
+Group: System/GUI/Other
%description -n trinity-libkateinterfaces
%{summary}.
@@ -778,7 +783,7 @@
%package -n trinity-kate
Summary: Advanced text editor for TDE
-Group: Applications/Text
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: trinity-kwrite = %{version}-%{release}
Requires: trinity-libkateinterfaces = %{version}-%{release}
@@ -839,7 +844,7 @@
%package -n trinity-kate-devel
Summary: Development files for kate
-Group: Development/Libraries
+Group: System/GUI/Other
Requires: trinity-kate = %{version}-%{release}
%description -n trinity-kate-devel
@@ -863,7 +868,7 @@
%package -n trinity-kwrite
Summary: Advanced text editor for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: trinity-libkateinterfaces = %{version}-%{release}
@@ -902,7 +907,7 @@
%package -n trinity-kcontrol
Summary: Control center for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
# Requires 'usb.ids'
@@ -1201,7 +1206,7 @@
%package -n trinity-kcontrol-devel
Summary: Development files for kcontrol
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-kcontrol = %{version}-%{release}
%description -n trinity-kcontrol-devel
@@ -1222,7 +1227,7 @@
%package bin
Summary: Core binaries for the TDE base module
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: pam
@@ -1362,7 +1367,7 @@
%package bin-devel
Summary: Development files for core binaries for the TDE base module
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: %{name}-bin = %{version}-%{release}
Obsoletes: tdebase-bin-devel < %{version}-%{release}
@@ -1386,7 +1391,7 @@
%package data
Summary: Shared data files for the TDE base module
-Group: Environment/Libraries
+Group: System/GUI/Other
Requires: %{name}-runtime-data-common = %{version}-%{release}
Obsoletes: tdebase-data < %{version}-%{release}
@@ -1694,7 +1699,7 @@
%package tdeio-plugins
Summary: Core I/O slaves for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: trinity-kdesktop = %{version}-%{release}
Requires: cyrus-sasl
Requires: psmisc
@@ -1867,7 +1872,7 @@
%package -n trinity-tdepasswd
Summary: Password changer for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Obsoletes: trinity-kdepasswd < %{version}-%{release}
Provides: trinity-kdepasswd = %{version}-%{release}
@@ -1925,7 +1930,7 @@
%package -n trinity-tdeprint
Summary: Print system for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: psutils
@@ -2002,7 +2007,7 @@
%package -n trinity-kdesktop
Summary: Miscellaneous binaries and files for the TDE desktop
-Group: Applications/Utilities
+Group: System/GUI/Other
** Diff limit reached (max: 250 lines) **
|
||