diff options
Diffstat (limited to 'redhat/applications/misc')
7 files changed, 34 insertions, 14 deletions
diff --git a/redhat/applications/misc/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec index 81055418f..9be203a0c 100644 --- a/redhat/applications/misc/bibletime/bibletime.spec +++ b/redhat/applications/misc/bibletime/bibletime.spec @@ -23,7 +23,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg bibletime %define tde_prefix /opt/trinity @@ -105,7 +105,7 @@ texts, write own notes, save, print etc.). ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/misc/fusion-icon/fusion-icon.spec b/redhat/applications/misc/fusion-icon/fusion-icon.spec index 0b25f7563..8f6daee6c 100644 --- a/redhat/applications/misc/fusion-icon/fusion-icon.spec +++ b/redhat/applications/misc/fusion-icon/fusion-icon.spec @@ -1,6 +1,6 @@ # Default version for this component %define tde_pkg fusion-icon -%define tde_version 14.1.3 +%define tde_version 14.1.4 %if "%{?python2_sitelib}" == "" %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") diff --git a/redhat/applications/misc/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec index b8c8e19ed..cf5ce74c7 100644 --- a/redhat/applications/misc/kcmldap/kcmldap.spec +++ b/redhat/applications/misc/kcmldap/kcmldap.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kcmldap %define tde_prefix /opt/trinity @@ -58,7 +58,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} -#BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -172,6 +171,7 @@ This is a TDE control center module to manage TDE connections to Kerberos realms %dir %{tde_datadir}/pixmaps %{tde_datadir}/pixmaps/kcmldapbonding_step1.png %{tde_datadir}/pixmaps/kcmldapbonding_step3.png +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/kcmldap.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldap.mo ########## @@ -191,7 +191,7 @@ This is a small daemon which keeps the LDAP root certificate up to date with the ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -213,6 +213,10 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ +%if 0%{?suse_version} == 1699 + -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ +%endif -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec index d6de3ddc9..d5996eb48 100644 --- a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec +++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kcmldapcontroller %define tde_prefix /opt/trinity @@ -183,7 +183,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -209,6 +209,10 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ +%if 0%{?suse_version} == 1699 + -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ +%endif -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ diff --git a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec index ddd28993b..b367a7625 100644 --- a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec +++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kcmldapmanager %define tde_prefix /opt/trinity @@ -169,7 +169,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -190,6 +190,10 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ +%if 0%{?suse_version} == 1699 + -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ +%endif -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ diff --git a/redhat/applications/misc/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec index cc1a95896..04937d4ef 100644 --- a/redhat/applications/misc/kerberostray/kerberostray.spec +++ b/redhat/applications/misc/kerberostray/kerberostray.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kerberostray %define tde_prefix /opt/trinity @@ -148,7 +148,7 @@ Kerberos ticket manager which sits in the system tray and allows viewing/control ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -169,6 +169,10 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ +%if 0%{?suse_version} == 1699 + -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ +%endif -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ diff --git a/redhat/applications/misc/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec index b36fa33c9..749692e05 100644 --- a/redhat/applications/misc/krecipes/krecipes.spec +++ b/redhat/applications/misc/krecipes/krecipes.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg krecipes %define tde_prefix /opt/trinity @@ -103,7 +103,7 @@ databases. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -151,6 +151,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +for f in %{?buildroot}%{tde_datadir}/locale/*/LC_MESSAGES/%{name}-*.mo; do mv -fv $f ${f%/*}/krecipes.mo; done %find_lang %{tde_pkg} # Fix desktop file location @@ -162,6 +163,9 @@ export PATH="%{tde_bindir}:${PATH}" %suse_update_desktop_file -r krecipes Education Chemistry %endif +# Remove unwanted pixmaps +%__rm -rf "%{buildroot}%{tde_datadir}/pixmaps/" + # Removes duplicate files %fdupes "%{buildroot}%{tde_datadir}" |