Branch: master

9c9bbff0 2018-05-13 06:33:36 François Andriot 
RPM packaging: updates for Fedora 28 / OpenSUSE 15.0
A redhat/docker/f28/Dockerfile.i686
A redhat/docker/f28/Dockerfile.x86_64
A redhat/docker/f28/packages
A redhat/docker/f28/rpmbuild.repo
A redhat/docker/f28/rpmmacros
A redhat/docker/oss150/Dockerfile.x86_64
A redhat/docker/oss150/packages
A redhat/docker/oss150/rpmmacros
A redhat/main/tdebase/pamd.kcheckpass-trinity.fc28
A redhat/main/tdebase/pamd.kdm-trinity-np.fc28
A redhat/main/tdebase/pamd.kdm-trinity.fc28
A redhat/main/tdebase/pamd.kscreensaver-trinity.fc28
A redhat/main/tdebase/tdm.fc28.pp
A redhat/main/tdebase/tdm.service.fc28
M redhat/Makefile.r14
M redhat/applications/amarok/amarok-14.0.0.spec
M redhat/applications/k3b/k3b-14.0.0.spec
M redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
M redhat/applications/kuickshow/kuickshow-14.0.0.spec
M redhat/applications/qalculate-tde/qalculate-tde.spec
M redhat/applications/tellico/tellico-14.0.0.spec
M redhat/build/get_rpm_package_name.sh
M redhat/build/rpmdist.sh
M redhat/dependencies/tqt3/tqt3-14.0.0.spec
M redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
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/libraries/libksquirrel/libksquirrel-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/tdeedu/tdeedu-14.0.0.spec
M redhat/main/tdegraphics/tdegraphics-14.0.0.spec
M redhat/main/tdelibs/tdelibs-14.0.0.spec

redhat/Makefile.r14

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index d9c3454..e70f413 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -113,7 +113,7 @@
 tdemultimedia:	tdebase akode
 	$(call buildpkg,main/tdemultimedia)
 
-tdenetwork:	tdebase
+tdenetwork:	tdebase rdesktop
 	$(call buildpkg,main/tdenetwork)
 
 tdepim:	tdebase libcaldav libcarddav cmake dirmngr
@@ -166,8 +166,8 @@
 endif
 
 esound:
-# Build on Mageia and CentOS >= 7 and Fedora >= 23
-ifneq (,$(filter $(DIST),.mga .el7 .fc2 .osstw))
+# Build on Mageia and CentOS >= 7, Fedora >= 23, Opensuse >= 15.0
+ifneq (,$(filter $(DIST),.mga .el7 .fc2 .oss150 .osstw))
 	$(call buildpkg,3rdparty/esound)
 endif
 
@@ -247,7 +247,7 @@
 
 mp4v2:
 # Build on OpenSUSE only
-ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .osstw))
+ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .osstw))
 	$(call buildpkg,3rdparty/mp4v2)
 endif
 
@@ -266,10 +266,22 @@
 python-qt3: tdelibs sip
 	$(call buildpkg,3rdparty/python-qt3)
 
+rdesktop:
+# Build on OpenSUSE >= 15.0 only
+ifneq (,$(filter $(DIST),.oss150))
+	$(call buildpkg,3rdparty/rdesktop)
+endif
+
 rdiff-backup:
 # Only for PCLINUXOS
 ifneq ($(wildcard /etc/pclinuxos-release),)
 	$(call buildpkg,3rdparty/rdiff-backup)
+endif
+
+recode:
+# Build on OpenSUSE >= 15.0 only
+ifneq (,$(filter $(DIST),.oss150))
+	$(call buildpkg,3rdparty/recode)
 endif
 
 sip:
@@ -298,7 +310,7 @@
 
 wv2:
 # Do NOT build on Mageia or openSUSE or PCLINUXOS
-ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .osstw .pclos))
+ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos))
 	$(call buildpkg,3rdparty/wv2)
 endif
 
@@ -526,7 +538,7 @@
 kmyfirewall:	tdebase
 	$(call buildpkg,applications/kmyfirewall)
 
-kmymoney:	tdebase
+kmymoney:	tdebase recode
 	$(call buildpkg,applications/kmymoney)
 
 knemo:	tdebase
@@ -612,7 +624,7 @@
 
 kstreamripper:	tdebase
 # Do NOT build on Fedora >= 27 (problem with scons and python3)
-ifeq (,$(filter $(DIST),.fc27))
+ifeq (,$(filter $(DIST),.fc27 .oss150))
 	$(call buildpkg,applications/kstreamripper)
 endif
 
@@ -788,7 +800,7 @@
 
 hk_classes:
 # Not on Fedora 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .osstw))
+ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw))
 	$(call buildpkg,extras/hk_classes)
 endif
 
