8d17db2e | 2018-09-04 14:44:28 | François Andriot |
RPM: update packages for PCLinuxOS 2018 |
||
A redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018 A redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018 A redhat/main/tdebase/pamd.kdm-trinity.pclos2018 A redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018 M redhat/Makefile.r14 M redhat/applications/bibletime/bibletime-14.0.0.spec M redhat/applications/digikam/digikam-14.0.0.spec M redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec M redhat/applications/koffice/koffice-14.0.0.spec M redhat/applications/kopete-otr/kopete-otr-14.0.0.spec M redhat/applications/kstreamripper/kstreamripper-14.0.0.spec M redhat/applications/kvirc/kvirc-14.0.0.spec M redhat/applications/piklab/piklab-14.0.0.spec M redhat/applications/qalculate-tde/qalculate-tde.spec M redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec M redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec M redhat/applications/tderadio/tderadio-14.0.0.spec M redhat/build/configure_repository.sh M redhat/build/gather_rpm_sources.sh M redhat/build/get_rpm_package_name.sh M redhat/build/get_source_files.sh M redhat/buildenv.sh M redhat/docker/build.sh M redhat/docker/el6/Dockerfile.i686 M redhat/docker/el6/Dockerfile.x86_64 M redhat/docker/el6/packages.trinity M redhat/docker/el7/Dockerfile.x86_64 M redhat/docker/el7/packages M redhat/docker/f28/Dockerfile.i686 M redhat/docker/f28/Dockerfile.x86_64 M redhat/docker/f28/packages M redhat/docker/mga6/Dockerfile.i686 M redhat/docker/mga6/Dockerfile.x86_64 M redhat/docker/mga6/packages.i686 M redhat/docker/mga6/packages.x86_64 M redhat/docker/oss150/Dockerfile.x86_64 M redhat/docker/oss150/packages M redhat/docker/oss423/Dockerfile.x86_64 M redhat/docker/oss423/packages M redhat/docker/osstw/Dockerfile.i686 M redhat/docker/osstw/Dockerfile.x86_64 M redhat/docker/osstw/packages M redhat/docker/pclinuxos/Dockerfile.x86_64 M redhat/docker/pclinuxos/packages.x86_64 M redhat/docker/pclinuxos/rpmmacros M redhat/docker/run.sh M redhat/extras/fileshareset/fileshareset.spec M redhat/libraries/kipi-plugins/kipi-plugins.spec M redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec M redhat/libraries/libkipi/libkipi-14.0.0.spec M redhat/main/tdebase/tdebase-14.0.0.spec M redhat/main/tdebindings/tdebindings-14.0.0.spec M redhat/main/tdegraphics/tdegraphics-14.0.0.spec M redhat/notes.txt |
||
redhat/Makefile.r14diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 86678ef..c248b34 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -1,7 +1,7 @@ SHELL := /bin/bash PACKAGING_DIR := $(shell cd ..; pwd) PATH := $(PATH):$(shell pwd)/build -TDE_VERSION := 14.0.4 +TDE_VERSION := 14.0.5 DIST := $(shell rpm -E %dist) buildpkg = \ @@ -108,6 +108,7 @@ $(call buildpkg,main/tdegraphics) tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem libart_lgpl file + [ -x /usr/libexec/utempter/utempter ] && sudo chmod a+r /usr/libexec/utempter/utempter || : $(call buildpkg,main/tdelibs) tdemultimedia: tdebase akode @@ -166,8 +167,8 @@ endif esound: -# Build on Mageia and CentOS >= 7, Fedora >= 23, Opensuse >= 15.0 -ifneq (,$(filter $(DIST),.mga .el7 .fc2 .oss150 .osstw)) +# Build on Mageia, Fedora >= 23, Opensuse >= 15.0 +ifneq (,$(filter $(DIST),.mga5 .mga6 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .osstw)) $(call buildpkg,3rdparty/esound) endif @@ -190,8 +191,8 @@ endif gnuchess: -# Build on CentOS 5, CentOS 7 -ifneq (,$(filter $(DIST),.el5 .el7)) +# Build on CentOS 5 +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/gnuchess) endif @@ -210,8 +211,8 @@ endif lcms: -# Build on EL7, OSSTW -ifneq (,$(filter $(DIST),.el7 .osstw)) +# Build on EL7, OSS150, OSSTW +ifneq (,$(filter $(DIST),.el7 .oss150 .osstw)) $(call buildpkg,3rdparty/lcms) endif @@ -252,8 +253,8 @@ endif pcsc-perl: -# Build on CentOS -ifneq (,$(filter $(DIST),.el5 .el6 .el7)) +# Build on CentOS 5 +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/pcsc-perl) endif @@ -310,7 +311,7 @@ wv2: # Do NOT build on Mageia or openSUSE or PCLINUXOS -ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos)) +ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos .pclos2018)) $(call buildpkg,3rdparty/wv2) endif @@ -337,10 +338,7 @@ $(call buildpkg,libraries/libksquirrel) libtdeldap: tqtinterface -# Do NOT build on PCLOS -ifeq ($(wildcard /etc/pclinuxos-release),) $(call buildpkg,libraries/libtdeldap) -endif libtqt-perl: tqtinterface $(call buildpkg,libraries/libtqt-perl) @@ -452,20 +450,20 @@ $(call buildpkg,applications/kcmautostart) kcmldap: tdebase libtdeldap -# Do NOT build on CentOS 5, PCLinuxOS -ifeq (,$(filter $(DIST),.el5 .pclos)) +# Do NOT build on CentOS 5 +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kcmldap) endif kcmldapcontroller: tdebase kcmldap -# Do NOT build on CentOS 5, PCLinuxOS -ifeq (,$(filter $(DIST),.el5 .pclos)) +# Do NOT build on CentOS 5 +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kcmldapcontroller) endif kcmldapmanager: tdebase kcmldap -# Do NOT build on CentOS 5, PCLinuxOS -ifeq (,$(filter $(DIST),.el5 .pclos)) +# Do NOT build on CentOS 5 +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kcmldapmanager) endif @@ -491,8 +489,8 @@ $(call buildpkg,applications/keep) kerberostray: tdebase -# Do NOT build on CentOS 5, PCLinuxOS -ifeq (,$(filter $(DIST),.el5 .pclos)) +# Do NOT build on CentOS 5 +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kerberostray) endif @@ -578,7 +576,9 @@ $(call buildpkg,applications/kooldock) kopete-otr: tdebase tdenetwork +ifeq (,$(filter $(DIST),.pclos2018)) $(call buildpkg,applications/kopete-otr) +endif kpicosim: tdebase $(call buildpkg,applications/kpicosim) @@ -850,7 +850,7 @@ $(call buildpkg,extras/mathemagics) pan: gmime intltool -ifeq (,$(filter $(DIST),.el5 .oss150 .osstw))) +ifeq (,$(filter $(DIST),.el5 .oss150 .osstw)) $(call buildpkg,3rdparty/pan) endif redhat/applications/bibletime/bibletime-14.0.0.specdiff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec index 39142c5..c6a0991 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}" == "" redhat/applications/digikam/digikam-14.0.0.specdiff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec index 9be8880..dc95cb8 100644 --- a/redhat/applications/digikam/digikam-14.0.0.spec +++ b/redhat/applications/digikam/digikam-14.0.0.spec @@ -84,7 +84,7 @@ %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 @@ %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/ redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.specdiff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec index 784e055..88a889e 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec @@ -134,8 +134,10 @@ %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 @@ %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" redhat/applications/koffice/koffice-14.0.0.specdiff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index 1404ebb..ce0cec1 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -113,17 +113,28 @@ 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: liblcms2-devel +%endif + +# BZIP2 support %if 0%{?suse_version} BuildRequires: libbz2-devel -BuildRequires: liblcms-devel -BuildRequires: liblcms2-devel %else BuildRequires: bzip2-devel -BuildRequires: lcms-devel - -BuildRequires: libpaper-devel %endif +# PAPER support +BuildRequires: libpaper-devel + # RUBY support %if 0%{?with_ruby} BuildRequires: ruby ruby-devel >= 1.8.1 redhat/applications/kopete-otr/kopete-otr-14.0.0.specdiff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec index 4f58698..602ab32 100644 --- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec** Diff limit reached (max: 250 lines) ** |