From f01a421b4fe4d008074832708f24472aa857a48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 22 Apr 2015 22:07:38 +0200 Subject: RPM packaging: update ksplash-engine-moodin, ksquirrel, kstreamripper, ksystemlog, ktechlab --- .../applications/ksquirrel/ksquirrel-14.0.0.spec | 115 ++++++++++----- .../applications/ksquirrel/ksquirrel-3.5.13.1.spec | 154 --------------------- .../applications/ksquirrel/ksquirrel-3.5.13.spec | 146 ------------------- 3 files changed, 81 insertions(+), 334 deletions(-) delete mode 100644 redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec delete mode 100644 redhat/applications/ksquirrel/ksquirrel-3.5.13.spec (limited to 'redhat/applications/ksquirrel') diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec index 67d287878..051c98789 100644 --- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec +++ b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec @@ -1,56 +1,97 @@ -# Default version for this component -%define tde_pkg ksquirrel +# +# spec file for package ksquirrel (version R14.0.0) +# +# 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 %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE specific building variables +%define tde_pkg ksquirrel +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.8.0 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Powerful Trinity image viewer +Group: Amusements/Games +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Summary: Powerful Trinity image viewer -Version: 0.8.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Amusements/Games +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils - BuildRequires: gettext BuildRequires: trinity-libkipi-devel BuildRequires: trinity-libksquirrel-devel -#BuildRequires: libkexif-devel + +BuildRequires: autoconf automake libtool m4 +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 + +# MESA support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: mesaglu-devel +%endif +%if 0%{?suse_version} +BuildRequires: Mesa-libGL-devel +BuildRequires: Mesa-libGLU-devel +%endif +%if 0%{?rhel} == 4 +BuildRequires: xorg-x11-Mesa-libGLU +%endif + %description KSquirrel is an image viewer for TDE with disk navigator, file tree, @@ -61,10 +102,14 @@ KSquirrel is a fast and convenient image viewer for TDE featuring OpenGL and dynamic format support. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -116,12 +161,12 @@ export PATH="%{tde_bindir}:${PATH}" %post -update-desktop-database %{tde_appdir} > /dev/null +update-desktop-database %{tde_tdeappdir} > /dev/null touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %postun -update-desktop-database %{tde_appdir} > /dev/null +update-desktop-database %{tde_tdeappdir} > /dev/null touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : @@ -135,10 +180,12 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_tdelibdir}/libksquirrelpart.la %{tde_tdelibdir}/libksquirrelpart.so %{tde_tdeappdir}/ksquirrel.desktop +%dir %{tde_datadir}/apps/dolphin +%dir %{tde_datadir}/apps/dolphin/servicemenus %{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop %{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop %{tde_datadir}/apps/ksquirrel/ -%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc +%{tde_datadir}/apps/ksquirrelpart/ %{tde_datadir}/config/magic/x-ras.magic %{tde_datadir}/config/magic/x-sun.magic %{tde_datadir}/config/magic/x-utah.magic @@ -150,5 +197,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_mandir}/man1/ksquirrel.1 %changelog -* Fri Jul 05 2013 Francois Andriot - 0.8.0-6 +* Fri Jul 05 2013 Francois Andriot - 2:0.8.0-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec deleted file mode 100644 index 7a27d58d9..000000000 --- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec +++ /dev/null @@ -1,154 +0,0 @@ -# Default version for this component -%define kdecomp ksquirrel - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: Powerful Trinity image viewer -Version: 0.8.0 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Amusements/Games - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils -BuildRequires: gettext - -BuildRequires: trinity-libkipi-devel -BuildRequires: trinity-libksquirrel-devel -#BuildRequires: libkexif-devel - -%description -KSquirrel is an image viewer for TDE with disk navigator, file tree, -multiple directory view, thumbnails, extended thumbnails, dynamic -format support, DCOP interface, KEXIF and KIPI plugins support. - -KSquirrel is a fast and convenient image viewer for KDE featuring -OpenGL and dynamic format support. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{kdecomp} -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO -%{tde_bindir}/ksquirrel -%{tde_bindir}/ksquirrel-libs-configurator -%{tde_bindir}/ksquirrel-libs-configurator-real -%{tde_tdelibdir}/libksquirrelpart.la -%{tde_tdelibdir}/libksquirrelpart.so -%{tde_tdeappdir}/ksquirrel.desktop -%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop -%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop -%{tde_datadir}/apps/ksquirrel/ -%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc -%{tde_datadir}/config/magic/x-ras.magic -%{tde_datadir}/config/magic/x-sun.magic -%{tde_datadir}/config/magic/x-utah.magic -%{tde_tdedocdir}/HTML/*/ksquirrel -%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png -%{tde_datadir}/mimelnk/image/*.desktop -%{tde_datadir}/services/ksquirrelpart.desktop -%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo -%{tde_mandir}/man1/ksquirrel.1 - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.8.0-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot - 0.8.1-2 -- Rebuild for Fedora 17 -- Fix HTML directory location - -* Sun Nov 20 2011 Francois Andriot - 0.8.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec deleted file mode 100644 index 60d1484dd..000000000 --- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec +++ /dev/null @@ -1,146 +0,0 @@ -# Default version for this component -%define kdecomp ksquirrel - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: Powerful Trinity image viewer -Version: 0.8.0 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Amusements/Games - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext - -BuildRequires: trinity-libkipi-devel -BuildRequires: trinity-libksquirrel-devel -#BuildRequires: libkexif-devel - -%description -KSquirrel is an image viewer for TDE with disk navigator, file tree, -multiple directory view, thumbnails, extended thumbnails, dynamic -format support, DCOP interface, KEXIF and KIPI plugins support. - -KSquirrel is a fast and convenient image viewer for KDE featuring -OpenGL and dynamic format support. - - -%prep -%setup -q -n applications/%{kdecomp} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{kdecomp} -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO -%{tde_bindir}/ksquirrel -%{tde_bindir}/ksquirrel-libs-configurator -%{tde_bindir}/ksquirrel-libs-configurator-real -%{tde_tdelibdir}/libksquirrelpart.la -%{tde_tdelibdir}/libksquirrelpart.so -%{tde_tdeappdir}/ksquirrel.desktop -%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop -%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop -%{tde_datadir}/apps/ksquirrel/ -%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc -%{tde_datadir}/config/magic/x-ras.magic -%{tde_datadir}/config/magic/x-sun.magic -%{tde_datadir}/config/magic/x-utah.magic -%{tde_tdedocdir}/HTML/*/ksquirrel -%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png -%{tde_datadir}/mimelnk/image/*.desktop -%{tde_datadir}/services/ksquirrelpart.desktop -%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo -%{tde_mandir}/man1/ksquirrel.1 - -%Changelog -* Wed May 02 2012 Francois Andriot - 0.8.1-2 -- Rebuild for Fedora 17 -- Fix HTML directory location - -* Sun Nov 20 2011 Francois Andriot - 0.8.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- cgit v1.2.1