RPM Packaging: more update for 14.0.2

redhat/Makefile.r14

@@ -124,7 +124,7 @@ tdetoys:	tdebase
 tdeutils:	tdebase
 	$(call buildpkg,main/tdeutils)
 
-tdevelop:	tdebase tdesdk cmake
+tdevelop:	tdebase tdesdk cmake tar
 	$(call buildpkg,main/tdevelop)
 
 tdewebdev:	tdebase tdesdk
@@ -239,6 +239,12 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,3rdparty/sip)
 endif
 
+tar:
+# Build on CentOS 5 only (vendor-provided TAR is too old)
+ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/tar)
+endif
+
 torsocks:
 # Do NOT build on RHEL 6, RHEL 7
 ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7*),)

redhat/applications/kooldock/kooldock.spec

@@ -140,14 +140,6 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -G "Extended Clipboard" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility
-%endif
-
-# Apps that should stay in TDE
-#echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-
 
 %clean
 %__rm -rf %{buildroot}

redhat/build/get_rpm_package_name.sh

@@ -24,7 +24,7 @@ case "${PKGNAME}" in
   # Most TDE libraries have no prefix
   #"libkdcraw") PREFIX="";;
   # 3rd party dependencies
-  "dirmngr"|"esound"|"fileshareset"|"hk_classes"|"lcms"|"python-qt3") PREFIX="";;
+  "dirmngr"|"esound"|"fileshareset"|"hk_classes"|"lcms"|"python-qt3"|"tar") PREFIX="";;
   # Extra build stuff
   "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   # Other

redhat/build/rpmdist.sh

@@ -42,8 +42,8 @@ case $a in
     DIST=".oss$((read l; read a b c; echo ${c//./}) </etc/SuSE-release)"
   ;;
   # PCLinuxOS
-  #PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos${c}";;
-  PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos";;
+  PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos${c}";;
+  #PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos";;
 
   *) echo "distrib non reconnue !! $a";;
 esac

redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec

@@ -186,7 +186,7 @@ library documentation is available on kdcraw.h header file.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/libraries/libkdcraw/libkdcraw-3.5.13.2.spec

@@ -86,7 +86,7 @@ library documentation is available on kdcraw.h header file.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/libraries/libkexiv2/libkexiv2-14.0.0.spec

@@ -158,7 +158,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/libraries/libkexiv2/libkexiv2-3.5.13.2.spec

@@ -87,7 +87,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/libraries/libkipi/libkipi-14.0.0.spec

@@ -182,7 +182,7 @@ Homepage: http://www.kipi-plugins.org/
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 

redhat/libraries/libkipi/libkipi-3.5.13.2.spec

@@ -91,7 +91,7 @@ Homepage: http://www.kipi-plugins.org/
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 

redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec

@@ -530,7 +530,7 @@ if [ -r /usr/include/freetype2/ftbitmap.h ]; then
 fi
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 

redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec

@@ -160,7 +160,7 @@ if [ -r /usr/include/freetype2/ftbitmap.h ]; then
 fi
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 

redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec

@@ -145,7 +145,7 @@ libtdeldap-trinity-dev contains development files and documentation.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 

redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec

@@ -122,7 +122,7 @@ It provides an object-oriented interface and is easy to use.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 

redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec

@@ -1417,7 +1417,7 @@ This package contains %{summary}.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 
 
 %build

redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec

@@ -504,7 +504,7 @@ programs.
 %__sed -i "kttsd/kcmkttsmgr/kcmkttsd.desktop" -e "s|^Icon=.*|Icon=kcmkttsd|"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec

@@ -499,7 +499,7 @@ programs.
 %__sed -i "kttsd/kcmkttsmgr/kcmkttsd.desktop" -e "s|^Icon=.*|Icon=kcmkttsd|"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/main/tdeaddons/tdeaddons-3.5.13.2.spec

@@ -682,7 +682,7 @@ done
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/main/tdeadmin/tdeadmin-14.0.0.spec

@@ -423,7 +423,7 @@ touch /etc/lilo.conf
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/main/tdeadmin/tdeadmin-3.5.13.2.spec

@@ -424,7 +424,7 @@ touch /etc/lilo.conf
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/main/tdebindings/tdebindings-14.0.0.spec

@@ -1089,7 +1089,7 @@ exit 1
        -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/main/tdebindings/tdebindings-3.5.13.2.spec

@@ -1064,7 +1064,7 @@ exit 1
   -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/main/tdeedu/tdeedu-14.0.0.spec

@@ -1363,7 +1363,7 @@ This package contains the development files for tdeedu.
 %endif
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/main/tdeedu/tdeedu-3.5.13.2.spec

@@ -1309,7 +1309,7 @@ Provides:	trinity-kdeedu-devel = %{version}-%{release}
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/main/tdegames/tdegames-14.0.0.spec

@@ -1556,7 +1556,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/main/tdegames/tdegames-3.5.13.2.spec

@@ -1552,7 +1552,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/main/tdemultimedia/tdemultimedia-14.0.0.spec

@@ -1221,7 +1221,7 @@ noatun plugins.
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 # Update icons for some control center modules

redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec

@@ -1227,7 +1227,7 @@ noatun plugins.
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 # Update icons for some control center modules

redhat/main/tdeutils/tdeutils-14.0.0.spec

@@ -670,7 +670,9 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %package -n trinity-klaptopdaemon
 Summary:	Battery monitoring and management for laptops using Trinity
 Group:		Applications/Utilities
+%if 0%{?fedora} == 0 || 0%{?fedora} <= 22
 Requires:	pm-utils
+%endif
 Requires:	trinity-kcontrol
 
 %if 0%{?with_consolehelper}

redhat/main/tdewebdev/tdewebdev-14.0.0.spec

@@ -526,7 +526,7 @@ Requires:	trinity-kommander-devel = %{version}-%{release}
 %endif
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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/main/tdewebdev/tdewebdev-3.5.13.2.spec

@@ -485,7 +485,7 @@ Requires:	trinity-kommander-devel = %{version}-%{release}
 %endif
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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"