diff options
Diffstat (limited to 'redhat/applications/internet')
13 files changed, 66 insertions, 57 deletions
diff --git a/redhat/applications/internet/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec index e276c0e2e..c1542d124 100644 --- a/redhat/applications/internet/kasablanca/kasablanca.spec +++ b/redhat/applications/internet/kasablanca/kasablanca.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kasablanca %define tde_prefix /opt/trinity @@ -95,7 +95,7 @@ BuildRequires: openssl-devel %endif # UTEMPTER support -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1699 BuildRequires: utempter-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} @@ -121,7 +121,7 @@ Kasablanca is an ftp client, among its features are currently: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec index 0714c129f..7da782cde 100644 --- a/redhat/applications/internet/kbiff/kbiff.spec +++ b/redhat/applications/internet/kbiff/kbiff.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kbiff %define tde_prefix /opt/trinity @@ -105,7 +105,7 @@ NNTP mailboxes. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec index 8b58de494..0099768f7 100644 --- a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec +++ b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kftpgrabber %define tde_prefix /opt/trinity @@ -119,7 +119,7 @@ Requires: %{name} = %{version}-%{release} ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec index 6f616ca45..b04bf3f06 100644 --- a/redhat/applications/internet/knmap/knmap.spec +++ b/redhat/applications/internet/knmap/knmap.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg knmap %define tde_prefix /opt/trinity @@ -116,7 +116,7 @@ http://www.kde-apps.org/content/show.php?content=31108 ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec index 5c2e23415..5fac3bbb0 100644 --- a/redhat/applications/internet/konversation/konversation.spec +++ b/redhat/applications/internet/konversation/konversation.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg konversation %define tde_prefix /opt/trinity @@ -190,7 +190,7 @@ and experienced users alike will appreciate its many features: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec index 4860fb5ff..88309b15f 100644 --- a/redhat/applications/internet/kopete-otr/kopete-otr.spec +++ b/redhat/applications/internet/kopete-otr/kopete-otr.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kopete-otr %define tde_prefix /opt/trinity @@ -97,7 +97,7 @@ users with IM-Cients supporting the OTR encryption method. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec index dfadbf498..254ef1112 100644 --- a/redhat/applications/internet/kshowmail/kshowmail.spec +++ b/redhat/applications/internet/kshowmail/kshowmail.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kshowmail %define tde_prefix /opt/trinity @@ -101,7 +101,7 @@ All without dragging any messages into your computer. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec index 3a293b04e..3cab0b6c5 100644 --- a/redhat/applications/internet/kstreamripper/kstreamripper.spec +++ b/redhat/applications/internet/kstreamripper/kstreamripper.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kstreamripper %define tde_prefix /opt/trinity @@ -87,7 +87,7 @@ you with managing/ripping your preferred streams. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec index c8835cfe4..406b2fe93 100644 --- a/redhat/applications/internet/ktorrent/ktorrent.spec +++ b/redhat/applications/internet/ktorrent/ktorrent.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg ktorrent %define tde_prefix /opt/trinity @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -112,7 +112,7 @@ enabling background downloading. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -122,43 +122,50 @@ enabling background downloading. %prep %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" -%__make -f "admin/Makefile.common" - %build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix="%{tde_prefix}" \ - --exec-prefix="%{tde_prefix}" \ - --bindir="%{tde_bindir}" \ - --datadir="%{tde_datadir}" \ - --libdir="%{tde_libdir}" \ - --mandir="%{tde_mandir}" \ - --includedir="%{tde_tdeincludedir}" \ +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + \ + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ +%if 0%{?suse_version} == 1699 + -DWITH_BUILTIN_GEOIP=ON \ + -DWITH_SYSTEM_GEOIP=OFF \ +%endif \ - %{?!with_avahi:--without-avahi} + .. +# Fix build issue since 14.1.4 (settings.h not generated as expected) +pushd src/libktorrent +/opt/trinity/bin/tdeconfig_compiler ../../../src/libktorrent/ktorrent.kcfg ../../../src/libktorrent/settings.kcfgc +popd -# Not SMP safe ! -%__make +%__make %{?_smp_mflags} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf "%{buildroot}" -%__make install DESTDIR="%{buildroot}" +%__make install DESTDIR="%{buildroot}" -C build %find_lang %{tde_pkg} @@ -177,7 +184,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_bindir}/ktshell %{tde_bindir}/kttorinfo %{tde_bindir}/ktupnptest -%{tde_libdir}/libktorrent-%{version}.so +%{tde_libdir}/libktorrent.so.* %{tde_libdir}/libktorrent.la %{tde_tdelibdir}/ktinfowidgetplugin.la %{tde_tdelibdir}/ktinfowidgetplugin.so diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec index 5123178d9..6337d0f1a 100644 --- a/redhat/applications/internet/kvirc/kvirc.spec +++ b/redhat/applications/internet/kvirc/kvirc.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kvirc %define tde_prefix /opt/trinity @@ -124,7 +124,7 @@ with the K Desktop Environment version 3. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -181,7 +181,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make symlinks -C src/kvilib/build %__make symlinks -C src/kvirc/build -%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 || 0%{?mdkver} %__sed -i "src/modules/"*"/Makefile" -e "s|-Wl,--no-undefined||" %endif diff --git a/redhat/applications/internet/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec index e8746613a..4aa66f8af 100644 --- a/redhat/applications/internet/kvpnc/kvpnc.spec +++ b/redhat/applications/internet/kvpnc/kvpnc.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kvpnc %define tde_prefix /opt/trinity @@ -112,7 +112,7 @@ It supports : ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec index 3b44dec32..3f2aab4cb 100644 --- a/redhat/applications/internet/smb4k/smb4k.spec +++ b/redhat/applications/internet/smb4k/smb4k.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg smb4k %define tde_prefix /opt/trinity @@ -136,7 +136,7 @@ Requires: %{name} = %{version}-%{release} ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/tork/tork.spec b/redhat/applications/internet/tork/tork.spec index 6b163b725..7245cda0b 100644 --- a/redhat/applications/internet/tork/tork.spec +++ b/redhat/applications/internet/tork/tork.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tork %define tde_prefix /opt/trinity @@ -115,7 +115,7 @@ on the Tor network. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -201,6 +201,8 @@ fi %{tde_datadir}/pixmaps/tork.xpm %{tde_mandir}/man1/tork.1* %{tde_mandir}/man1/torkarkollon.1* -%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/libkickermenu_tork.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/libkickermenu_tork.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/*.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %changelog |