diff options
| author | François Andriot <albator78@libertysurf.fr> | 2022-11-06 11:46:08 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2022-11-06 11:46:42 +0100 |
| commit | a6ebd51a1a94620586a032f3191380e971a83e20 (patch) | |
| tree | e9a587e51c296a322c4aa8459088c108bc68bfca /redhat/applications | |
| parent | 0efff2a27d4255f27d967351ee52089b5d9c39c1 (diff) | |
| download | tde-packaging-a6ebd51a1a94620586a032f3191380e971a83e20.tar.gz tde-packaging-a6ebd51a1a94620586a032f3191380e971a83e20.zip | |
RPM: updates for TDE R14.0.13
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/applications')
132 files changed, 644 insertions, 275 deletions
diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/abakus/abakus.spec index 37b8f8e4a..04c4b1aad 100644 --- a/redhat/applications/abakus/abakus.spec +++ b/redhat/applications/abakus/abakus.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg abakus %define tde_prefix /opt/trinity @@ -75,7 +75,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -169,6 +169,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/*/apps/abakus.png %{tde_tdedocdir}/HTML/en/abakus/ %{tde_tdeappdir}/abakus.desktop +%{tde_mandir}/man1/abakus.1* %changelog diff --git a/redhat/applications/adept/adept.spec b/redhat/applications/adept/adept.spec index 18fdb5c8f..ca5c2f430 100644 --- a/redhat/applications/adept/adept.spec +++ b/redhat/applications/adept/adept.spec @@ -18,7 +18,7 @@ # Default version for this component %define tde_pkg adept %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif # TDE specific building variables diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec index 0465d49dc..9de59f8ad 100644 --- a/redhat/applications/amarok/amarok.spec +++ b/redhat/applications/amarok/amarok.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg amarok %define tde_prefix /opt/trinity @@ -99,7 +99,12 @@ BuildRequires: libtool BuildRequires: libtool-ltdl-devel %endif +%if 0%{?fedora} >= 37 +BuildRequires: libusb1-devel +BuildRequires: libusb-compat-0.1-devel +%else BuildRequires: libusb-devel +%endif BuildRequires: mysql-devel BuildRequires: SDL-devel BuildRequires: taglib-devel @@ -126,7 +131,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -167,7 +172,7 @@ BuildRequires: karma-sharp %endif # GPOD (ipod) support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_gpod 1 BuildRequires: libgpod-devel >= 0.4.2 %endif @@ -264,11 +269,11 @@ BuildRequires: rubypick %endif # PYTHON support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 8 %define python python3 %define __python %__python3 %else -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} @@ -466,7 +471,7 @@ fi "amarok/src/scripts/webcontrol/Playlist.py" \ "amarok/src/scripts/webcontrol/RequestHandler.py" \ "amarok/src/scripts/webcontrol/WebControl.py" \ - -e "s|/usr/bin/env python|/usr/bin/env python2|" + -e "s|/usr/bin/env python|/usr/bin/env %{python}|" %endif diff --git a/redhat/applications/basket/basket.spec b/redhat/applications/basket/basket.spec index 1f894abc7..42e1df681 100644 --- a/redhat/applications/basket/basket.spec +++ b/redhat/applications/basket/basket.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg basket %define tde_prefix /opt/trinity diff --git a/redhat/applications/bibletime/bibletime.spec b/redhat/applications/bibletime/bibletime.spec index a9234ce08..56d940aa8 100644 --- a/redhat/applications/bibletime/bibletime.spec +++ b/redhat/applications/bibletime/bibletime.spec @@ -23,7 +23,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg bibletime %define tde_prefix /opt/trinity diff --git a/redhat/applications/codeine/codeine.spec b/redhat/applications/codeine/codeine.spec index 02b1706d7..c1bd4b0d3 100644 --- a/redhat/applications/codeine/codeine.spec +++ b/redhat/applications/codeine/codeine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg codeine %define tde_prefix /opt/trinity diff --git a/redhat/applications/digikam/digikam.spec b/redhat/applications/digikam/digikam.spec index ec3236e6e..d24f6e1af 100644 --- a/redhat/applications/digikam/digikam.spec +++ b/redhat/applications/digikam/digikam.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg digikam %define tde_prefix /opt/trinity diff --git a/redhat/applications/dolphin/dolphin.spec b/redhat/applications/dolphin/dolphin.spec index ecffc5563..bfa6d1910 100644 --- a/redhat/applications/dolphin/dolphin.spec +++ b/redhat/applications/dolphin/dolphin.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg dolphin %define tde_prefix /opt/trinity diff --git a/redhat/applications/filelight/filelight.spec b/redhat/applications/filelight/filelight.spec index 25e8b5bb8..c89c62e87 100644 --- a/redhat/applications/filelight/filelight.spec +++ b/redhat/applications/filelight/filelight.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg filelight %define tde_prefix /opt/trinity @@ -70,7 +70,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec index 9b63ff823..41d2e2184 100644 --- a/redhat/applications/fusion-icon/fusion-icon.spec +++ b/redhat/applications/fusion-icon/fusion-icon.spec @@ -1,6 +1,6 @@ # Default version for this component %define tde_pkg fusion-icon -%define tde_version 14.0.12 +%define tde_version 14.0.13 %if "%{?python2_sitelib}" == "" %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh deleted file mode 120000 index 373c65ab3..000000000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh +++ /dev/null @@ -1 +0,0 @@ -../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec index 50d951208..8c42846fb 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg gtk-qt-engine %define tde_prefix /opt/trinity @@ -56,9 +56,6 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: gtk-qt-engine.rc.sh -Source2: gtkrc-2.0-kde4 -Source3: gtkrc-2.0-kde-kde4 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -155,29 +152,20 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang gtkqtengine - -# Adds TDE's specific GTKRC -%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh" -%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4" -%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4" +%find_lang %{tde_pkg} %clean %__rm -rf %{buildroot} -%files -f gtkqtengine.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING TODO %{tde_tdelibdir}/kcm_kcmgtk.la %{tde_tdelibdir}/kcm_kcmgtk.so -%{tde_appdir}/kcmgtk.desktop -%dir %{tde_datadir}/apps/kgtk -%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh -%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4 -%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4 -%{tde_tdedocdir}/HTML/en/kcmgtk/ +%{tde_tdeappdir}/kcmgtk.desktop +%{tde_tdedocdir}/HTML/en/kcontrol/gtk/ # The following files are outside TDE's directory %dir %{_libdir}/gtk-2.0 diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 deleted file mode 120000 index 62aa57f04..000000000 --- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 +++ /dev/null @@ -1 +0,0 @@ -../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 deleted file mode 120000 index 2d0ca2867..000000000 --- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 +++ /dev/null @@ -1 +0,0 @@ -../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec index 9625000b1..320480e0d 100644 --- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec +++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg gtk3-tqt-engine %define tde_prefix /opt/trinity diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/gwenview-i18n/gwenview-i18n.spec index abae68347..a44800bfe 100644 --- a/redhat/applications/gwenview-i18n/gwenview-i18n.spec +++ b/redhat/applications/gwenview-i18n/gwenview-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg gwenview-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/gwenview/gwenview.spec b/redhat/applications/gwenview/gwenview.spec index 7c433ea0d..d821cf0ae 100644 --- a/redhat/applications/gwenview/gwenview.spec +++ b/redhat/applications/gwenview/gwenview.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg gwenview %define tde_prefix /opt/trinity diff --git a/redhat/applications/k3b-i18n/k3b-i18n.spec b/redhat/applications/k3b-i18n/k3b-i18n.spec index a41e13c4d..70bb9c4ce 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n.spec +++ b/redhat/applications/k3b-i18n/k3b-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg k3b-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/k3b/k3b.spec b/redhat/applications/k3b/k3b.spec index 081997aed..7500a19ca 100644 --- a/redhat/applications/k3b/k3b.spec +++ b/redhat/applications/k3b/k3b.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg k3b %define tde_prefix /opt/trinity @@ -90,7 +90,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -271,7 +271,7 @@ start. %{tde_tdelibdir}/libk3bwavedecoder.la %{tde_tdelibdir}/libk3bwavedecoder.so %lang(en) %{tde_tdedocdir}/HTML/en/k3b/ - +%{tde_mandir}/man1/k3b.1* ########## diff --git a/redhat/applications/k9copy/k9copy.spec b/redhat/applications/k9copy/k9copy.spec index be75a5d9d..20a351632 100644 --- a/redhat/applications/k9copy/k9copy.spec +++ b/redhat/applications/k9copy/k9copy.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg k9copy %define tde_prefix /opt/trinity @@ -150,6 +150,7 @@ fi --bindir=%{tde_bindir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ + --mandir=%{tde_mandir} \ \ --disable-dependency-tracking \ --disable-debug \ @@ -185,6 +186,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop %lang(en) %{tde_tdedocdir}/HTML/en/k9copy/ %{tde_datadir}/icons/hicolor/*/apps/k9copy.png +%{tde_mandir}/man1/k9copy.1* %changelog diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec index 020f7b5d2..f17d087bb 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec @@ -19,7 +19,7 @@ %define tde_pkg kaffeine-mozilla %define tde_prefix /opt/trinity %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif # TDE specific building variables diff --git a/redhat/applications/kaffeine/kaffeine.spec b/redhat/applications/kaffeine/kaffeine.spec index 880201c0f..51d127d5a 100644 --- a/redhat/applications/kaffeine/kaffeine.spec +++ b/redhat/applications/kaffeine/kaffeine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kaffeine %define tde_prefix /opt/trinity diff --git a/redhat/applications/kasablanca/kasablanca.spec b/redhat/applications/kasablanca/kasablanca.spec index 8999c251a..bd2eeef62 100644 --- a/redhat/applications/kasablanca/kasablanca.spec +++ b/redhat/applications/kasablanca/kasablanca.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kasablanca %define tde_prefix /opt/trinity diff --git a/redhat/applications/katapult/katapult.spec b/redhat/applications/katapult/katapult.spec index 8671261a3..c1c1f2019 100644 --- a/redhat/applications/katapult/katapult.spec +++ b/redhat/applications/katapult/katapult.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg katapult %define tde_prefix /opt/trinity diff --git a/redhat/applications/kbarcode/kbarcode.spec b/redhat/applications/kbarcode/kbarcode.spec index 080888d8f..1fed32a1f 100644 --- a/redhat/applications/kbarcode/kbarcode.spec +++ b/redhat/applications/kbarcode/kbarcode.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kbarcode %define tde_prefix /opt/trinity diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/kbfx/kbfx.spec index 4f0a7ac03..909a33b8f 100644 --- a/redhat/applications/kbfx/kbfx.spec +++ b/redhat/applications/kbfx/kbfx.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kbfx %define tde_prefix /opt/trinity @@ -82,7 +82,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/kbibtex/kbibtex.spec index 1da9eb950..901569d1a 100644 --- a/redhat/applications/kbibtex/kbibtex.spec +++ b/redhat/applications/kbibtex/kbibtex.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kbibtex %define tde_prefix /opt/trinity diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/kbiff/kbiff.spec index 443d646de..2e858f385 100644 --- a/redhat/applications/kbiff/kbiff.spec +++ b/redhat/applications/kbiff/kbiff.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kbiff %define tde_prefix /opt/trinity diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/kbookreader/kbookreader.spec index 5f184c09a..2861cf231 100644 --- a/redhat/applications/kbookreader/kbookreader.spec +++ b/redhat/applications/kbookreader/kbookreader.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kbookreader %define tde_prefix /opt/trinity diff --git a/redhat/applications/kchmviewer/kchmviewer.spec b/redhat/applications/kchmviewer/kchmviewer.spec index c6c4490dc..148d5ec8a 100644 --- a/redhat/applications/kchmviewer/kchmviewer.spec +++ b/redhat/applications/kchmviewer/kchmviewer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kchmviewer %define tde_prefix /opt/trinity diff --git a/redhat/applications/kcmautostart/kcmautostart.spec b/redhat/applications/kcmautostart/kcmautostart.spec index bb3dd1827..15702bf19 100644 --- a/redhat/applications/kcmautostart/kcmautostart.spec +++ b/redhat/applications/kcmautostart/kcmautostart.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kcmautostart %define tde_prefix /opt/trinity diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/kcmldap/kcmldap.spec index 7c1157bea..387e42e98 100644 --- a/redhat/applications/kcmldap/kcmldap.spec +++ b/redhat/applications/kcmldap/kcmldap.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kcmldap %define tde_prefix /opt/trinity diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec index 7235f1849..c5bca20d0 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kcmldapcontroller %define tde_prefix /opt/trinity diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/kcmldapmanager/kcmldapmanager.spec index e3c2836d7..542a3ce3c 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kcmldapmanager %define tde_prefix /opt/trinity diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/kcpuload/kcpuload.spec index a9a45f389..4b2a2340c 100644 --- a/redhat/applications/kcpuload/kcpuload.spec +++ b/redhat/applications/kcpuload/kcpuload.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kcpuload %define tde_prefix /opt/trinity diff --git a/redhat/applications/kdbg/kdbg.spec b/redhat/applications/kdbg/kdbg.spec index e5ba162ac..f15f9e9d5 100644 --- a/redhat/applications/kdbg/kdbg.spec +++ b/redhat/applications/kdbg/kdbg.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kdbg %define tde_prefix /opt/trinity diff --git a/redhat/applications/kdbusnotification/kdbusnotification.spec b/redhat/applications/kdbusnotification/kdbusnotification.spec index d7002ffb5..a919a36aa 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kdbusnotification %define tde_prefix /opt/trinity diff --git a/redhat/applications/kdiff3/kdiff3.spec b/redhat/applications/kdiff3/kdiff3.spec index ff9e7fecc..7b901eb50 100644 --- a/redhat/applications/kdiff3/kdiff3.spec +++ b/redhat/applications/kdiff3/kdiff3.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kdiff3 %define tde_prefix /opt/trinity diff --git a/redhat/applications/kdirstat/kdirstat.spec b/redhat/applications/kdirstat/kdirstat.spec index 7c635ffee..dcd7f2598 100644 --- a/redhat/applications/kdirstat/kdirstat.spec +++ b/redhat/applications/kdirstat/kdirstat.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kdirstat %define tde_prefix /opt/trinity diff --git a/redhat/applications/keep/keep.spec b/redhat/applications/keep/keep.spec index f909c4f5a..c480e868b 100644 --- a/redhat/applications/keep/keep.spec +++ b/redhat/applications/keep/keep.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg keep %define tde_prefix /opt/trinity diff --git a/redhat/applications/kerberostray/kerberostray.spec b/redhat/applications/kerberostray/kerberostray.spec index 9cbfe794d..be49ed367 100644 --- a/redhat/applications/kerberostray/kerberostray.spec +++ b/redhat/applications/kerberostray/kerberostray.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kerberostray %define tde_prefix /opt/trinity diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/keximdb/keximdb.spec index d5428de9f..af8b3c0df 100644 --- a/redhat/applications/keximdb/keximdb.spec +++ b/redhat/applications/keximdb/keximdb.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg keximdb %define tde_prefix /opt/trinity diff --git a/redhat/applications/kftpgrabber/kftpgrabber.spec b/redhat/applications/kftpgrabber/kftpgrabber.spec index 70103011d..c3bd78a21 100644 --- a/redhat/applications/kftpgrabber/kftpgrabber.spec +++ b/redhat/applications/kftpgrabber/kftpgrabber.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kftpgrabber %define tde_prefix /opt/trinity diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec index 9f549f615..ec3311356 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec +++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kgtk-qt3 %define tde_prefix /opt/trinity @@ -89,7 +89,7 @@ BuildRequires: gtk+2.0-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/applications/kile/kile.spec b/redhat/applications/kile/kile.spec index 6d51cb668..8fc9a86ae 100644 --- a/redhat/applications/kile/kile.spec +++ b/redhat/applications/kile/kile.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kile %define tde_prefix /opt/trinity @@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -149,45 +149,42 @@ Kile can support large projects consisting of several smaller files. %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/"*"/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} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +# Warning: GCC visibility causes the KCM not to work at all ! +%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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + .. %__make %{?_smp_mflags} + %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh - -# Unwanted files ... -%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml -%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -221,6 +218,7 @@ export PATH="%{tde_bindir}:${PATH}" %lang(pt) %{tde_tdedocdir}/HTML/pt/kile/ %lang(sv) %{tde_tdedocdir}/HTML/sv/kile/ +%{tde_mandir}/man1/kile.1* %changelog diff --git a/redhat/applications/kima/kima.spec b/redhat/applications/kima/kima.spec index 674d3ab52..bde20158a 100644 --- a/redhat/applications/kima/kima.spec +++ b/redhat/applications/kima/kima.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kima %define tde_prefix /opt/trinity diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/kiosktool/kiosktool.spec index ae61b59f2..6bd1357a2 100644 --- a/redhat/applications/kiosktool/kiosktool.spec +++ b/redhat/applications/kiosktool/kiosktool.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kiosktool %define tde_prefix /opt/trinity diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/kkbswitch/kkbswitch.spec index 9b2074f8d..b9113b344 100644 --- a/redhat/applications/kkbswitch/kkbswitch.spec +++ b/redhat/applications/kkbswitch/kkbswitch.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kkbswitch %define tde_prefix /opt/trinity diff --git a/redhat/applications/klamav/klamav.spec b/redhat/applications/klamav/klamav.spec index 96c950ec5..98c891c6a 100644 --- a/redhat/applications/klamav/klamav.spec +++ b/redhat/applications/klamav/klamav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg klamav %define tde_prefix /opt/trinity diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/klcddimmer/klcddimmer.spec index 201856c74..bdd52f204 100644 --- a/redhat/applications/klcddimmer/klcddimmer.spec +++ b/redhat/applications/klcddimmer/klcddimmer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg klcddimmer %define tde_prefix /opt/trinity diff --git a/redhat/applications/kmplayer/kmplayer.spec b/redhat/applications/kmplayer/kmplayer.spec index b7728d209..bf956c1de 100644 --- a/redhat/applications/kmplayer/kmplayer.spec +++ b/redhat/applications/kmplayer/kmplayer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kmplayer %define tde_prefix /opt/trinity diff --git a/redhat/applications/kmyfirewall/kmyfirewall.spec b/redhat/applications/kmyfirewall/kmyfirewall.spec index f7883e4f4..857fa4f82 100644 --- a/redhat/applications/kmyfirewall/kmyfirewall.spec +++ b/redhat/applications/kmyfirewall/kmyfirewall.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kmyfirewall %define tde_prefix /opt/trinity diff --git a/redhat/applications/kmymoney/kmymoney.spec b/redhat/applications/kmymoney/kmymoney.spec index 0154e5e34..ed8d04fb8 100644 --- a/redhat/applications/kmymoney/kmymoney.spec +++ b/redhat/applications/kmymoney/kmymoney.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kmymoney %define tde_prefix /opt/trinity diff --git a/redhat/applications/knemo/knemo.spec b/redhat/applications/knemo/knemo.spec index 0e135ffce..b8c152a97 100644 --- a/redhat/applications/knemo/knemo.spec +++ b/redhat/applications/knemo/knemo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg knemo %define tde_prefix /opt/trinity diff --git a/redhat/applications/knetload/knetload.spec b/redhat/applications/knetload/knetload.spec index ab4529620..cba84df2b 100644 --- a/redhat/applications/knetload/knetload.spec +++ b/redhat/applications/knetload/knetload.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg knetload %define tde_prefix /opt/trinity diff --git a/redhat/applications/knetstats/knetstats.spec b/redhat/applications/knetstats/knetstats.spec index 68740c667..6d873bc4c 100644 --- a/redhat/applications/knetstats/knetstats.spec +++ b/redhat/applications/knetstats/knetstats.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg knetstats %define tde_prefix /opt/trinity diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8.spec b/redhat/applications/knetworkmanager8/knetworkmanager8.spec index 4080d8ee4..10be14d90 100644 --- a/redhat/applications/knetworkmanager8/knetworkmanager8.spec +++ b/redhat/applications/knetworkmanager8/knetworkmanager8.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg knetworkmanager %define tde_prefix /opt/trinity diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/knights/knights.spec index 9edeed1a6..d5177c358 100644 --- a/redhat/applications/knights/knights.spec +++ b/redhat/applications/knights/knights.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg knights %define tde_prefix /opt/trinity diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/knmap/knmap.spec index 8256060f3..b8ae3d2ec 100644 --- a/redhat/applications/knmap/knmap.spec +++ b/redhat/applications/knmap/knmap.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg knmap %define tde_prefix /opt/trinity diff --git a/redhat/applications/knowit/knowit.spec b/redhat/applications/knowit/knowit.spec index bacd63e23..9cb76c32d 100644 --- a/redhat/applications/knowit/knowit.spec +++ b/redhat/applications/knowit/knowit.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg knowit %define tde_prefix /opt/trinity diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/knutclient/knutclient.spec index 814d3da5d..d2b7c8399 100644 --- a/redhat/applications/knutclient/knutclient.spec +++ b/redhat/applications/knutclient/knutclient.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg knutclient %define tde_prefix /opt/trinity diff --git a/redhat/applications/koffice-i18n/koffice-i18n.spec b/redhat/applications/koffice-i18n/koffice-i18n.spec index 7071899e3..e28ae5757 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg koffice-i18n %define tde_prefix /opt/trinity @@ -74,7 +74,7 @@ BuildRequires: desktop-file-utils BuildRequires: findutils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -573,45 +573,66 @@ Provides: %{name}-tz_TW = %{?epoch:%{epoch}:}%{version}-%{release} %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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" - %build +unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" + +( +for l in . %{TDE_LANGS}; do + if [ $l != '.' ]; then + pushd "%{tde_pkg}-${l}" + else + pushd ${l} + fi + + 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_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ + -DBUILD_ALL=ON \ + \ + .. + + %__make %{?_smp_mflags} + + popd +done +) 2>&1 | tee /tmp/rpmbuild.$$ -export kde_htmldir="%{tde_tdedocdir}/HTML" +if grep -qw TDE_Error /tmp/rpmbuild.$$; then + echo "Error while building. See '/tmp/rpmbuild.$$'" + exit 1 +fi -for l in %{TDE_LANGS}; do - for f in koffice-i18n-${l}/; do - if [ -d "${f}" ]; then - pushd ${f} - %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|" - %__make -f "admin/Makefile.common" - %configure \ - --prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} - %__make %{?_smp_mflags} - popd - fi - done -done +wait +rm -f /tmp/rpmbuild.$$ %install -%__rm -rf %{?buildroot} export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} for l in %{TDE_LANGS}; do - for f in koffice-i18n-${l}/; do - if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then - %__make install DESTDIR="%{?buildroot}" -C "${f}" - fi - done + %__make DESTDIR=%{buildroot} -C build install-${l} done -# remove zero-length file -find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec index 36eabac3e..8d5a12144 100644 --- a/redhat/applications/koffice/koffice.spec +++ b/redhat/applications/koffice/koffice.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg koffice %define tde_prefix /opt/trinity @@ -113,11 +113,12 @@ BuildRequires: libexif-devel BuildRequires: readline-devel # PYTHON support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 %define with_python 0 +%global __python %__python3 %else %define with_python 1 -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 +%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} @@ -398,6 +399,10 @@ Requires: perl %{tde_tdelibdir}/krossruby.* %endif %endif +%{tde_mandir}/man1/koconverter.1* +%{tde_mandir}/man1/koscript.1* +%{tde_mandir}/man1/koshell.1* +%{tde_mandir}/man1/kthesaurus.1* ########## @@ -434,6 +439,7 @@ License: LGPLv2+ %{tde_libdir}/libkrossapi.so.* %{tde_libdir}/libkrossmain.so.* %endif +%{tde_mandir}/man1/kspread.1* ########## @@ -479,6 +485,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_datadir}/templates/TextDocument.desktop %{tde_datadir}/templates/.source/TextDocument.kwt %{tde_tdeappdir}/*kword.desktop +%{tde_mandir}/man1/kword.1* ########## @@ -541,6 +548,8 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_datadir}/templates/Presentation.desktop %{tde_datadir}/templates/.source/Presentation.kpt %{tde_tdeappdir}/*kpresenter.desktop +%{tde_mandir}/man1/kprconverter.pl.1* +%{tde_mandir}/man1/kpresenter.1* ########## @@ -565,6 +574,7 @@ Obsoletes: kivio < %{?epoch:%{epoch}:}%{version}-%{release} %{tde_datadir}/config.kcfg/kivio.kcfg %{tde_datadir}/services/kivio*.desktop %{tde_tdeappdir}/*kivio.desktop +%{tde_mandir}/man1/kivio.1* ########## @@ -591,6 +601,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_datadir}/templates/Illustration.desktop %{tde_datadir}/templates/.source/Illustration.karbon %{tde_tdeappdir}/*karbon.desktop +%{tde_mandir}/man1/karbon.1* ########## @@ -620,6 +631,8 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_datadir}/services/kugar*.desktop %{tde_tdeappdir}/*kugar.desktop %{tde_tdeappdir}/*kudesigner.desktop +%{tde_mandir}/man1/kudesigner.1* +%{tde_mandir}/man1/kugar.1* ########## @@ -725,6 +738,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_datadir}/apps/kchart/ %{tde_datadir}/services/kchart*.desktop %{tde_tdeappdir}/*kchart.desktop +%{tde_mandir}/man1/kchart.1* ########## @@ -765,6 +779,7 @@ Requires: dejavu %{tde_datadir}/apps/kformula/ %{tde_datadir}/services/kformula*.desktop %{tde_tdeappdir}/*kformula.desktop +%{tde_mandir}/man1/kformula.1* ########## diff --git a/redhat/applications/kompose/kompose.spec b/redhat/applications/kompose/kompose.spec index a007a6a6a..6e5f55137 100644 --- a/redhat/applications/kompose/kompose.spec +++ b/redhat/applications/kompose/kompose.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kompose %define tde_prefix /opt/trinity diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec index b238f1d8f..c5ba96312 100644 --- a/redhat/applications/konversation/konversation.spec +++ b/redhat/applications/konversation/konversation.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg konversation %define tde_prefix /opt/trinity @@ -74,6 +74,23 @@ BuildRequires: libidn-devel # OPENSSL support BuildRequires: openssl-devel +# PYTHON support +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 +%define with_python 0 +%global __python %__python3 +%else +%define with_python 1 +%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -110,7 +127,7 @@ BuildRequires: libXi6-devel # RHEL 6: available in EPEL # RHEL 7: available in NUX # RHEL 8: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -182,7 +199,7 @@ and experienced users alike will appreciate its many features: %if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 %__sed -i "konversation/scripts/media" \ "konversation/scripts/weather" \ - -e "s|/usr/bin/env python|/usr/bin/env python2|" + -e "s|/usr/bin/env python|/usr/bin/env %{python}|" %endif diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec index 7cf9e340e..679eb263b 100644 --- a/redhat/applications/kooldock/kooldock.spec +++ b/redhat/applications/kooldock/kooldock.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kooldock %define tde_prefix /opt/trinity diff --git a/redhat/applications/kopete-otr/kopete-otr.spec b/redhat/applications/kopete-otr/kopete-otr.spec index f52c32efc..aa019adc3 100644 --- a/redhat/applications/kopete-otr/kopete-otr.spec +++ b/redhat/applications/kopete-otr/kopete-otr.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kopete-otr %define tde_prefix /opt/trinity diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/kpicosim/kpicosim.spec index 201e93da4..be5aabf54 100644 --- a/redhat/applications/kpicosim/kpicosim.spec +++ b/redhat/applications/kpicosim/kpicosim.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kpicosim %define tde_prefix /opt/trinity diff --git a/redhat/applications/kpilot/kpilot.spec b/redhat/applications/kpilot/kpilot.spec index 39250ef79..3b5a2320c 100644 --- a/redhat/applications/kpilot/kpilot.spec +++ b/redhat/applications/kpilot/kpilot.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kpilot %define tde_prefix /opt/trinity diff --git a/redhat/applications/kplayer/kplayer.spec b/redhat/applications/kplayer/kplayer.spec index 9968bb261..8d6c4ff50 100644 --- a/redhat/applications/kplayer/kplayer.spec +++ b/redhat/applications/kplayer/kplayer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kplayer %define tde_prefix /opt/trinity diff --git a/redhat/applications/kpowersave/kpowersave.spec b/redhat/applications/kpowersave/kpowersave.spec index 1490b1cef..b5aec8ecc 100644 --- a/redhat/applications/kpowersave/kpowersave.spec +++ b/redhat/applications/kpowersave/kpowersave.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kpowersave %define tde_prefix /opt/trinity diff --git a/redhat/applications/krecipes/krecipes.spec b/redhat/applications/krecipes/krecipes.spec index 57b8a628b..f7112b8fe 100644 --- a/redhat/applications/krecipes/krecipes.spec +++ b/redhat/applications/krecipes/krecipes.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg krecipes %define tde_prefix /opt/trinity @@ -130,6 +130,7 @@ export PATH="%{tde_bindir}:${PATH}" --includedir=%{tde_tdeincludedir} \ --docdir=%{tde_tdedocdir} \ --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ \ --disable-dependency-tracking \ --disable-debug \ @@ -185,6 +186,6 @@ export PATH="%{tde_bindir}:${PATH}" %lang(et) %{tde_tdedocdir}/HTML/et/ %lang(pt) %{tde_tdedocdir}/HTML/pt/ %lang(sv) %{tde_tdedocdir}/HTML/sv/ - +%{tde_mandir}/man1/krecipes.1* %changelog diff --git a/redhat/applications/krename/krename.spec b/redhat/applications/krename/krename.spec index 65a613926..29f70adc8 100644 --- a/redhat/applications/krename/krename.spec +++ b/redhat/applications/krename/krename.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg krename %define tde_prefix /opt/trinity diff --git a/redhat/applications/krusader/krusader.spec b/redhat/applications/krusader/krusader.spec index 64a727f1c..25c9ff32e 100644 --- a/redhat/applications/krusader/krusader.spec +++ b/redhat/applications/krusader/krusader.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg krusader %define tde_prefix /opt/trinity diff --git a/redhat/applications/kscope/kscope.spec b/redhat/applications/kscope/kscope.spec index 0aed6a9c4..ff4a09b2c 100644 --- a/redhat/applications/kscope/kscope.spec +++ b/redhat/applications/kscope/kscope.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kscope %define tde_prefix /opt/trinity diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/ksensors/ksensors.spec index 1b572eed4..9786d45b2 100644 --- a/redhat/applications/ksensors/ksensors.spec +++ b/redhat/applications/ksensors/ksensors.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg ksensors %define tde_prefix /opt/trinity diff --git a/redhat/applications/kshowmail/kshowmail.spec b/redhat/applications/kshowmail/kshowmail.spec index 59970430c..3f22687a7 100644 --- a/redhat/applications/kshowmail/kshowmail.spec +++ b/redhat/applications/kshowmail/kshowmail.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kshowmail %define tde_prefix /opt/trinity diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/kshutdown/kshutdown.spec index ebcd4fd79..c7c463346 100644 --- a/redhat/applications/kshutdown/kshutdown.spec +++ b/redhat/applications/kshutdown/kshutdown.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kshutdown %define tde_prefix /opt/trinity diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec index 6aa6b17bd..be7398d7d 100644 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec +++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg ksplash-engine-moodin %define tde_prefix /opt/trinity diff --git a/redhat/applications/ksquirrel/ksquirrel.spec b/redhat/applications/ksquirrel/ksquirrel.spec index 2efd56253..858682933 100644 --- a/redhat/applications/ksquirrel/ksquirrel.spec +++ b/redhat/applications/ksquirrel/ksquirrel.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg ksquirrel %define tde_prefix /opt/trinity diff --git a/redhat/applications/kstreamripper/kstreamripper.spec b/redhat/applications/kstreamripper/kstreamripper.spec index a450d6978..e56b828b7 100644 --- a/redhat/applications/kstreamripper/kstreamripper.spec +++ b/redhat/applications/kstreamripper/kstreamripper.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kstreamripper %define tde_prefix /opt/trinity diff --git a/redhat/applications/ksystemlog/ksystemlog.spec b/redhat/applications/ksystemlog/ksystemlog.spec index 755e034de..e7d443300 100644 --- a/redhat/applications/ksystemlog/ksystemlog.spec +++ b/redhat/applications/ksystemlog/ksystemlog.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg ksystemlog %define tde_prefix /opt/trinity diff --git a/redhat/applications/ktechlab/ktechlab.spec b/redhat/applications/ktechlab/ktechlab.spec index 3152ffa84..2e4c66048 100644 --- a/redhat/applications/ktechlab/ktechlab.spec +++ b/redhat/applications/ktechlab/ktechlab.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg ktechlab %define tde_prefix /opt/trinity diff --git a/redhat/applications/ktorrent/ktorrent.spec b/redhat/applications/ktorrent/ktorrent.spec index 7db84e8e7..c48835a15 100644 --- a/redhat/applications/ktorrent/ktorrent.spec +++ b/redhat/applications/ktorrent/ktorrent.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg ktorrent %define tde_prefix /opt/trinity @@ -214,6 +214,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/ktzeroconfplugin.la %{tde_tdelibdir}/ktzeroconfplugin.so %endif +%{tde_mandir}/man1/ktorrent.1* %changelog diff --git a/redhat/applications/kuickshow/kuickshow.spec b/redhat/applications/kuickshow/kuickshow.spec index 5cfe04a4f..ec3d708ab 100644 --- a/redhat/applications/kuickshow/kuickshow.spec +++ b/redhat/applications/kuickshow/kuickshow.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kuickshow %define tde_prefix /opt/trinity diff --git a/redhat/applications/kvirc/kvirc.spec b/redhat/applications/kvirc/kvirc.spec index a891ff98a..3df715e34 100644 --- a/redhat/applications/kvirc/kvirc.spec +++ b/redhat/applications/kvirc/kvirc.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kvirc %define tde_prefix /opt/trinity diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/kvkbd/kvkbd.spec index 3d4721dda..c5f3283ff 100644 --- a/redhat/applications/kvkbd/kvkbd.spec +++ b/redhat/applications/kvkbd/kvkbd.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kvkbd %define tde_prefix /opt/trinity diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/kvpnc/kvpnc.spec index 7e46282fc..e38a97b74 100644 --- a/redhat/applications/kvpnc/kvpnc.spec +++ b/redhat/applications/kvpnc/kvpnc.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kvpnc %define tde_prefix /opt/trinity diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/kxmleditor/kxmleditor.spec index 0643be420..4635ee43f 100644 --- a/redhat/applications/kxmleditor/kxmleditor.spec +++ b/redhat/applications/kxmleditor/kxmleditor.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg kxmleditor %define tde_prefix /opt/trinity @@ -76,8 +76,6 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -Requires: mplayer - %description KXML Editor is a simple program, that displays and edits the contents of an diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec index faef20a8c..61421491f 100644 --- a/redhat/applications/mathemagics/mathemagics.spec +++ b/redhat/applications/mathemagics/mathemagics.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg mathemagics %define tde_prefix /opt/trinity diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/mplayerthumbs/mplayerthumbs.spec index 6f3f97c69..a613b826b 100644 --- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec +++ b/redhat/applications/mplayerthumbs/mplayerthumbs.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg mplayerthumbs %define tde_prefix /opt/trinity diff --git a/redhat/applications/piklab/piklab.spec b/redhat/applications/piklab/piklab.spec index c3ff16352..86906fb80 100644 --- a/redhat/applications/piklab/piklab.spec +++ b/redhat/applications/piklab/piklab.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg piklab %define tde_prefix /opt/trinity @@ -84,7 +84,12 @@ BuildRequires: readline-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else -BuildRequires: libusb-devel +%if 0%{?fedora} >= 37 +BuildRequires: libusb1-devel +BuildRequires: libusb-compat-0.1-devel +%else +BuildRequires: libusb-devel +%endif %endif diff --git a/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec index 4be2838da..a2b1220c7 100644 --- a/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec +++ b/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg polkit-agent-tde %define tde_prefix /opt/trinity diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/potracegui/potracegui.spec index 35a369b43..6350a6d5e 100644 --- a/redhat/applications/potracegui/potracegui.spec +++ b/redhat/applications/potracegui/potracegui.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg potracegui %define tde_prefix /opt/trinity diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec index f05d6bff8..5e690b485 100644 --- a/redhat/applications/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/qalculate-tde/qalculate-tde.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg qalculate-tde %define tde_prefix /opt/trinity diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec index d6a8665e9..9fdca0ed1 100644 --- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec +++ b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg qt4-tqt-theme-engine %define tde_prefix /opt/trinity diff --git a/redhat/applications/rosegarden/rosegarden.spec b/redhat/applications/rosegarden/rosegarden.spec index c53cf3eec..b8cae72de 100644 --- a/redhat/applications/rosegarden/rosegarden.spec +++ b/redhat/applications/rosegarden/rosegarden.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg rosegarden %define tde_prefix /opt/trinity @@ -115,7 +115,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -234,6 +234,10 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_bindir}/rosegarden-lilypondview %{tde_bindir}/rosegarden-project-package %{tde_bindir}/rosegardensequencer +%{tde_mandir}/man1/rosegarden-audiofile-importer.1* +%{tde_mandir}/man1/rosegarden-lilypondview.1* +%{tde_mandir}/man1/rosegarden-project-package.1* +%{tde_mandir}/man1/rosegarden.1* %files data -f %{tde_pkg}.lang %defattr(-,root,root,-) diff --git a/redhat/applications/smartcardauth/smartcardauth.spec b/redhat/applications/smartcardauth/smartcardauth.spec index 7e9a720ee..e001dfcd3 100644 --- a/redhat/applications/smartcardauth/smartcardauth.spec +++ b/redhat/applications/smartcardauth/smartcardauth.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg smartcardauth %define tde_prefix /opt/trinity diff --git a/redhat/applications/smb4k/smb4k.spec b/redhat/applications/smb4k/smb4k.spec index b7e08d9ce..449801a12 100644 --- a/redhat/applications/smb4k/smb4k.spec +++ b/redhat/applications/smb4k/smb4k.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg smb4k %define tde_prefix /opt/trinity diff --git a/redhat/applications/soundkonverter/soundkonverter.spec b/redhat/applications/soundkonverter/soundkonverter.spec index 1ea3367df..ee2c4eec2 100644 --- a/redhat/applications/soundkonverter/soundkonverter.spec +++ b/redhat/applications/soundkonverter/soundkonverter.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg soundkonverter %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec index 8f95a0949..93c72ba6f 100644 --- a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec +++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdesshaskpass %define tde_prefix /opt/trinity diff --git a/redhat/applications/tastymenu/tastymenu.spec b/redhat/applications/tastymenu/tastymenu.spec index 6789e6d7c..5e5c75ba8 100644 --- a/redhat/applications/tastymenu/tastymenu.spec +++ b/redhat/applications/tastymenu/tastymenu.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tastymenu %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/tde-guidance/tde-guidance.spec index 278b89e9d..c81df72a5 100644 --- a/redhat/applications/tde-guidance/tde-guidance.spec +++ b/redhat/applications/tde-guidance/tde-guidance.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tde-guidance %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/tde-style-baghira/tde-style-baghira.spec index d799c46f6..e9ab3d09a 100644 --- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec +++ b/redhat/applications/tde-style-baghira/tde-style-baghira.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tde-style-baghira %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/tde-style-domino/tde-style-domino.spec index 88b1d1cbe..ce45f8729 100644 --- a/redhat/applications/tde-style-domino/tde-style-domino.spec +++ b/redhat/applications/tde-style-domino/tde-style-domino.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tde-style-domino %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec index 629f6b800..a93f4b5d6 100644 --- a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec +++ b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tde-style-ia-ora %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec index db51d2493..a51a4451e 100644 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec +++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tde-style-lipstik %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec index e1b7bb9c0..bbda03969 100644 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec +++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tde-style-qtcurve %define tde_prefix /opt/trinity @@ -85,7 +85,7 @@ BuildRequires: libacl-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/tde-systemsettings/tde-systemsettings.spec index bfcbabfc1..4156d4ee7 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tde-systemsettings %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/tdedocker/tdedocker.spec index 5d282100f..5812749bf 100644 --- a/redhat/applications/tdedocker/tdedocker.spec +++ b/redhat/applications/tdedocker/tdedocker.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdedocker %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio-appinfo/tdeio-appinfo.spec new file mode 100644 index 000000000..1fecbfec7 --- /dev/null +++ b/redhat/applications/tdeio-appinfo/tdeio-appinfo.spec @@ -0,0 +1,160 @@ +# +# spec file for package tdeio-appinfo (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.13 +%endif +%define tde_pkg tdeio-appinfo +%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_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDEIO slave for the appinfo protocol +Group: Productivity/Networking/Ftp/Clients +URL: http://lukeplant.me.uk/kio-appinfo/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +Adds support for the "appinfo:" protocol +to Konqueror and other TDE applications. +. +This enables you to perform appinfo: searches in TDE. + +########## + +%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}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +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_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf %{?buildroot} + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING README.md +%{tde_tdelibdir}/tdeio_appinfo.la +%{tde_tdelibdir}/tdeio_appinfo.so +%{tde_datadir}/services/appinfo.protocol + + +%changelog diff --git a/redhat/applications/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio-apt/tdeio-apt.spec index 66f6b5a1d..21e330cf7 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdeio-apt %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio-ftps/tdeio-ftps.spec index bc90a0953..c8e84f7e9 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec +++ b/redhat/applications/tdeio-ftps/tdeio-ftps.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdeio-ftps %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio-gopher/tdeio-gopher.spec index 879acacab..dbef03ad3 100644 --- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec +++ b/redhat/applications/tdeio-gopher/tdeio-gopher.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdeio-gopher %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio-locate/tdeio-locate.spec index 3a105c929..5d3339de7 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdeio-locate %define tde_prefix /opt/trinity @@ -84,7 +84,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -156,19 +156,20 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang %{tde_pkg} +%find_lang tdeio_locate + %clean %__rm -rf %{buildroot} -%files -f %{tde_pkg}.lang +%files -f tdeio_locate.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING TODO %{tde_tdelibdir}/tdeio_locate.la %{tde_tdelibdir}/tdeio_locate.so -%{tde_tdedocdir}/HTML/en/tdeio-locate/ +%{tde_tdedocdir}/HTML/en/tdeioslave/locate/ %{tde_datadir}/services/locate.protocol %{tde_datadir}/services/locater.protocol %{tde_datadir}/services/rlocate.protocol diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio-sword/tdeio-sword.spec index 45190e98a..6d0ca5158 100644 --- a/redhat/applications/tdeio-sword/tdeio-sword.spec +++ b/redhat/applications/tdeio-sword/tdeio-sword.spec @@ -23,7 +23,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdeio-sword %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec index 825ed5758..cfd75c0a6 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdeio-umountwrapper %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec index 39e2379b0..78979984e 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdenetworkmanager %define tde_prefix /opt/trinity @@ -136,7 +136,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/applications/tdepacman/tdepacman.spec b/redhat/applications/tdepacman/tdepacman.spec index 00a014e0b..59269b25a 100644 --- a/redhat/applications/tdepacman/tdepacman.spec +++ b/redhat/applications/tdepacman/tdepacman.spec @@ -18,7 +18,7 @@ # Default version for this component %define tde_pkg tdepacman %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif # TDE specific building variables diff --git a/redhat/applications/tdepowersave/tdepowersave.spec b/redhat/applications/tdepowersave/tdepowersave.spec index 64e7d386b..296de3b4c 100644 --- a/redhat/applications/tdepowersave/tdepowersave.spec +++ b/redhat/applications/tdepowersave/tdepowersave.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdepowersave %define tde_prefix /opt/trinity @@ -117,7 +117,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -233,7 +233,7 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING TODO %{tde_bindir}/tdepowersave %{tde_libdir}/libtdeinit_tdepowersave.la %{tde_libdir}/libtdeinit_tdepowersave.so diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/tderadio/tderadio.spec index 11ac12a23..121784cc3 100644 --- a/redhat/applications/tderadio/tderadio.spec +++ b/redhat/applications/tderadio/tderadio.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tderadio %define tde_prefix /opt/trinity @@ -65,7 +65,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 @@ -147,45 +147,36 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-visibility causes applications fails to start ! -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --program-prefix="" \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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_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 \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \ - --enable-v4l2 \ - --enable-lame \ - --enable-ogg \ - --enable-alsa \ - --enable-oss - -%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 -%__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||" -%endif + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} @@ -193,7 +184,7 @@ export PATH="%{tde_bindir}:${PATH}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -202,6 +193,10 @@ export PATH="%{tde_bindir}:${PATH}" %suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner %endif +# Remove devel files +%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.la +%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.so + %clean %__rm -rf %{buildroot} @@ -211,6 +206,8 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %{tde_bindir}/convert-presets %{tde_bindir}/tderadio +%{tde_libdir}/libtderadio.so.0 +%{tde_libdir}/libtderadio.so.0.0.0 %dir %{tde_libdir}/tderadio %dir %{tde_libdir}/tderadio/plugins %{tde_libdir}/tderadio/plugins/*.la @@ -221,10 +218,14 @@ export PATH="%{tde_bindir}:${PATH}" %dir %{tde_datadir}/icons/hicolor/256x256/actions %{tde_datadir}/icons/hicolor/*/*/tderadio*.png %{tde_datadir}/icons/locolor/*/*/tderadio*.png +%{tde_datadir}/pixmaps/tderadio.xpm %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo %lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %{tde_tdedocdir}/HTML/en/tderadio/ +%{tde_mandir}/man1/convert-presets.1* +%{tde_mandir}/man1/tderadio.1* + %changelog diff --git a/redhat/applications/tdesudo/tdesudo.spec b/redhat/applications/tdesudo/tdesudo.spec index 3b0ddc1f2..0b68294f0 100644 --- a/redhat/applications/tdesudo/tdesudo.spec +++ b/redhat/applications/tdesudo/tdesudo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdesudo %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdesvn/tdesvn.spec b/redhat/applications/tdesvn/tdesvn.spec index 06e990b94..6813b17ad 100644 --- a/redhat/applications/tdesvn/tdesvn.spec +++ b/redhat/applications/tdesvn/tdesvn.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdesvn %define tde_prefix /opt/trinity @@ -91,7 +91,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/applications/tdmtheme/tdmtheme.spec b/redhat/applications/tdmtheme/tdmtheme.spec index e54636c6c..4a257ea81 100644 --- a/redhat/applications/tdmtheme/tdmtheme.spec +++ b/redhat/applications/tdmtheme/tdmtheme.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdmtheme %define tde_prefix /opt/trinity diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/tellico/tellico.spec index 564e0e539..1645a3e61 100644 --- a/redhat/applications/tellico/tellico.spec +++ b/redhat/applications/tellico/tellico.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} >= 23 +%if 0%{?fedora} >= 23 || 0%{?rhel} >= 9 %define _hardened_ldflags %nil %endif @@ -13,7 +13,7 @@ # 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) +# license that confolrms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://www.trinitydesktop.org/ @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tellico %define tde_prefix /opt/trinity @@ -139,7 +139,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -154,11 +154,11 @@ BuildRequires: libacl-devel BuildRequires: libattr-devel # PYTHON support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 %define python python3 %define __python %__python3 %else -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 +%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} @@ -197,6 +197,7 @@ It also makes it easy for other softwares to use the Tellico data. %{tde_bindir}/tellico %{tde_datadir}/applications %config(noreplace) %{tde_confdir}/tellicorc +%{tde_mandir}/man1/tellico.1* ########## @@ -297,7 +298,7 @@ fi "src/fetch/scripts/ministerio_de_cultura.py" \ "src/fetch/scripts/fr.allocine.py" \ "src/translators/griffith2tellico.py" \ - -e "s|/usr/bin/env python|/usr/bin/env python2|" + -e "s|/usr/bin/env python|/usr/bin/env %{python}|" %endif diff --git a/redhat/applications/tork/tork.spec b/redhat/applications/tork/tork.spec index 87d9bf393..04207d15a 100644 --- a/redhat/applications/tork/tork.spec +++ b/redhat/applications/tork/tork.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tork %define tde_prefix /opt/trinity diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/twin-style-crystal/twin-style-crystal.spec index d305d12d9..7993d0589 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal.spec +++ b/redhat/applications/twin-style-crystal/twin-style-crystal.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg twin-style-crystal %define tde_prefix /opt/trinity diff --git a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec index bd3908501..342a881ba 100644 --- a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec +++ b/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg twin-style-dekorator %define tde_prefix /opt/trinity diff --git a/redhat/applications/twin-style-machbunt/twin-style-machbunt.spec b/redhat/applications/twin-style-machbunt/twin-style-machbunt.spec new file mode 100644 index 000000000..5d17ee631 --- /dev/null +++ b/redhat/applications/twin-style-machbunt/twin-style-machbunt.spec @@ -0,0 +1,153 @@ +# +# spec file for package twin-style-machbunt (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.13 +%endif +%define tde_pkg twin-style-machbunt +%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_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE window decoration from SUSE 9.1/9.2 +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2. + +An example color scheme is provided too. + + +########## + +%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}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +# Warning: GCC visibility causes FTBFS [Bug #1285] +%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_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + \ + -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 + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_tdelibdir}/twin3_MachBunt.la +%{tde_tdelibdir}/twin3_MachBunt.so +%{tde_datadir}/apps/tdedisplay/color-schemes/MachBunt.kcsrc +%{tde_datadir}/apps/twin/MachBunt.desktop + + +%changelog diff --git a/redhat/applications/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/twin-style-suse2/twin-style-suse2.spec index f1498e0ab..a7cb50bf4 100644 --- a/redhat/applications/twin-style-suse2/twin-style-suse2.spec +++ b/redhat/applications/twin-style-suse2/twin-style-suse2.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg twin-style-suse2 %define tde_prefix /opt/trinity diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/wlassistant/wlassistant.spec index 46c2136ed..3ea4d2209 100644 --- a/redhat/applications/wlassistant/wlassistant.spec +++ b/redhat/applications/wlassistant/wlassistant.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg wlassistant %define tde_prefix /opt/trinity @@ -96,17 +96,17 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif # PYTHON support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 %define python python3 %define __python %__python3 %else -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 +%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} diff --git a/redhat/applications/yakuake/yakuake.spec b/redhat/applications/yakuake/yakuake.spec index 92559fadc..849b49201 100644 --- a/redhat/applications/yakuake/yakuake.spec +++ b/redhat/applications/yakuake/yakuake.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg yakuake %define tde_prefix /opt/trinity |