RPM: various fixes to build on OBS

pull/92/head
François Andriot 5 years ago
parent 4ec2dd7262
commit 26d469b405

@ -77,6 +77,12 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity BuildRequires: brp-check-trinity
%endif %endif
# ACL support
BuildRequires: libacl-devel
# IDN support
BuildRequires: libidn-devel
# OPENSSL support # OPENSSL support
BuildRequires: openssl-devel BuildRequires: openssl-devel

@ -83,6 +83,14 @@ BuildRequires: brp-check-trinity
BuildRequires: chmlib-devel BuildRequires: chmlib-devel
%endif %endif
# ACL support
BuildRequires: libacl-devel
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
%description %description
KchmViewer is a chm (MS HTML help file format) viewer, written in C++. KchmViewer is a chm (MS HTML help file format) viewer, written in C++.

@ -116,6 +116,15 @@ BuildRequires: libcom_err-devel
BuildRequires: %{_lib}ext2fs-devel BuildRequires: %{_lib}ext2fs-devel
%endif %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} 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,-) %defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING %doc AUTHORS ChangeLog COPYING
%{tde_bindir}/primaryrccertupdater %{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.la
%{tde_libdir}/slapi-acl-manager.so %{tde_libdir}/slapi-acl-manager.so
%endif %endif

@ -113,6 +113,15 @@ BuildRequires: libcom_err-devel
BuildRequires: %{_lib}ext2fs-devel BuildRequires: %{_lib}ext2fs-devel
%endif %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} Requires: trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release}

@ -84,6 +84,15 @@ BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-glib-devel BuildRequires: dbus-glib-devel
%endif %endif
# ACL support
BuildRequires: libacl-devel
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
%description %description
kdbusnotification is a small program for Trinity that displays kdbusnotification is a small program for Trinity that displays

@ -70,6 +70,15 @@ BuildRequires: libtool
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
%endif %endif
# ACL support
BuildRequires: libacl-devel
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
%description %description
Shows the differences line by line and character by character (!). Shows the differences line by line and character by character (!).

@ -77,6 +77,15 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity BuildRequires: brp-check-trinity
%endif %endif
# ACL support
BuildRequires: libacl-devel
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
Requires: rdiff-backup Requires: rdiff-backup

@ -113,6 +113,15 @@ BuildRequires: libcom_err-devel
BuildRequires: %{_lib}ext2fs-devel BuildRequires: %{_lib}ext2fs-devel
%endif %endif
# ACL support
BuildRequires: libacl-devel
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
%description %description
Kerberos ticket manager which sits in the system tray and allows viewing/control of Kerberos tickets Kerberos ticket manager which sits in the system tray and allows viewing/control of Kerberos tickets

@ -83,6 +83,12 @@ BuildRequires: brp-check-trinity
BuildRequires: libudev-devel BuildRequires: libudev-devel
%endif %endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
%description %description
This applet monitors various temperature, This applet monitors various temperature,

@ -88,6 +88,29 @@ BuildRequires: net-tools-deprecated
Requires: net-tools-deprecated Requires: net-tools-deprecated
%endif %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 %description
KNemo displays an icon in the systray for every network interface. KNemo displays an icon in the systray for every network interface.

@ -76,6 +76,15 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity BuildRequires: brp-check-trinity
%endif %endif
# ACL support
BuildRequires: libacl-devel
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
%description %description
Very simply kshowmail is a program that allows you to look in on your mail server, Very simply kshowmail is a program that allows you to look in on your mail server,

@ -82,7 +82,7 @@ BuildRequires: brp-check-trinity
%endif %endif
# PCSC support # PCSC support
%if 0%{?mgaversion} || 0%{?mdkversion} || 9%{?pclinuxos} %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
Requires: perl-pcsc-perl Requires: perl-pcsc-perl
%endif %endif
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
@ -167,10 +167,6 @@ in addition to the PKCS certificate functionality
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" 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 if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build
@ -193,6 +189,9 @@ fi
%endif %endif
%if 0%{?mgaversion} == 6 || 0%{?pclinuxos} %if 0%{?mgaversion} == 6 || 0%{?pclinuxos}
-DPERL_LIB_CHIPCARD="%{perl_sitearch}" \ -DPERL_LIB_CHIPCARD="%{perl_sitearch}" \
%endif
%if 0%{?suse_version}
-DPERL_LIB_CHIPCARD="%{perl_vendorarch}" \
%endif %endif
\ \
-DBUILD_ALL=ON \ -DBUILD_ALL=ON \
@ -209,6 +208,12 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR="%{?buildroot}" -C build %__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 %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
@ -230,6 +235,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png %{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
%{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png %{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
%{_sysconfdir}/smartauth/ %{_sysconfdir}/smartauth/
%dir %{_sysconfdir}/init
%{_sysconfdir}/init/smartauthlogin.conf %{_sysconfdir}/init/smartauthlogin.conf

@ -80,6 +80,12 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity BuildRequires: brp-check-trinity
%endif %endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
%description %description
Based on the plastik style, Lipstik is a purified style with many options to Based on the plastik style, Lipstik is a purified style with many options to

@ -55,6 +55,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: make BuildRequires: make
BuildRequires: libtool BuildRequires: libtool

@ -117,6 +117,10 @@ This package installs the Trinity directory structure.
%dir %{tde_datadir}/services %dir %{tde_datadir}/services
%dir %{tde_datadir}/services/* %dir %{tde_datadir}/services/*
%dir %{tde_datadir}/servicetypes %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
%dir %{tde_datadir}/X11/xkb %dir %{tde_datadir}/X11/xkb
%dir %{tde_datadir}/X11/xkb/symbols %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
%__install -d -m 755 %{?buildroot}%{tde_datadir}/services/tdeconfiguredialog %__install -d -m 755 %{?buildroot}%{tde_datadir}/services/tdeconfiguredialog
%__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes %__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}/X11/xkb/symbols
%__install -d -m 755 %{?buildroot}%{tde_datadir}/wallpapers %__install -d -m 755 %{?buildroot}%{tde_datadir}/wallpapers

@ -82,6 +82,13 @@ BuildRequires: exiv2-devel
BuildRequires: libexiv2-devel BuildRequires: libexiv2-devel
%endif %endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
%description %description
libkexif2 contains the library of libkexiv2. libkexif2 contains the library of libkexiv2.
Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.

@ -82,6 +82,15 @@ BuildRequires: lcms-devel
# JPEG support # JPEG support
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
# ACL support
BuildRequires: libacl-devel
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
# CMAKE # CMAKE
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8

@ -115,6 +115,15 @@ BuildRequires: libcom_err-devel
BuildRequires: %{_lib}ext2fs-devel BuildRequires: %{_lib}ext2fs-devel
%endif %endif
# ACL support
BuildRequires: libacl-devel
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
%description %description
LDAP interface library for TDE management modules. LDAP interface library for TDE management modules.

@ -78,6 +78,24 @@ BuildRequires: brp-check-trinity
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: fdupes 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 # PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500

Loading…
Cancel
Save