@@ -811,20 +823,20 @@
 	$(call buildpkg,extras/kdissert)
 
 klamav:
-# Not on Fedora 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .osstw))
+# Not on Fedora >= 27, Opensuse TW
+ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw))
 	$(call buildpkg,extras/klamav)
 endif
 
 klibido: pan
-# Not on RHEL5
-ifeq (,$(filter $(DIST),.el5))
+# Not on RHEL5, nor recent OpenSUSE
+ifeq (,$(filter $(DIST),.el5 .oss150))
 	$(call buildpkg,extras/klibido)
 endif
 
 knoda: hk_classes
 # Not on Fedora 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .osstw))
+ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw))
 	$(call buildpkg,extras/knoda)
 endif

redhat/applications/amarok/amarok-14.0.0.spec

diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index e80a2a2..41ef745 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -191,7 +191,7 @@
 %if 0%{?mgaversion} && 0%{?mgaversion} <= 2
 BuildRequires:	libtunepimp-devel
 %endif
-%if 0%{?suse_version} && 0%{?suse_version} != 1330
+%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} != 1500
 BuildRequires:	libtunepimp-devel
 %endif
 %if 0%{?fedora} && 0%{?fedora} <= 23

redhat/applications/k

diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index 46ff971..845546a 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -109,7 +109,7 @@
 Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if 0%{?suse_version} >= 1310
+%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1500
 Requires:		wodim
 REquires:		genisoimage
 %else

redhat/applications/kstreamripper/kstreamripper-14.0.0.spec

diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index 64ba896..9af509e 100644
--- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
@@ -15,6 +15,10 @@
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
+%if 0%{?fedora} >= 28
+%global debug_package %{nil}
+%endif
+
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
@@ -97,6 +101,7 @@
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%__rm -f kde.py
 
 
 %build

redhat/applications/kuickshow/kuickshow-14.0.0.spec

diff --git a/redhat/applications/kuickshow/kuickshow-14.0.0.spec b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
index a83efca..1862df1 100644
--- a/redhat/applications/kuickshow/kuickshow-14.0.0.spec
+++ b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
@@ -84,7 +84,7 @@
 %endif
 
 # GIF support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?fedora} >= 28
 BuildRequires:	giflib-devel 
 %else
 BuildRequires:	libungif-devel

redhat/applications/qalculate-tde/qalculate-tde.spec

diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec
index cdf54b8..cf20eb0 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/qalculate-tde/qalculate-tde.spec
@@ -68,7 +68,7 @@
 
 BuildRequires:	libqalculate-devel >= 0.9.6
 
-%if 0%{?suse_version} == 1330
+%if 0%{?suse_version} == 1330 || 0%{?suse_version} == 1500
 BuildRequires:	cln-devel
 %endif

redhat/applications/tellico/tellico-14.0.0.spec

diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 8f36192..a8cf495 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -76,8 +76,12 @@
 
 # POPPLER support
 %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?suse_version} == 1500
+BuildRequires: libpoppler-devel >= 0.12
+%else
 BuildRequires: poppler-devel >= 0.12
 %endif
+%endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}poppler-devel
 %endif

redhat/build/get_rpm_package_name.sh

diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 06fafb6..222e0a2 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -24,7 +24,7 @@
   # Most TDE libraries have no prefix
   #"libkdcraw") PREFIX="";;
   # 3rd party dependencies
-  "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
+  "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
   # Extra build stuff
   "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   # Other
@@ -85,7 +85,7 @@
 
   # Some other packags NOT having development package
   case "${PKGNAME}" in
-    "autoconf"|"automake"|"cmake"|"cscope"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdiff-backup"|"torsocks") exit 0;;
+    "autoconf"|"automake"|"cmake"|"cscope"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"torsocks") exit 0;;
     "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;;
   esac

redhat/build/rpmdist.sh

diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh
index ec4735d..16d1468 100755
--- a/redhat/build/rpmdist.sh
+++ b/redhat/build/rpmdist.sh
@@ -7,7 +7,7 @@
 
 if [ -r /etc/redhat-release ]; then
   read a b c d e f g < /etc/redhat-release
-elif [ -r /etc/SuSE-release ] || grep -qw "ID=opensuse" "/etc/os-release"; then
+elif [ -r /etc/SuSE-release ] || [ -r /etc/SUSE-brand ] || grep -qw "ID=opensuse" "/etc/os-release"; then
   a="opensuse"
 fi
 
@@ -41,6 +41,8 @@
   opensuse)
     if [ -r "/etc/SuSE-release" ]; then
       DIST=".oss$((read l; read a b c; echo ${c//./}) </etc/SuSE-release)"
+    elif [ -r "/etc/SUSE-brand" ]; then
** Diff limit reached (max: 250 lines) **