From da3fb75aff49630932f0204992db6d71ade3e711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 30 Apr 2021 23:51:31 +0200 Subject: RPM: add klamav, kompose and pinentry-tqt packages --- redhat/Makefile | 18 ++- redhat/applications/klamav/klamav.spec | 145 +++++++++++++++++++ redhat/applications/kompose/kompose.spec | 156 +++++++++++++++++++++ redhat/build/get_rpm_package_name.sh | 2 +- redhat/extras/pinentry-tqt/pinentry-tqt.spec | 114 +++++++++++++++ redhat/extras/trinity-desktop/trinity-desktop.spec | 7 + 6 files changed, 439 insertions(+), 3 deletions(-) create mode 100644 redhat/applications/klamav/klamav.spec create mode 100644 redhat/applications/kompose/kompose.spec create mode 100644 redhat/extras/pinentry-tqt/pinentry-tqt.spec diff --git a/redhat/Makefile b/redhat/Makefile index 1b6b6f0bd..720f417e2 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -27,7 +27,7 @@ all: dependencies main libraries applications i18n meta dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls tqscintilla avahi-tqt dbus-tqt dbus-1-tqt main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity -applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake +applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n extras: icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kmpose koverartist kpacman png2qrgb @@ -91,7 +91,7 @@ tdeadmin: tdebase tdeartwork: tdebase $(call buildpkg,main/tdeartwork) -tdebase: tdelibs htdig fileshareset +tdebase: tdelibs htdig fileshareset pinentry-tqt $(call buildpkg,main/tdebase) tdebindings: tdebase tqscintilla @@ -367,6 +367,12 @@ kiosktool: tdebase kkbswitch: tdebase $(call buildpkg,applications/kkbswitch) +klamav: tdebase +# Requires clamav >= 0.101.0 +ifeq (,$(filter $(DIST), .el5 .el6 .mga6)) + $(call buildpkg,applications/klamav) +endif + klcddimmer: tdebase $(call buildpkg,applications/klcddimmer) @@ -408,6 +414,9 @@ knutclient: tdebase koffice: tdebase tdegraphics wv2 $(call buildpkg,applications/koffice) +kompose: tdebase + $(call buildpkg,applications/kompose) + konversation: tdebase $(call buildpkg,applications/konversation) @@ -614,6 +623,11 @@ meta: fileshareset: $(call buildpkg,extras/fileshareset) +pinentry-tqt: tqtinterface +ifeq (,$(filter $(DIST), .el5 .el6 .el7 )) + $(call buildpkg,extras/pinentry-tqt) +endif + trinity-filesystem: $(call buildpkg,extras/trinity-filesystem) diff --git a/redhat/applications/klamav/klamav.spec b/redhat/applications/klamav/klamav.spec new file mode 100644 index 000000000..edc1de0f6 --- /dev/null +++ b/redhat/applications/klamav/klamav.spec @@ -0,0 +1,145 @@ +# +# spec file for package klamav (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg klamav +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications +%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Summary: Frontend for clamav +Version: 0.46 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +#URL: http://www.trinitydesktop.org/ +Url: http://klamav.sourceforge.net/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: cmake + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: gettext +BuildRequires: curl-devel +BuildRequires: gmp-devel +BuildRequires: sqlite-devel +#BuildRequires: unsermake + +# CLAMAV support +BuildRequires: clamav +BuildRequires: clamav-devel +Requires: clamav + +# OPENSSL support +BuildRequires: openssl-devel + + +%description +A TDE front-end for the Clam AntiVirus antivirus toolkit. + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" + +if ! rpm -E %%cmake|grep -q "cd 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_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build +chmod u+r %{buildroot}%{tde_bindir}/ScanWithKlamAV + +%find_lang %{tde_pkg} + + +%clean +%__rm -rf %{buildroot} + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%attr(111,root,root) %{tde_bindir}/ScanWithKlamAV +%{tde_bindir}/klamav +%{tde_bindir}/klammail +%{tde_tdeappdir}/klamav.desktop +%{tde_datadir}/apps/klamav/ +%{tde_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop +%{tde_tdedocdir}/HTML/en/klamav/ +%{tde_datadir}/icons/hicolor/32x32/apps/klamav.png +%{tde_datadir}/icons/hicolor/48x48/apps/klamav.png + + +%changelog diff --git a/redhat/applications/kompose/kompose.spec b/redhat/applications/kompose/kompose.spec new file mode 100644 index 000000000..543b695ec --- /dev/null +++ b/redhat/applications/kompose/kompose.spec @@ -0,0 +1,156 @@ +# +# spec file for package kompose (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.9 +%endif +%define tde_pkg kompose +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications +%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Summary: Full-Screen Task Manager for TDE +Version: 0.5.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: cmake + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: gettext + +# IMLIB2 support +BuildRequires: imlib2-devel + +# XCOMPOSITE support +%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} >= 4 +%define xcomposite_devel %{_lib}xcomposite-devel +%else +%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel +%endif +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 +%define xcomposite_devel libXcomposite-devel +%endif +%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}} + +# XDAMAGE support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}xdamage-devel +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 +BuildRequires: libXdamage-devel +%endif + + +%description +Kompose creates a full-screen view in which every window is represented +by a scaled screen shot of it. It appears as a panel applet. + + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" + +if ! rpm -E %%cmake|grep -q "cd 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_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang %{tde_pkg} + + +%clean +%__rm -rf %{buildroot} + + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%doc README AUTHORS ChangeLog COPYING +%{tde_bindir}/kompose +%{tde_tdeappdir}/kompose.desktop +%{tde_datadir}/apps/kompose/ +%{tde_tdedocdir}/HTML/en/kompose/ +%{tde_datadir}/icons/hicolor/16x16/apps/kompose.png +%{tde_datadir}/icons/hicolor/32x32/apps/kompose.png + + +%changelog diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index be2852414..5cfc902e3 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -22,7 +22,7 @@ case "${PKGNAME}" in # Most TDE dependencies have no prefix "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";; # 3rd party dependencies - "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";; + "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"mp4v2"|"pinentry-tqt"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";; # Extra build stuff "autoconf"|"automake"|"brp-check-trinity"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";; # Other diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec new file mode 100644 index 000000000..fc958eb36 --- /dev/null +++ b/redhat/extras/pinentry-tqt/pinentry-tqt.spec @@ -0,0 +1,114 @@ +# +# spec file for package pinentry-tqt (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + + +Name: pinentry-tqt +Version: 1.1.1 +Release: 1%{?dist} +Summary: PIN or passphrase entry dialogs +Group: System/Libraries +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{version}.tar.gz + +BuildRequires: trinity-tqtinterface-devel +BuildRequires: libsecret-devel + +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gcc-c++ +BuildRequires: autoconf automake libtool m4 +BuildRequires: pkgconfig + +Requires: pinentry + + +%description +This is a collection of PIN or passphrase entry dialogs which +utilize the Assuan protocol as specified in the Libassuan manual. + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q + +%__sed -i "configure.ac" \ + -e "/^min_automake_version=/ s|=.*|=\"1.13\"|" \ + -e "/^NEED_GPG_ERROR_VERSION=/ s|=.*|=1.12|" + + +%build +unset QTDIR QTINC QTLIB + +if [ -d "/usr/include/libassuan2" ]; then + export CFLAGS="%{optflags} -I/usr/include/libassuan2" +fi + +./autogen.sh + +%if 0%{?mgaversion} == 6 || 0%{?mgaversion} == 7 || 0%{?pclinuxos} +%configure2_5x \ +%else +%configure \ +%endif + --enable-pinentry-tqt \ + --enable-libsecret \ + --disable-doc \ + --disable-pinentry-curses \ + --disable-pinentry-fltk \ + --disable-pinentry-gnome3 \ + --disable-pinentry-gtk2 \ + --disable-pinentry-qt \ + --disable-pinentry-qt5 \ + --disable-pinentry-tty + +%__make %{?_smp_mflags} || %__make + + +%install +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} +%__rm -f "%{buildroot}%{_bindir}/pinentry" + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%{_bindir}/pinentry-tqt + + +%changelog diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index c2c9889df..301de4f66 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -49,6 +49,9 @@ Source0: trinity-3.5.13-fedora.repo Source1: trinity-3.5.13-rhel.repo Source2: RPM-GPG-KEY-trinity +%if 0%{?fedora} >= 32 || 0%{?mgaversion} >= 7 || 0%{?pclinuxos} || 0%{?rhel} >= 8 || 0%{?suse_version} +Requires: pinentry-tqt +%endif Requires: trinity-tdeaccessibility >= %{version} Requires: trinity-tdeaddons >= %{version} Requires: trinity-tdeadmin >= %{version} @@ -142,6 +145,9 @@ Requires: trinity-kile Requires: trinity-kima Requires: trinity-kiosktool Requires: trinity-kkbswitch +%if 0%{?fedora} || 0%{?mgaversion} >= 7 || 0%{?pclinuxos} || 0%{?rhel} >= 7 || 0%{?suse_version} +Requires: trinity-klamav +%endif Requires: trinity-klcddimmer Requires: trinity-kmplayer Requires: trinity-kmyfirewall @@ -154,6 +160,7 @@ Requires: trinity-knowit Requires: trinity-knmap Requires: trinity-knutclient Requires: trinity-koffice-suite +Requires: trinity-kompose Requires: trinity-konversation Requires: trinity-kooldock Requires: trinity-kopete-otr -- cgit v1.2.1