| 5c97afc7 | 2015-08-08 11:01:27 | François Andriot |
RPM Packaging: add missing dependencies |
||
|
M redhat/applications/abakus/abakus-14.0.0.spec M redhat/applications/amarok/amarok-14.0.0.spec M redhat/applications/basket/basket-14.0.0.spec M redhat/applications/kbfx/kbfx-14.0.0.spec M redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec M redhat/applications/rosegarden/rosegarden-14.0.0.spec M redhat/applications/smartcardauth/smartcardauth-14.0.0.spec M redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec M redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec M redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec M redhat/applications/tdepowersave/tdepowersave-14.0.0.spec M redhat/applications/tdesvn/tdesvn-14.0.0.spec M redhat/dependencies/akode/akode-14.0.0.spec M redhat/main/tdepim/tdepim-14.0.0.spec |
||
diff --git a/redhat/applications/abakus/abakus-14.0.0.spec b/redhat/applications/abakus/abakus-14.0.0.spec
index fbdac11..ee28da1 100644
--- a/redhat/applications/abakus/abakus-14.0.0.spec
+++ b/redhat/applications/abakus/abakus-14.0.0.spec
@@ -66,6 +66,9 @@
BuildRequires: bison
BuildRequires: flex
+# ACL support
+BuildRequires: libacl-devel
+
# IDN support
BuildRequires: libidn-devel
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index 6b3aaed..d190185 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -71,6 +71,9 @@
BuildRequires: pkgconfig
BuildRequires: gettext
+# ACL support
+BuildRequires: libacl-devel
+
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec
index 940ef94..2dbc9e6 100644
--- a/redhat/applications/basket/basket-14.0.0.spec
+++ b/redhat/applications/basket/basket-14.0.0.spec
@@ -39,7 +39,7 @@
Epoch: %{tde_epoch}
Version: 1.0.3.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary: Taking care of your ideas.
+Summary: Taking care of your ideas
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
diff --git a/redhat/applications/kbfx/kbfx-14.0.0.spec b/redhat/applications/kbfx/kbfx-14.0.0.spec
index eff30b6..8ae6a2b 100644
--- a/redhat/applications/kbfx/kbfx-14.0.0.spec
+++ b/redhat/applications/kbfx/kbfx-14.0.0.spec
@@ -89,6 +89,9 @@
# PCRE support
BuildRequires: pcre-devel
+# ACL support
+BuildRequires: libacl-devel
+
%description
KBFX is an alternative to the classical K-Menu button and its menu.
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
index 011667c..a4b42d0 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
@@ -93,6 +93,9 @@
BuildRequires: gamin-devel
%endif
+# ACL support
+BuildRequires: libacl-devel
+
%description
This is an LD_PRELOAD hack that allows most GTK
diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
index 9140be7..af44cfe 100644
--- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec
+++ b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
@@ -100,6 +100,9 @@
BuildRequires: jack-audio-connection-kit-devel
%endif
+# ACL support
+BuildRequires: libacl-devel
+
# LIRC support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6
%define with_lirc 1
diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
index ec25aee..c97d5fe 100644
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
@@ -56,7 +56,6 @@
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: trinity-%{tde_pkg}-rpmlintrc
-Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -139,9 +138,6 @@
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} != 6
-#patch0 -p1 -b .ftbfs
-%endif
%__sed -i "Makefile" \
-e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g"
diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec
index 33b906c..e812c2f 100644
--- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec
+++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec
@@ -79,6 +79,9 @@
# IDN support
BuildRequires: libidn-devel
+# ACL support
+BuildRequires: libacl-devel
+
# GAMIN support
# Not on openSUSE.
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
diff --git a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
index 7d4ac6c..de9f0e7 100644
--- a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
+++ b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
@@ -76,6 +76,9 @@
BuildRequires: brp-check-trinity
%endif
+# ACL support
+BuildRequires: libacl-devel
+
# IDN support
BuildRequires: libidn-devel
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
index 53039cc..8098b1e 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
@@ -100,10 +100,16 @@
Requires: NetworkManager
%endif
+# ACL support
+BuildRequires: libacl-devel
+
# DBUS support
BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9
BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
+# ACL support
+BuildRequires: libacl-devel
+
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
BuildRequires: libudev-devel
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index 5488e31..f2c36f2 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -107,6 +107,9 @@
%endif
%endif
+# ACL support
+BuildRequires: libacl-devel
+
# IDN support
BuildRequires: libidn-devel
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
index b2fc617..981d534 100644
--- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec
+++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
@@ -83,6 +83,9 @@
BuildRequires: sqlite-devel
BuildRequires: libtqt3-mt-sqlite3
+# ACL support
+BuildRequires: libacl-devel
+
# IDN support
BuildRequires: libidn-devel
diff --git a/redhat/dependencies/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode-14.0.0.spec
index 06231e7..5410dea 100644
--- a/redhat/dependencies/akode/akode-14.0.0.spec
+++ b/redhat/dependencies/akode/akode-14.0.0.spec
@@ -48,7 +48,7 @@
%endif
Name: trinity-akode
-Summary: Audio-decoding framework
+Summary: Audio-decoding framework
Group: System Environment/Libraries
Epoch: %{tde_epoch}
Version: 2.0.2
diff --git a/redhat/main/tdepim/tdepim-14.0.0.spec b/redhat/main/tdepim/tdepim-14.0.0.spec
index 333790f..251f93c 100644
--- a/redhat/main/tdepim/tdepim-14.0.0.spec
+++ b/redhat/main/tdepim/tdepim-14.0.0.spec
@@ -353,7 +353,7 @@
%package -n trinity-kaddressbook
Summary: TDE addressbook application
Group: Applications/Communications
-Requires: trinity-tdebase-pim-ioslaves
+Requires: trinity-tdebase-tdeio-pim-plugins
Requires: %{name}-tderesources = %{version}-%{release}
%description -n trinity-kaddressbook
|
||