Branch: master

04957500 2018-06-19 13:11:01 François Andriot
RPM: add many missing 'rpmlintrc' files to spec files
M redhat/applications/k3b/k3b-14.0.0.spec
M redhat/applications/kaffeine/kaffeine-14.0.0.spec
M redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
M redhat/applications/kmymoney/kmymoney-14.0.0.spec
M redhat/applications/koffice/koffice-14.0.0.spec
M redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
M redhat/main/tdeaccessibility/tdeaccessibility-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/tdegames/tdegames-14.0.0.spec
M redhat/main/tdegraphics/tdegraphics-14.0.0.spec
M redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
M redhat/main/tdepim/tdepim-14.0.0.spec
M redhat/main/tdesdk/tdesdk-14.0.0.spec
M redhat/main/tdevelop/tdevelop-14.0.0.spec
M redhat/main/tdewebdev/tdewebdev-14.0.0.spec

redhat/applications/k

diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index 845546a..9944a1f 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -57,6 +57,7 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}

redhat/applications/kaffeine/kaffeine-14.0.0.spec

diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index 068d5e2..a52e93f 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -56,6 +56,7 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}

redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec

diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
index 74c4712..a247777 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
@@ -56,6 +56,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}

redhat/applications/kmymoney/kmymoney-14.0.0.spec

diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index 47d3e02..da0e97e 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -62,6 +62,7 @@
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		kmymoneytitlelabel.png
+Source2:		%{name}-rpmlintrc
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}

redhat/applications/koffice/koffice-14.0.0.spec

diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 1bc3e47..b0c4b69 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -69,7 +69,8 @@
 Prefix:		%{tde_prefix}
 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
+Source1:	%{name}-rpmlintrc
 
 # BuildRequires: world-devel ;)
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}

redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec

diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
index 9b7f80e..9254f17 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
@@ -62,6 +62,7 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 

redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec

diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
index 7a1433f..f0e079e 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -58,6 +58,7 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}

redhat/main/tdebase/tdebase-14.0.0.spec

diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index bc3c296..544270e 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -58,7 +58,7 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		trinity-tdebase-rpmlintrc
+Source1:		%{name}-rpmlintrc
 
 # Pam configuration files for RHEL / Fedora
 %if 0%{?suse_version} == 0

redhat/main/tdebindings/tdebindings-14.0.0.spec

diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec
index 47ca29d..0f8f25e 100644
--- a/redhat/main/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec
@@ -64,6 +64,7 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}

redhat/main/tdeedu/tdeedu-14.0.0.spec

diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec
index bbfd7b8..5582ad7 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec
@@ -59,6 +59,7 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
 
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 

redhat/main/tdegames/tdegames-14.0.0.spec

diff --git a/redhat/main/tdegames/tdegames-14.0.0.spec b/redhat/main/tdegames/tdegames-14.0.0.spec
index a187315..993f41a 100644
--- a/redhat/main/tdegames/tdegames-14.0.0.spec
+++ b/redhat/main/tdegames/tdegames-14.0.0.spec
@@ -58,6 +58,7 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}

redhat/main/tdegraphics/tdegraphics-14.0.0.spec

diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
index 85e91ba..2811f76 100644
--- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
@@ -54,6 +54,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
 
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 BuildRequires: trinity-tdebase-devel >= %{tde_version}

redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec

diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
index 604f73e..f7fbc19 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
@@ -57,6 +57,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
 
 Obsoletes:	trinity-kdemultimedia < %{version}-%{release}
 Provides:	trinity-kdemultimedia = %{version}-%{release}

redhat/main/tdepim/tdepim-14.0.0.spec

diff --git a/redhat/main/tdepim/tdepim-14.0.0.spec b/redhat/main/tdepim/tdepim-14.0.0.spec
index 601b55f..bdedc66 100644
--- a/redhat/main/tdepim/tdepim-14.0.0.spec
+++ b/redhat/main/tdepim/tdepim-14.0.0.spec
@@ -68,6 +68,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}

redhat/main/tdesdk/tdesdk-14.0.0.spec

diff --git a/redhat/main/tdesdk/tdesdk-14.0.0.spec b/redhat/main/tdesdk/tdesdk-14.0.0.spec
index aab50d6..788bd61 100644
--- a/redhat/main/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/main/tdesdk/tdesdk-14.0.0.spec
@@ -58,6 +58,7 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-perl-dcop >= %{tde_version}

redhat/main/tdevelop/tdevelop-14.0.0.spec

diff --git a/redhat/main/tdevelop/tdevelop-14.0.0.spec b/redhat/main/tdevelop/tdevelop-14.0.0.spec
index 7a80c11..e958532 100644
--- a/redhat/main/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/main/tdevelop/tdevelop-14.0.0.spec
@@ -58,6 +58,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
 
 Requires:	%{name}-libs = %{version}-%{release}
 

