From 1ec7b4b4b975e6ab68f45907ce437d7289458f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 8 Nov 2015 14:41:45 +0100 Subject: [PATCH] RPM Packaging: more update for 14.0.2 --- redhat/Makefile.r14 | 8 +++++++- redhat/applications/kooldock/kooldock.spec | 8 -------- redhat/build/get_rpm_package_name.sh | 2 +- redhat/build/rpmdist.sh | 4 ++-- redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec | 2 +- .../libraries/libkdcraw/libkdcraw-3.5.13.2.spec | 2 +- redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec | 2 +- .../libraries/libkexiv2/libkexiv2-3.5.13.2.spec | 2 +- redhat/libraries/libkipi/libkipi-14.0.0.spec | 2 +- redhat/libraries/libkipi/libkipi-3.5.13.2.spec | 2 +- .../libksquirrel/libksquirrel-14.0.0.spec | 2 +- .../libksquirrel/libksquirrel-3.5.13.2.spec | 2 +- .../libraries/libtdeldap/libtdeldap-14.0.0.spec | 2 +- .../libraries/libtqt-perl/libtqt-perl-14.0.0.spec | 2 +- redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec | 2 +- .../tdeaccessibility/tdeaccessibility-14.0.0.spec | 2 +- .../tdeaccessibility-3.5.13.2.spec | 2 +- redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec | 2 +- redhat/main/tdeadmin/tdeadmin-14.0.0.spec | 2 +- redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec | 2 +- redhat/main/tdebase/tdm.fc23.pp | Bin 0 -> 932 bytes redhat/main/tdebindings/tdebindings-14.0.0.spec | 2 +- redhat/main/tdebindings/tdebindings-3.5.13.2.spec | 2 +- redhat/main/tdeedu/tdeedu-14.0.0.spec | 2 +- redhat/main/tdeedu/tdeedu-3.5.13.2.spec | 2 +- redhat/main/tdegames/tdegames-14.0.0.spec | 2 +- redhat/main/tdegames/tdegames-3.5.13.2.spec | 2 +- .../main/tdemultimedia/tdemultimedia-14.0.0.spec | 2 +- .../tdemultimedia/tdemultimedia-3.5.13.2.spec | 2 +- redhat/main/tdeutils/tdeutils-14.0.0.spec | 2 ++ redhat/main/tdewebdev/tdewebdev-14.0.0.spec | 2 +- redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec | 2 +- 32 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 redhat/main/tdebase/tdm.fc23.pp diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 9cd1df85d..58a03c0e5 100644 --- a/redhat/Makefile.r14 +++ b/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*),) diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec index f134f6718..8345076a1 100644 --- a/redhat/applications/kooldock/kooldock.spec +++ b/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} diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index f2ed2d011..b4ec6658c 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/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 diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh index 19b78d701..81f077479 100755 --- a/redhat/build/rpmdist.sh +++ b/redhat/build/rpmdist.sh @@ -42,8 +42,8 @@ case $a in DIST=".oss$((read l; read a b c; echo ${c//./}) Ucq=?RybeVCqL-IL??Ok z-n^NAfG{7sx9v%mWnkoZ_xj3tb~nDS>h^W~unz5WnY(rEVC=#{z%i^Q%f;>V)b-6| zYEH+Y?Po(nHB5wg+pvndDeF+Inn%sZXKp=zDi^WX7{w4K;hbvOsmD(M=L73AygYbY z)m1FwrMsGd3F~s7mM@#Cj-iN&_oF;s!jL?)4bX>(@zXFbfcm*>!n(Xq+O4^L=Wv#H zKyzX|g}DIg@h=nB /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" diff --git a/redhat/main/tdegames/tdegames-3.5.13.2.spec b/redhat/main/tdegames/tdegames-3.5.13.2.spec index 6af78c586..e351239a7 100644 --- a/redhat/main/tdegames/tdegames-3.5.13.2.spec +++ b/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" diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec index a1b73e25d..ae1866cbd 100644 --- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/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 diff --git a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec index 085903bab..4833f9776 100644 --- a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec +++ b/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 diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec index 25e7c3db4..0d3b72413 100644 --- a/redhat/main/tdeutils/tdeutils-14.0.0.spec +++ b/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} diff --git a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec index 8972259f8..4d7601acb 100644 --- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec +++ b/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" diff --git a/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec b/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec index 06bd3e909..31f644cf6 100644 --- a/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec +++ b/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"