From 26d469b405d902b6ba50ae7bf45b940cc6c9d57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 6 Nov 2019 18:26:52 +0100 Subject: RPM: various fixes to build on OBS --- redhat/applications/kasablanca/kasablanca.spec | 6 ++++++ redhat/applications/kchmviewer/kchmviewer.spec | 8 ++++++++ .../kcmldapcontroller/kcmldapcontroller.spec | 11 ++++++++++- .../kcmldapmanager/kcmldapmanager.spec | 9 +++++++++ .../kdbusnotification/kdbusnotification.spec | 9 +++++++++ redhat/applications/kdiff3/kdiff3.spec | 9 +++++++++ redhat/applications/keep/keep.spec | 9 +++++++++ redhat/applications/kerberostray/kerberostray.spec | 9 +++++++++ redhat/applications/kima/kima.spec | 6 ++++++ redhat/applications/knemo/knemo.spec | 23 ++++++++++++++++++++++ redhat/applications/kshowmail/kshowmail.spec | 9 +++++++++ .../applications/smartcardauth/smartcardauth.spec | 16 ++++++++++----- .../tde-style-lipstik/tde-style-lipstik.spec | 6 ++++++ redhat/dependencies/libcarddav/libcarddav.spec | 1 + .../trinity-filesystem/trinity-filesystem.spec | 8 ++++++++ redhat/libraries/libkexiv2/libkexiv2.spec | 7 +++++++ redhat/libraries/libkipi/libkipi.spec | 9 +++++++++ redhat/libraries/libtdeldap/libtdeldap.spec | 9 +++++++++ redhat/main/tdeedu/tdeedu.spec | 18 +++++++++++++++++ 19 files changed, 176 insertions(+), 6 deletions(-) (limited to 'redhat') diff --git a/redhat/applications/kasablanca/kasablanca.spec b/redhat/applications/kasablanca/kasablanca.spec index 7174d4aa5..7ed164475 100644 --- a/redhat/applications/kasablanca/kasablanca.spec +++ b/redhat/applications/kasablanca/kasablanca.spec @@ -77,6 +77,12 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + # OPENSSL support BuildRequires: openssl-devel diff --git a/redhat/applications/kchmviewer/kchmviewer.spec b/redhat/applications/kchmviewer/kchmviewer.spec index 277a3e96f..68e7c71d7 100644 --- a/redhat/applications/kchmviewer/kchmviewer.spec +++ b/redhat/applications/kchmviewer/kchmviewer.spec @@ -83,6 +83,14 @@ BuildRequires: brp-check-trinity BuildRequires: chmlib-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel %description KchmViewer is a chm (MS HTML help file format) viewer, written in C++. diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec index 9885301cb..4039f823e 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec @@ -116,6 +116,15 @@ BuildRequires: libcom_err-devel BuildRequires: %{_lib}ext2fs-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + Requires: trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release} @@ -137,7 +146,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{tde_bindir}/primaryrccertupdater -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel} >= 7 %{tde_libdir}/slapi-acl-manager.la %{tde_libdir}/slapi-acl-manager.so %endif diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/kcmldapmanager/kcmldapmanager.spec index 583961bd6..a43701a3c 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager.spec @@ -113,6 +113,15 @@ BuildRequires: libcom_err-devel BuildRequires: %{_lib}ext2fs-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + Requires: trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release} diff --git a/redhat/applications/kdbusnotification/kdbusnotification.spec b/redhat/applications/kdbusnotification/kdbusnotification.spec index 040367aa6..7e55a7880 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification.spec @@ -84,6 +84,15 @@ BuildRequires: dbus-1-glib-devel BuildRequires: dbus-glib-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description kdbusnotification is a small program for Trinity that displays diff --git a/redhat/applications/kdiff3/kdiff3.spec b/redhat/applications/kdiff3/kdiff3.spec index aa1a854a7..5251ba96e 100644 --- a/redhat/applications/kdiff3/kdiff3.spec +++ b/redhat/applications/kdiff3/kdiff3.spec @@ -70,6 +70,15 @@ BuildRequires: libtool BuildRequires: update-desktop-files %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description Shows the differences line by line and character by character (!). diff --git a/redhat/applications/keep/keep.spec b/redhat/applications/keep/keep.spec index 2afb9b1ca..e5f53ef78 100644 --- a/redhat/applications/keep/keep.spec +++ b/redhat/applications/keep/keep.spec @@ -77,6 +77,15 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + Requires: rdiff-backup diff --git a/redhat/applications/kerberostray/kerberostray.spec b/redhat/applications/kerberostray/kerberostray.spec index c73827101..043d884d1 100644 --- a/redhat/applications/kerberostray/kerberostray.spec +++ b/redhat/applications/kerberostray/kerberostray.spec @@ -113,6 +113,15 @@ BuildRequires: libcom_err-devel BuildRequires: %{_lib}ext2fs-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description Kerberos ticket manager which sits in the system tray and allows viewing/control of Kerberos tickets diff --git a/redhat/applications/kima/kima.spec b/redhat/applications/kima/kima.spec index 646b79704..ecbbe5e60 100644 --- a/redhat/applications/kima/kima.spec +++ b/redhat/applications/kima/kima.spec @@ -83,6 +83,12 @@ BuildRequires: brp-check-trinity BuildRequires: libudev-devel %endif +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description This applet monitors various temperature, diff --git a/redhat/applications/knemo/knemo.spec b/redhat/applications/knemo/knemo.spec index d3e474bf1..5f4e1b5e4 100644 --- a/redhat/applications/knemo/knemo.spec +++ b/redhat/applications/knemo/knemo.spec @@ -88,6 +88,29 @@ BuildRequires: net-tools-deprecated Requires: net-tools-deprecated %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + +# Wireless support +%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 +BuildRequires: wireless-tools-devel +%endif +%if 0%{?mgaversion} == 2 || 0%{?mdkversion} +BuildRequires: %{_lib}iw29-devel +%endif +%if 0%{?rhel} == 5 || 0%{?suse_version} +BuildRequires: wireless-tools +%endif +%if 0%{?suse_version} || 0%{?mgaversion} >= 3 +BuildRequires: libiw-devel +%endif + %description KNemo displays an icon in the systray for every network interface. diff --git a/redhat/applications/kshowmail/kshowmail.spec b/redhat/applications/kshowmail/kshowmail.spec index 637ebf411..bde79c7a3 100644 --- a/redhat/applications/kshowmail/kshowmail.spec +++ b/redhat/applications/kshowmail/kshowmail.spec @@ -76,6 +76,15 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description Very simply kshowmail is a program that allows you to look in on your mail server, diff --git a/redhat/applications/smartcardauth/smartcardauth.spec b/redhat/applications/smartcardauth/smartcardauth.spec index 072d5b6c7..1cb4a1be3 100644 --- a/redhat/applications/smartcardauth/smartcardauth.spec +++ b/redhat/applications/smartcardauth/smartcardauth.spec @@ -82,7 +82,7 @@ BuildRequires: brp-check-trinity %endif # PCSC support -%if 0%{?mgaversion} || 0%{?mdkversion} || 9%{?pclinuxos} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} Requires: perl-pcsc-perl %endif %if 0%{?rhel} || 0%{?fedora} @@ -167,10 +167,6 @@ in addition to the PKCS certificate functionality unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if [ -x "%{_libdir}/nss/unsupported-tools/pp" ]; then - PATH="%{_libdir}/nss/unsupported-tools:${PATH}" -fi - if ! rpm -E %%cmake|grep -q "cd build"; then %__mkdir_p build cd build @@ -193,6 +189,9 @@ fi %endif %if 0%{?mgaversion} == 6 || 0%{?pclinuxos} -DPERL_LIB_CHIPCARD="%{perl_sitearch}" \ +%endif +%if 0%{?suse_version} + -DPERL_LIB_CHIPCARD="%{perl_vendorarch}" \ %endif \ -DBUILD_ALL=ON \ @@ -209,6 +208,12 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR="%{?buildroot}" -C build +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file smartcardauth System Security +%suse_update_desktop_file smartcardrestrict System Security +%endif + %clean %__rm -rf %{buildroot} @@ -230,6 +235,7 @@ export PATH="%{tde_bindir}:${PATH}" %{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png %{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png %{_sysconfdir}/smartauth/ +%dir %{_sysconfdir}/init %{_sysconfdir}/init/smartauthlogin.conf diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec index 9b1d185a9..e699e1c48 100644 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec +++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec @@ -80,6 +80,12 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description Based on the plastik style, Lipstik is a purified style with many options to diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index de5d69bed..1c690710d 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -55,6 +55,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: cmake >= 2.8 +BuildRequires: gcc-c++ BuildRequires: make BuildRequires: libtool diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec index 3385dd5c0..12603317b 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec @@ -117,6 +117,10 @@ This package installs the Trinity directory structure. %dir %{tde_datadir}/services %dir %{tde_datadir}/services/* %dir %{tde_datadir}/servicetypes +%dir %{tde_datadir}/tdedisplay +%dir %{tde_datadir}/tdedisplay/* +%dir %{tde_datadir}/tdestyle +%dir %{tde_datadir}/tdestyle/* %dir %{tde_datadir}/X11 %dir %{tde_datadir}/X11/xkb %dir %{tde_datadir}/X11/xkb/symbols @@ -209,6 +213,10 @@ This package installs the Trinity directory structure. %__install -d -m 755 %{?buildroot}%{tde_datadir}/services %__install -d -m 755 %{?buildroot}%{tde_datadir}/services/tdeconfiguredialog %__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes +%__install -d -m 755 %{?buildroot}%{tde_datadir}/tdedisplay +%__install -d -m 755 %{?buildroot}%{tde_datadir}/tdedisplay/color-schemes +%__install -d -m 755 %{?buildroot}%{tde_datadir}/tdestyle +%__install -d -m 755 %{?buildroot}%{tde_datadir}/tdestyle/themes %__install -d -m 755 %{?buildroot}%{tde_datadir}/X11/xkb/symbols %__install -d -m 755 %{?buildroot}%{tde_datadir}/wallpapers diff --git a/redhat/libraries/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec index ce0ecd529..bed76d899 100644 --- a/redhat/libraries/libkexiv2/libkexiv2.spec +++ b/redhat/libraries/libkexiv2/libkexiv2.spec @@ -82,6 +82,13 @@ BuildRequires: exiv2-devel BuildRequires: libexiv2-devel %endif +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + + %description libkexif2 contains the library of libkexiv2. Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. diff --git a/redhat/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec index 5c8e49c4f..5be3e1bdb 100644 --- a/redhat/libraries/libkipi/libkipi.spec +++ b/redhat/libraries/libkipi/libkipi.spec @@ -82,6 +82,15 @@ BuildRequires: lcms-devel # JPEG support BuildRequires: libjpeg-devel +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + # CMAKE BuildRequires: cmake >= 2.8 diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec index 32c88b4a9..da2f61341 100644 --- a/redhat/libraries/libtdeldap/libtdeldap.spec +++ b/redhat/libraries/libtdeldap/libtdeldap.spec @@ -115,6 +115,15 @@ BuildRequires: libcom_err-devel BuildRequires: %{_lib}ext2fs-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description LDAP interface library for TDE management modules. diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec index aaf41572f..5c958275e 100644 --- a/redhat/main/tdeedu/tdeedu.spec +++ b/redhat/main/tdeedu/tdeedu.spec @@ -78,6 +78,24 @@ BuildRequires: brp-check-trinity BuildRequires: gcc-c++ BuildRequires: fdupes +BuildRequires: doxygen + +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + +# LIBUSB support +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}usb1.0-devel +BuildRequires: %{_lib}usb-compat0.1-devel +%else +BuildRequires: libusb-devel +%endif # PYTHON support %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 -- cgit v1.2.1