redhat/main/tdewebdev/tdewebdev-14.0.0.spec

diff --git a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
index 799100b..4ddcde0 100644
--- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
@@ -62,6 +62,8 @@
 Source3:	http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
 Source4:	http://download.sourceforge.net/quanta/javascript.tar.bz2
 
+Source10:		%{name}-rpmlintrc
+
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
 
15e02021 2018-06-19 13:11:02 François Andriot
RPM: fix many build dependencies in spec files
M redhat/applications/digikam/digikam-14.0.0.spec
M redhat/applications/koffice/koffice-14.0.0.spec
M redhat/dependencies/tqt3/tqt3-14.0.0.spec
M redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
M redhat/extras/fileshareset/fileshareset.spec
M redhat/main/tdebase/tdebase-14.0.0.spec
M redhat/main/tdeedu/tdeedu-14.0.0.spec
M redhat/main/tdelibs/tdelibs-14.0.0.spec
M redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
M redhat/main/tdenetwork/tdenetwork-14.0.0.spec

redhat/applications/digikam/digikam-14.0.0.spec

diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec
index af64360..9be8880 100644
--- a/redhat/applications/digikam/digikam-14.0.0.spec
+++ b/redhat/applications/digikam/digikam-14.0.0.spec
@@ -115,6 +115,13 @@
 BuildRequires:	exiv2-devel
 %endif
 
+# SQLITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	sqlite3-devel
+%else
+BuildRequires:	sqlite-devel
+%endif
+
 Requires:		trinity-libkexiv2
 Requires:		trinity-libkdcraw
 Requires:		trinity-libkipi

redhat/applications/koffice/koffice-14.0.0.spec

diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index b0c4b69..3a564f8 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -115,7 +115,7 @@
 
 %if 0%{?suse_version}
 BuildRequires:	libbz2-devel
-BuildRequires:	liblcms-devel
+BuildRequires:	liblcms2-devel
 %else
 BuildRequires:	bzip2-devel
 BuildRequires:	lcms-devel
@@ -247,6 +247,13 @@
 BuildRequires:	libXi-devel
 %endif
 
+# SQLITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	sqlite3-devel
+%else
+BuildRequires:	sqlite-devel
+%endif
+
** Diff limit reached (max: 250 lines) **
ce947350 2018-06-19 13:11:02 François Andriot
RPM: update build scripts
A redhat/build/gather_rpm_sources.sh
M redhat/Makefile.r14
M redhat/build/build_rpm_package.sh
M redhat/build/get_latest_built_package_version.sh
M redhat/build/get_rpm_package_name.sh
M redhat/build/get_source_files.sh
M redhat/build/rpmdist.sh
** Diff limit reached (max: 250 lines) **
ffaa9129 2018-06-19 13:11:02 François Andriot
RPM: disable lame support when building on OBS
M redhat/applications/k3b/k3b-14.0.0.spec
M redhat/applications/kaffeine/kaffeine-14.0.0.spec
M redhat/applications/tderadio/tderadio-14.0.0.spec
M redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
** Diff limit reached (max: 250 lines) **
a5fdb0ea 2018-06-19 13:11:02 François Andriot
RPM: update spec files for opensuse TW on OBS
M redhat/applications/koffice/koffice-14.0.0.spec
M redhat/applications/kpilot/kpilot-14.0.0.spec
M redhat/applications/qalculate-tde/qalculate-tde.spec
M redhat/dependencies/arts/arts-14.0.0.spec
M redhat/dependencies/tqt3/tqt3-14.0.0.spec
M redhat/main/tdebase/tdebase-14.0.0.spec
M redhat/main/tdenetwork/tdenetwork-14.0.0.spec
M redhat/main/tdeutils/tdeutils-14.0.0.spec
** Diff limit reached (max: 250 lines) **
3f0ae4ce 2018-06-19 13:11:02 François Andriot
RPM: update build scripts
M redhat/build/gather_rpm_sources.sh
M redhat/build/get_rpm_package_name.sh
M redhat/docker/f28/Dockerfile.x86_64
M redhat/docker/oss150/packages
M redhat/docker/osstw/packages
** Diff limit reached (max: 250 lines) **
77398a60 2018-06-19 13:11:02 François Andriot
RPM: avoid linking to libmad on non-x86 architectures
M redhat/applications/k3b/k3b-14.0.0.spec
M redhat/dependencies/akode/akode-14.0.0.spec
M redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
M redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec
M redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
M redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
M redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec
** Diff limit reached (max: 250 lines) **