From 8d17db2e0995db07518fec7e5fd3a568e9da769c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 4 Sep 2018 21:44:28 +0200 Subject: RPM: update packages for PCLinuxOS 2018 --- redhat/applications/bibletime/bibletime-14.0.0.spec | 5 +++++ redhat/applications/digikam/digikam-14.0.0.spec | 6 +++--- .../kcmldapcontroller/kcmldapcontroller-14.0.0.spec | 6 ++++++ redhat/applications/koffice/koffice-14.0.0.spec | 19 +++++++++++++++---- redhat/applications/kopete-otr/kopete-otr-14.0.0.spec | 5 +++-- .../kstreamripper/kstreamripper-14.0.0.spec | 8 -------- redhat/applications/kvirc/kvirc-14.0.0.spec | 2 +- redhat/applications/piklab/piklab-14.0.0.spec | 4 ++-- redhat/applications/qalculate-tde/qalculate-tde.spec | 3 +++ .../applications/tdeio-sword/tdeio-sword-14.0.0.spec | 5 +++++ .../tdenetworkmanager/tdenetworkmanager-14.0.0.spec | 2 ++ redhat/applications/tderadio/tderadio-14.0.0.spec | 2 +- 12 files changed, 46 insertions(+), 21 deletions(-) (limited to 'redhat/applications') diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec index 39142c59a..c6a0991a1 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime-14.0.0.spec @@ -15,6 +15,11 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # +# Required for PCLinuxOS: removes the ldflag '--no-undefined' +%if 0%{?pclinuxos} +%define _disable_ld_no_undefined 1 +%endif + # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec index 9be888095..dc95cb8c7 100644 --- a/redhat/applications/digikam/digikam-14.0.0.spec +++ b/redhat/applications/digikam/digikam-14.0.0.spec @@ -84,7 +84,7 @@ BuildRequires: brp-check-trinity %endif # LCMS support -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?rhel} >= 7 BuildRequires: liblcms-devel %else BuildRequires: lcms-devel @@ -308,9 +308,9 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %lang(nl) %{tde_tdedocdir}/HTML/nl/digikam/ %lang(nl) %{tde_tdedocdir}/HTML/nl/showfoto/ %lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/digikam/ -#%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/ +#lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/ %lang(ru) %{tde_tdedocdir}/HTML/ru/digikam/ -#%lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/ +#lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/ %lang(sv) %{tde_tdedocdir}/HTML/sv/digikam/ %lang(sv) %{tde_tdedocdir}/HTML/sv/showfoto/ diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec index 784e05593..88a889e4e 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec @@ -134,8 +134,10 @@ 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%{?pclinuxos} == 0 %{tde_libdir}/slapi-acl-manager.la %{tde_libdir}/slapi-acl-manager.so +%endif %{tde_tdelibdir}/kcm_ldapcontroller.la %{tde_tdelibdir}/kcm_ldapcontroller.so %{tde_tdeappdir}/ldapcontroller.desktop @@ -155,6 +157,10 @@ This is a TDE control center module to manage users, groups, and machines in Ker %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%if 0%{?pclinuxos} +%__rm -rf acl-updater +%endif + %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index 1404ebb31..ce0cec112 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -113,16 +113,27 @@ BuildRequires: OpenEXR-devel BuildRequires: libexif-devel BuildRequires: readline-devel +# LCMS support +%if 0%{?suse_version} || 0%{?rhel} >= 7 +BuildRequires: liblcms-devel +%else +BuildRequires: lcms-devel +%endif + +# LCMS2 support %if 0%{?suse_version} -BuildRequires: libbz2-devel -BuildRequires: liblcms-devel BuildRequires: liblcms2-devel +%endif + +# BZIP2 support +%if 0%{?suse_version} +BuildRequires: libbz2-devel %else BuildRequires: bzip2-devel -BuildRequires: lcms-devel +%endif +# PAPER support BuildRequires: libpaper-devel -%endif # RUBY support %if 0%{?with_ruby} diff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec index 4f58698e2..602ab32c3 100644 --- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec +++ b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec @@ -33,9 +33,10 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# Required for Mageia 2: removes the ldflag '--no-undefined' +# Required for Mageia 6: removes the ldflag '--no-undefined' +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 %define _disable_ld_no_undefined 1 - +%endif Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec index 58b1d9be9..5eea800eb 100644 --- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec +++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec @@ -108,14 +108,6 @@ you with managing/ripping your preferred streams. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -# Force running 'tmoc' on all header files -for h in "src/"*".h"; do - moc="${h/.h/.moc}" - tmoc "${h}" -o "${moc}" - cpp="${h/.h/.cpp}" - echo "#include \"${moc##*/}\"" >>"${cpp}" -done - export QTDIR=/usr python2 /usr/bin/scons configure prefix="%{_prefix}" python2 /usr/bin/scons %{?_smp_mflags} diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec index 63b743791..fd781dae3 100644 --- a/redhat/applications/kvirc/kvirc-14.0.0.spec +++ b/redhat/applications/kvirc/kvirc-14.0.0.spec @@ -181,7 +181,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make symlinks -C src/kvilib/build %__make symlinks -C src/kvirc/build -%if 0%{?mgaversion} >= 6 +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 %__sed -i "src/modules/"*"/Makefile" -e "s|-Wl,--no-undefined||" %endif diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab-14.0.0.spec index 8a646a921..7bcffe525 100644 --- a/redhat/applications/piklab/piklab-14.0.0.spec +++ b/redhat/applications/piklab/piklab-14.0.0.spec @@ -140,13 +140,13 @@ export PATH="%{tde_bindir}:${PATH}" --disable-libreadline \ %endif -%if 0%{?mgaversion} >= 6 +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" %endif %__make %{?_smp_mflags} -%if 0%{?mgaversion} >= 6 +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" %endif diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec index b0079234e..365e96bd8 100644 --- a/redhat/applications/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/qalculate-tde/qalculate-tde.spec @@ -71,6 +71,9 @@ BuildRequires: libqalculate-devel >= 0.9.6 %if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 BuildRequires: cln-devel %endif +%if 0%{?pclinuxos} >= 2018 +BuildRequires: libcln-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} diff --git a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec index d8fca2d0e..45275c610 100644 --- a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec +++ b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec @@ -15,6 +15,11 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # +# Required for PCLinuxOS: removes the ldflag '--no-undefined' +%if 0%{?pclinuxos} >= 2018 +%define _disable_ld_no_undefined 1 +%endif + # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec index f38ca7434..02cd9c010 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec @@ -93,8 +93,10 @@ Requires: NetworkManager-gnome Requires: networkmanager %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} == 0 BuildRequires: NetworkManager-glib-devel %endif +%endif %if 0%{?suse_version} BuildRequires: NetworkManager-devel Requires: NetworkManager diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio-14.0.0.spec index 8754b1fd0..7b15298df 100644 --- a/redhat/applications/tderadio/tderadio-14.0.0.spec +++ b/redhat/applications/tderadio/tderadio-14.0.0.spec @@ -182,7 +182,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-alsa \ --enable-oss -%if 0%{?mgaversion} >= 6 +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 %__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||" %endif -- cgit v1.2.3