diff options
Diffstat (limited to 'redhat/applications')
28 files changed, 74 insertions, 1654 deletions
diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec index 27b19a8b5..940ef94e8 100644 --- a/redhat/applications/basket/basket-14.0.0.spec +++ b/redhat/applications/basket/basket-14.0.0.spec @@ -23,6 +23,7 @@ %define tde_pkg basket %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -107,6 +108,7 @@ baskets to HTML. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export kde_confdir="%{tde_confdir}" # Warning: --enable-final causes FTBFS %configure \ @@ -183,7 +185,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null %{tde_tdelibdir}/libbasketpart.so %{tde_tdelibdir}/libkontact_basket.la %{tde_tdelibdir}/libkontact_basket.so -%{tde_datadir}/config/magic/basket.magic +%{tde_confdir}/magic/basket.magic %{tde_datadir}/icons/crystalsvg/*/*/* %{tde_datadir}/mimelnk/application/x-basket-archive.desktop %{tde_datadir}/mimelnk/application/x-basket-template.desktop diff --git a/redhat/applications/basket/basket-14.0.1.spec b/redhat/applications/basket/basket-14.0.1.spec deleted file mode 100644 index 68c2e481b..000000000 --- a/redhat/applications/basket/basket-14.0.1.spec +++ /dev/null @@ -1,208 +0,0 @@ -# -# spec file for package basket (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.1 -%endif -%define tde_pkg basket -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%define tde_confdir %{_sysconfdir}/trinity -%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: 1.0.3.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: Taking care of your ideas. -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: trinity-tdepim-devel >= %{tde_version} - -BuildRequires: desktop-file-utils -BuildRequires: gpgme-devel - -BuildRequires: autoconf automake libtool m4 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: libtool - -# 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 application is mainly an all-purpose notes taker. It provide several baskets where -to drop every sort of items: text, rich text, links, images, sounds, files, colors, -application launcher... Objects can be edited, copied, dragged... So, you can arrange -them as you want ! This application can be used to quickly drop web objects (link, text, -images...) or notes, as well as to free your clutered desktop (if any). It is also useful -to collect informations for a report. Those data can be shared with co-workers by exporting -baskets to HTML. - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" -export kde_confdir="%{tde_confdir}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file -G "Extended Clipboard" basket DesktopUtility -%endif - -# Apps that should stay in TDE -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig -update-desktop-database %{tde_tdeappdir} -q &> /dev/null - -%postun -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig -update-desktop-database %{tde_tdeappdir} -q &> /dev/null - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/basket -%{tde_tdeappdir}/basket.desktop -%{tde_datadir}/apps/basket/ -%dir %{tde_datadir}/apps/kontact/ksettingsdialog -%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg -%{tde_libdir}/libbasketcommon.la -%{tde_libdir}/libbasketcommon.so -%{tde_tdelibdir}/basketthumbcreator.la -%{tde_tdelibdir}/basketthumbcreator.so -%{tde_tdelibdir}/kcm_basket.la -%{tde_tdelibdir}/kcm_basket.so -%{tde_tdelibdir}/libbasketpart.la -%{tde_tdelibdir}/libbasketpart.so -%{tde_tdelibdir}/libkontact_basket.la -%{tde_tdelibdir}/libkontact_basket.so -%{tde_confdir}/magic/basket.magic -%{tde_datadir}/icons/crystalsvg/*/*/* -%{tde_datadir}/mimelnk/application/x-basket-archive.desktop -%{tde_datadir}/mimelnk/application/x-basket-template.desktop -%{tde_datadir}/services/basket_config_apps.desktop -%{tde_datadir}/services/basket_config_baskets.desktop -#%{tde_datadir}/services/basket_config_features.desktop -%{tde_datadir}/services/basket_config_general.desktop -%{tde_datadir}/services/basket_config_new_notes.desktop -#%{tde_datadir}/services/basket_config_notes.desktop -%{tde_datadir}/services/basket_config_notes_appearance.desktop -%{tde_datadir}/services/basket_part.desktop -%{tde_datadir}/services/basketthumbcreator.desktop -%{tde_datadir}/services/kontact/basket.desktop -%{tde_datadir}/services/kontact/basket_v4.desktop -%{tde_tdedocdir}/HTML/en/basket/ - - -%changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0.3.1-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/bibletime/bibletime-14.0.0.patch b/redhat/applications/bibletime/bibletime-14.0.0.patch deleted file mode 100644 index eaae32d16..000000000 --- a/redhat/applications/bibletime/bibletime-14.0.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/bibletime/backend/cswordbackend.cpp b/bibletime/backend/cswordbackend.cpp -index 1c218b3..dda6275 100644 ---- a/bibletime/backend/cswordbackend.cpp -+++ b/bibletime/backend/cswordbackend.cpp -@@ -251,7 +251,7 @@ const bool CSwordBackend::shutdownModules() { - - /** Returns true if the given option is enabled. */ - const bool CSwordBackend::isOptionEnabled( const CSwordModuleInfo::FilterTypes type) { -- return (getGlobalOption( optionName(type).latin1() ) == "On"); -+ return (strcmp(getGlobalOption( optionName(type).latin1() ), "On") == 0); - } - - /** Sets the given options enabled or disabled depending on the second parameter. */ -diff --git a/bibletime/frontend/cdragdropmgr.cpp b/bibletime/frontend/cdragdropmgr.cpp -index 52d012f..4f8c4fe 100644 ---- a/bibletime/frontend/cdragdropmgr.cpp -+++ b/bibletime/frontend/cdragdropmgr.cpp -@@ -36,7 +36,7 @@ bool CDragDropMgr::BTDrag::canDecode( const TQMimeSource * mime ) { - }; - - bool CDragDropMgr::BTDrag::provides( const char* type ) const { -- return (type == "BibleTime/DND"); //return only true if the type is BibleTime/DND -+ return (strcmp(type, "BibleTime/DND") == 0); //return only true if the type is BibleTime/DND - }; - - const char* CDragDropMgr::BTDrag::format( int i ) const { diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec index 27e75ffdd..d6d64f84e 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime-14.0.0.spec @@ -55,7 +55,6 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: %{tde_pkg}-%{tde_version}.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -109,7 +108,6 @@ texts, write own notes, save, print etc.). %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .rpmlint %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" diff --git a/redhat/applications/bibletime/bibletime-14.0.1.spec b/redhat/applications/bibletime/bibletime-14.0.1.spec deleted file mode 100644 index b864094e4..000000000 --- a/redhat/applications/bibletime/bibletime-14.0.1.spec +++ /dev/null @@ -1,185 +0,0 @@ -# -# spec file for package bibletime (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.1 -%endif -%define tde_pkg bibletime -%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: 1.6.6.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: A bible study tool for Trinity -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: %{_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: autoconf automake libtool m4 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: libtool -BuildRequires: desktop-file-utils -BuildRequires: gettext - -# 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 - -# BOOST support -BuildRequires: boost-devel - -# Requires: clucene -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 -BuildRequires: clucene-core-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}clucene-devel -%endif - -# Requires: sword -BuildRequires: sword-devel -Requires: sword - -%description -BibleTime is a free and easy to use bible study tool for UNIX systems. -It requires a working TDE environment and the SWORD library. -BibleTime provides easy handling of digitized texts (Bibles, commentaries -and lexicons) and powerful features to work with these texts (search in -texts, write own notes, save, print etc.). - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -# Not SMP safe ! -%__make -C bibletime/frontend - -# SMP safe ! -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/* -%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc -%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips - -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/bibletime.desktop" - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_datadir}/applications -q &> /dev/null - - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_datadir}/applications -q &> /dev/null - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/bibletime -%{tde_tdeincludedir}/bibletimeinterface.h -%{tde_datadir}/applications/bibletime.desktop -%{tde_datadir}/apps/bibletime/ -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_tdedocdir}/HTML/en/bibletime/ - - -%changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.6.6.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec index 779501470..e5a3aca8b 100644 --- a/redhat/applications/k3b/k3b-14.0.0.spec +++ b/redhat/applications/k3b/k3b-14.0.0.spec @@ -115,6 +115,12 @@ Requires: cdrdao BuildRequires: libudev-devel %endif +# HAL support +%if 0%{?rhel} == 5 +%define with_hal 1 +BuildRequires: hal-devel +%endif + # DBUS support # TQT bindings not available for RHEL4 %if 0%{?rhel} == 4 @@ -474,7 +480,7 @@ fi %{?with_libmad:--with-libmad} %{?!with_libmad:--without-libmad} \ --with-musepack \ --without-resmgr \ - --without-hal + %{?with_hal:--with-hal} %{?!with_hal:--without-hal} \ # Strange behaviour on RHEL4 ... %if 0%{?rhel} == 4 diff --git a/redhat/applications/k9copy/k9copy-14.0.0.patch b/redhat/applications/k9copy/k9copy-14.0.0.patch deleted file mode 100644 index 5f20b85a6..000000000 --- a/redhat/applications/k9copy/k9copy-14.0.0.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am.ftbfs 2013-07-21 09:56:44.000000000 +0200 -+++ trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am 2013-08-02 11:00:55.291717387 +0200 -@@ -35,7 +35,7 @@ - $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ - $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ - $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ -- $(LIB_TDEUI) -ltdemdi $(LIBDL) -ldvdread -+ $(LIB_TDEUI) -ltdemdi $(LIBDL) -ldvdread -lk3b -lk3bdevice - - # this is where the desktop file will go - shelldesktopdir = $(kde_appsdir)/Utilities ---- trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h.ORI 2013-07-28 19:42:30.331485057 +0200 -+++ trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h 2013-07-28 19:43:09.713519110 +0200 -@@ -21,6 +21,9 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#ifndef __MPEG2_INTERNAL_H__ -+#define __MPEG2_INTERNAL_H__ -+ - /* macroblock modes */ - #define MACROBLOCK_INTRA 1 - #define MACROBLOCK_PATTERN 2 -@@ -298,3 +301,5 @@ - extern mpeg2_mc_t mpeg2_mc_altivec; - extern mpeg2_mc_t mpeg2_mc_alpha; - extern mpeg2_mc_t mpeg2_mc_vis; -+ -+#endif // __MPEG2_INTERNAL_H__ diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec index 3ffdded5c..6f4fd1dc2 100644 --- a/redhat/applications/k9copy/k9copy-14.0.0.spec +++ b/redhat/applications/k9copy/k9copy-14.0.0.spec @@ -56,7 +56,6 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: %{tde_pkg}-%{tde_version}.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -100,7 +99,6 @@ This is the Trinity version. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .ftbfs # Removes internal dvdread headers %__rm -rf dvdread diff --git a/redhat/applications/k9copy/k9copy-14.0.1.spec b/redhat/applications/k9copy/k9copy-14.0.1.spec deleted file mode 100644 index 6f4fd1dc2..000000000 --- a/redhat/applications/k9copy/k9copy-14.0.1.spec +++ /dev/null @@ -1,177 +0,0 @@ -# -# spec file for package k9copy (version R14) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 2 -%if "%{?tde_version}" == "" -%define tde_version 14.0.0 -%endif -%define tde_pkg k9copy -%define tde_prefix /opt/trinity -%define tde_appdir %{tde_datadir}/applications -%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: 1.2.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: DVD backup tool for Trinity -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: %{_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: trinity-k3b-devel - -BuildRequires: autoconf automake libtool m4 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -# 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 - -# Warning: the target distribution must have ffmpeg ! -BuildRequires: ffmpeg-devel -Requires: ffmpeg - - -%description -k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9 -to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R). -This is the Trinity version. - - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -# Removes internal dvdread headers -%__rm -rf dvdread - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" - -# FFMPEG ... -if [ -d /usr/include/ffmpeg ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg" -fi - -# NOTICE: --enable-final causes FTBFS ! -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ - \ - --enable-k3bdevices - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/k9copy -%{tde_tdeappdir}/k9copy.desktop -%{tde_datadir}/apps/k9copy/ -%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop -%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/ -%{tde_datadir}/icons/hicolor/*/apps/k9copy.png - - -%changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.2.3-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kcmldap/kcmldap-14.0.0.spec b/redhat/applications/kcmldap/kcmldap-14.0.0.spec index 659763134..de5499657 100644 --- a/redhat/applications/kcmldap/kcmldap-14.0.0.spec +++ b/redhat/applications/kcmldap/kcmldap-14.0.0.spec @@ -82,12 +82,15 @@ BuildRequires: brp-check-trinity %endif # OPENLDAP support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: openldap-devel %endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif +%if 0%{?rhel} == 5 +BuildRequires: openldap24-libs-devel +%endif %description @@ -179,7 +182,12 @@ export PATH="%{tde_bindir}:${PATH}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ +%if 0%{?rhel} == 5 + --with-extra-includes=/usr/include/openldap24 \ + --with-extra-libs=/usr/lib/openldap24 \ +%endif %__make %{?_smp_mflags} diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec index db2fb485f..f44b382cf 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec @@ -78,12 +78,15 @@ BuildRequires: brp-check-trinity %endif # OPENLDAP support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: openldap-devel %endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif +%if 0%{?rhel} == 5 +BuildRequires: openldap24-libs-devel +%endif Requires: trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release} @@ -156,7 +159,12 @@ export PATH="%{tde_bindir}:${PATH}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ +%if 0%{?rhel} == 5 + --with-extra-includes=/usr/include/openldap24 \ + --with-extra-libs=/usr/lib/openldap24 \ +%endif %__make %{?_smp_mflags} diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec index b6e8f23a9..43eae8ac5 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec @@ -78,12 +78,15 @@ BuildRequires: brp-check-trinity %endif # OPENLDAP support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: openldap-devel %endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif +%if 0%{?rhel} == 5 +BuildRequires: openldap24-libs-devel +%endif Requires: trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release} @@ -150,7 +153,12 @@ export PATH="%{tde_bindir}:${PATH}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ +%if 0%{?rhel} == 5 + --with-extra-includes=/usr/include/openldap24 \ + --with-extra-libs=/usr/lib/openldap24 \ +%endif %__make %{?_smp_mflags} diff --git a/redhat/applications/kerberostray/kerberostray-14.0.0.spec b/redhat/applications/kerberostray/kerberostray-14.0.0.spec index 289cbc9fa..1961903cc 100644 --- a/redhat/applications/kerberostray/kerberostray-14.0.0.spec +++ b/redhat/applications/kerberostray/kerberostray-14.0.0.spec @@ -78,12 +78,15 @@ BuildRequires: brp-check-trinity %endif # OPENLDAP support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: openldap-devel %endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif +%if 0%{?rhel} == 5 +BuildRequires: openldap24-libs-devel +%endif %description @@ -124,7 +127,12 @@ export PATH="%{tde_bindir}:${PATH}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ +%if 0%{?rhel} == 5 + --with-extra-includes=/usr/include/openldap24 \ + --with-extra-libs=/usr/lib/openldap24 \ +%endif %__make %{?_smp_mflags} diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.patch b/redhat/applications/kmplayer/kmplayer-14.0.0.patch deleted file mode 100644 index fba761b15..000000000 --- a/redhat/applications/kmplayer/kmplayer-14.0.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp -index c4bf580..0585ac9 100644 ---- a/src/gstplayer.cpp -+++ b/src/gstplayer.cpp -@@ -750,7 +750,7 @@ void KGStreamerPlayer::seek (int val /*offset_in_deciseconds*/) { - void KGStreamerPlayer::volume (int val) { - //fprintf (stderr, "position %d\n", val); - if (gst_elm_play) -- g_object_set (G_OBJECT (gst_elm_play), "volume", 1.0*val/100, 0L); -+ g_object_set (G_OBJECT (gst_elm_play), "volume", 1.0*val/100, NULL); - } - - void KGStreamerPlayer::updatePosition () { diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer-14.0.0.spec index 7c0a38708..f19972c3b 100644 --- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec +++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec @@ -23,6 +23,7 @@ %define tde_pkg kmplayer %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -56,7 +57,6 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: %{tde_pkg}-14.0.0.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -214,7 +214,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_libdir}/libkmplayercommon.so %{tde_bindir}/kgstplayer %{tde_bindir}/kxineplayer -%{tde_datadir}/config/kmplayerrc +%{tde_confdir}/kmplayerrc %{tde_datadir}/apps/kmplayer/bookmarks.xml %{tde_datadir}/apps/kmplayer/noise.gif %{tde_datadir}/icons/hicolor/*/apps/kmplayer.png @@ -268,7 +268,6 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .orig %__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" @@ -279,6 +278,7 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" +export kde_confdir="%{tde_confdir}" %configure \ --prefix=%{tde_prefix} \ diff --git a/redhat/applications/kmplayer/kmplayer-14.0.1.spec b/redhat/applications/kmplayer/kmplayer-14.0.1.spec deleted file mode 100644 index f19972c3b..000000000 --- a/redhat/applications/kmplayer/kmplayer-14.0.1.spec +++ /dev/null @@ -1,325 +0,0 @@ -# -# spec file for package kmplayer (version R14) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 2 -%if "%{?tde_version}" == "" -%define tde_version 14.0.0 -%endif -%define tde_pkg kmplayer -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%define tde_confdir %{_sysconfdir}/trinity -%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.10.0c -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} -Summary: Media player for Trinity -Group: Applications/Multimedia -URL: http://www.trinitydesktop.org/ -#URL: http://kmplayer.kde.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: autoconf automake libtool m4 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: libtool - -# 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 - -# DBUS support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} -%endif - -# GSTREAMER support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: libgstreamer0.10-devel -%else -BuildRequires: %{_lib}gstreamer0.10-devel -%endif -BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: gstreamer-devel -#BuildRequires: gstreamer-plugins-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: gstreamer-devel -BuildRequires: gstreamer-plugins-base-devel -%endif -%if 0%{?suse_version} -BuildRequires: gstreamer-0_10-devel -BuildRequires: gstreamer-0_10-plugins-base-devel -%endif - -# XINE support -%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: %{_lib}xine-devel -%else -BuildRequires: %{_lib}xine1.2-devel -%endif -%endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: xine-lib-devel -%endif -%if 0%{?suse_version} -BuildRequires: libxine-devel -%endif -%endif - -# X11 stuff -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libxt-devel -BuildRequires: libxv-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210 -BuildRequires: libXv-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?suse_version} == 1140 -BuildRequires: xorg-x11-libXv-devel -%endif - -# GTK2 stuff -BuildRequires: gtk2-devel - -# DBUS stuff -%if 0%{?suse_version} -BuildRequires: dbus-1-glib-devel -%else -BuildRequires: dbus-glib-devel -%endif - -Requires: %{name}-base = %{?epoch:%{epoch}:}%{version}-%{release} - - -%description -A basic audio/video viewer application for Trinity. - -KMPlayer can: -* play DVD (DVDNav only with the Xine player) -* play VCD -* let the backend players play from a pipe (read from stdin) -* play from a TV device (experimental) -* show backend player's console output -* launch ffserver (only 0.4.8 works) when viewing from a v4l device -* DCOP KMediaPlayer interface support -* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE - shortcut configure window -* Lots of configurable shortcuts. Highly recommended for the VDR keys - (if you have VDR) and volume increase/decrease - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm -%{tde_bindir}/kmplayer -%{tde_bindir}/knpplayer -%{tde_bindir}/kxvplayer -%{tde_libdir}/libtdeinit_kmplayer.la -%{tde_libdir}/libtdeinit_kmplayer.so -%{tde_tdelibdir}/kmplayer.la -%{tde_tdelibdir}/kmplayer.so -%{tde_tdeappdir}/kmplayer.desktop -%exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml -%exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc -%exclude %{tde_datadir}/apps/kmplayer/noise.gif -%exclude %{tde_datadir}/apps/kmplayer/pluginsinfo -%{tde_datadir}/apps/kmplayer/ - -########## - -%package base -Group: Applications/Multimedia -Summary: Base files for KMPlayer [Trinity] - -%description base -Core files needed for KMPlayer. - -%post base -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - -%postun base -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - -%files base -%defattr(-,root,root,-) -%{tde_libdir}/libkmplayercommon.la -%{tde_libdir}/libkmplayercommon.so -%{tde_bindir}/kgstplayer -%{tde_bindir}/kxineplayer -%{tde_confdir}/kmplayerrc -%{tde_datadir}/apps/kmplayer/bookmarks.xml -%{tde_datadir}/apps/kmplayer/noise.gif -%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png -%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz -%{tde_datadir}/mimelnk/application/x-kmplayer.desktop -%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop - -########## - -%package konq-plugins -Group: Applications/Multimedia -Requires: %{name}-base = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: trinity-konqueror >= %{tde_version} -Summary: KMPlayer plugin for KHTML/Konqueror [Trinity] - -%description konq-plugins -This plugin enables audio/video playback inside konqueror, using Xine (with -*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web -tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin -browser plugins. - -%files konq-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/libkmplayerpart.la -%{tde_tdelibdir}/libkmplayerpart.so -%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc -%{tde_datadir}/apps/kmplayer/pluginsinfo -%{tde_datadir}/services/kmplayer_part.desktop - -########## - -%package doc -Group: Applications/Multimedia -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Handbook for KMPlayer [Trinity] - -%description doc -Documention for KMPlayer, a basic audio/video viewer application for TDE. - -%files doc -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/*/kmplayer - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export kde_confdir="%{tde_confdir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -# Removes unwanted files -%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video -%endif - - -%clean -%__rm -rf %{buildroot} - - -%changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.10.0c-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index 4183bf3eb..16e69a105 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -177,7 +177,6 @@ BuildRequires: libutempter-devel # POPPLER support %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} BuildRequires: poppler-devel >= 0.12 -#BuildRequires: poppler-qt-devel >= 0.12 %endif %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}poppler-devel @@ -185,7 +184,6 @@ BuildRequires: %{_lib}poppler-devel %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 # On RHEL 5, the distro-provided poppler is too old. We built a newer one. BuildRequires: trinity-poppler-devel >= 0.12 -BuildRequires: trinity-poppler-qt3-devel >= 0.12 %endif # POSTGRESQL support @@ -1125,6 +1123,12 @@ RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])') export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" %endif +# FTBFS on RHEL 5 +%if 0%{?rhel} == 5 +%__sed -i "kexi/migration/keximigratetest.cpp" \ + -e "/TDEApplication/ s|\");|\", true, true, true);|" +%endif + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ diff --git a/redhat/applications/ktorrent/ktorrent-14.0.0.patch b/redhat/applications/ktorrent/ktorrent-14.0.0.patch deleted file mode 100644 index 10a3e77c3..000000000 --- a/redhat/applications/ktorrent/ktorrent-14.0.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/upnp/upnpmcastsocket.cpp b/plugins/upnp/upnpmcastsocket.cpp -index 3b8be45..0172ed2 100644 ---- a/plugins/upnp/upnpmcastsocket.cpp -+++ b/plugins/upnp/upnpmcastsocket.cpp -@@ -21,7 +21,7 @@ - #include <kurl.h> - extern "C" { - #include <unistd.h> -- inline ssize_t mycread (int __fd, void *__buf, size_t __nbytes) { read(__fd, __buf, __nbytes); } -+ inline ssize_t mycread (int __fd, void *__buf, size_t __nbytes) { return read(__fd, __buf, __nbytes); } - }; - #include <sys/socket.h> - #include <netinet/in.h> diff --git a/redhat/applications/ktorrent/ktorrent-14.0.0.spec b/redhat/applications/ktorrent/ktorrent-14.0.0.spec index c25023666..c7adf8c90 100644 --- a/redhat/applications/ktorrent/ktorrent-14.0.0.spec +++ b/redhat/applications/ktorrent/ktorrent-14.0.0.spec @@ -56,8 +56,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: %{tde_pkg}-14.0.0.patch - BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils @@ -115,7 +113,6 @@ enabling background downloading. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .ftbfs %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" diff --git a/redhat/applications/ktorrent/ktorrent-14.0.1.spec b/redhat/applications/ktorrent/ktorrent-14.0.1.spec deleted file mode 100644 index c7adf8c90..000000000 --- a/redhat/applications/ktorrent/ktorrent-14.0.1.spec +++ /dev/null @@ -1,226 +0,0 @@ -# -# spec file for package ktorrent (version R14) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 2 -%if "%{?tde_version}" == "" -%define tde_version 14.0.0 -%endif -%define tde_pkg ktorrent -%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: 2.2.8 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: BitTorrent client for Trinity -Group: Applications/Utilities -URL: http://ktorrent.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: 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 - -# GMP support -BuildRequires: gmp-devel - -# AVAHI support -# Disabled on RHEL4 and RHEL5 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} -%define with_avahi 1 -BuildRequires: trinity-avahi-tqt-devel -Requires: trinity-avahi-tqt -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}avahi-client-devel -Requires: %{_lib}avahi-client3 -%else -BuildRequires: avahi-devel -Requires: avahi -%endif -%endif - - -%description -KTorrent is a BitTorrent program for Trinity. Its features include speed capping -(both down and up), integrated searching, UDP tracker support, preview of -certain file types (video and audio) and integration into the TDE Panel -enabling background downloading. - - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix="%{tde_prefix}" \ - --exec-prefix="%{tde_prefix}" \ - --bindir="%{tde_bindir}" \ - --datadir="%{tde_datadir}" \ - --libdir="%{tde_libdir}" \ - --mandir="%{tde_mandir}" \ - --includedir="%{tde_tdeincludedir}" \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ - \ - %{?!with_avahi:--without-avahi} - - -# Not SMP safe ! -%__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf "%{buildroot}" -%__make install DESTDIR="%{buildroot}" - -%find_lang %{tde_pkg} - -# Unwanted files -%__rm -f "%{?buildroot}%{tde_libdir}/libktorrent.so" - - -%clean -%__rm -rf "%{buildroot}" - - -%post -update-desktop-database %{tde_tdeappdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - -%postun -update-desktop-database %{tde_tdeappdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/ktcachecheck -%{tde_bindir}/ktorrent -%{tde_bindir}/ktshell -%{tde_bindir}/kttorinfo -%{tde_bindir}/ktupnptest -%{tde_libdir}/libktorrent-%{version}.so -%{tde_libdir}/libktorrent.la -%{tde_tdelibdir}/ktinfowidgetplugin.la -%{tde_tdelibdir}/ktinfowidgetplugin.so -%{tde_tdelibdir}/ktipfilterplugin.la -%{tde_tdelibdir}/ktipfilterplugin.so -%{tde_tdelibdir}/ktlogviewerplugin.la -%{tde_tdelibdir}/ktlogviewerplugin.so -%{tde_tdelibdir}/ktpartfileimportplugin.la -%{tde_tdelibdir}/ktpartfileimportplugin.so -%{tde_tdelibdir}/ktrssfeedplugin.la -%{tde_tdelibdir}/ktrssfeedplugin.so -%{tde_tdelibdir}/ktscanfolderplugin.la -%{tde_tdelibdir}/ktscanfolderplugin.so -%{tde_tdelibdir}/ktschedulerplugin.la -%{tde_tdelibdir}/ktschedulerplugin.so -%{tde_tdelibdir}/ktsearchplugin.la -%{tde_tdelibdir}/ktsearchplugin.so -%{tde_tdelibdir}/ktstatsplugin.la -%{tde_tdelibdir}/ktstatsplugin.so -%{tde_tdelibdir}/ktupnpplugin.la -%{tde_tdelibdir}/ktupnpplugin.so -%{tde_tdelibdir}/ktwebinterfaceplugin.la -%{tde_tdelibdir}/ktwebinterfaceplugin.so -%{tde_tdeappdir}/ktorrent.desktop -%{tde_datadir}/apps/ktorrent/ -%{tde_datadir}/config.kcfg/*.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/hicolor/*/*/*.svgz -%{tde_datadir}/services/*.desktop -%{tde_datadir}/servicetypes/ktorrentplugin.desktop -%{tde_tdedocdir}/HTML/en/ktorrent/ - -%if 0%{?with_avahi} -%{tde_tdelibdir}/ktzeroconfplugin.la -%{tde_tdelibdir}/ktzeroconfplugin.so -%endif - - -%changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:2.2.8-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec index 121b644c0..25dbdfe86 100644 --- a/redhat/applications/kvirc/kvirc-14.0.0.spec +++ b/redhat/applications/kvirc/kvirc-14.0.0.spec @@ -130,6 +130,13 @@ with the K Desktop Environment version 3. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +# FTBFS on RHEL 5 +%if 0%{?rhel} == 5 +%__sed -i "admin/acinclude.m4.in" \ + -i "src/kvilib/tal/kvi_tal_application.cpp" \ + -e "/TDEApplication/ s|\")|\", true, true, true)|"; +%endif + %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab-14.0.0.spec index 32e37bea0..cced2e4ad 100644 --- a/redhat/applications/piklab/piklab-14.0.0.spec +++ b/redhat/applications/piklab/piklab-14.0.0.spec @@ -120,6 +120,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" # Warning: --enable-final causes FTBFS +# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837 %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -135,7 +136,10 @@ export PATH="%{tde_bindir}:${PATH}" --enable-new-ldflags \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ +%if 0%{?rhel} == 5 + --disable-libreadline \ +%endif %__make %{?_smp_mflags} diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.patch b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.patch deleted file mode 100644 index c5b383686..000000000 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/systemsettings/tdecmodulemenu.cpp b/systemsettings/tdecmodulemenu.cpp -index 56c1220..d8f84ce 100644 ---- a/systemsettings/tdecmodulemenu.cpp -+++ b/systemsettings/tdecmodulemenu.cpp -@@ -185,4 +185,5 @@ TQString TDECModuleMenu::deriveCaptionFromPath( const TQString &menuPath ) - return result; - } - } -+ return result; - } diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec index eedbf2917..11b860c1b 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec @@ -23,6 +23,7 @@ %define tde_pkg tde-systemsettings %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -57,8 +58,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: kde-settings-laptops.directory -Patch0: %{tde_pkg}-14.0.0.patch - Provides: trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release} @@ -102,7 +101,6 @@ Control Centre with an improved user interface. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -112,6 +110,7 @@ Control Centre with an improved user interface. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export kde_confdir="%{tde_confdir}" %configure \ @@ -184,7 +183,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null %{tde_datadir}/applications/tde/medianotifications.desktop %{tde_datadir}/applications/tde/systemsettings.desktop %{tde_datadir}/apps/systemsettings/ -%{tde_datadir}/config/systemsettingsrc +%{tde_confdir}/systemsettingsrc %{tde_datadir}/desktop-directories/*.directory %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png %{tde_tdedocdir}/HTML/en/systemsettings/ diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec deleted file mode 100644 index 11b860c1b..000000000 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec +++ /dev/null @@ -1,194 +0,0 @@ -# -# spec file for package tde-systemsettings (version R14) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 2 -%if "%{?tde_version}" == "" -%define tde_version 14.0.0 -%endif -%define tde_pkg tde-systemsettings -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%define tde_confdir %{_sysconfdir}/trinity -%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_sysconfdir %{_sysconfdir}/trinity -%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.0svn20070312 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: Easy to use control centre for TDE -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 -Source1: kde-settings-laptops.directory - - -Provides: trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-kde-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release} - -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -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 - -Requires: trinity-guidance - - -%description -System preferences is a replacement for the TDE -Control Centre with an improved user interface. - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" -export kde_confdir="%{tde_confdir}" - - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --sysconfdir=%{tde_sysconfdir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-laptops.directory - -# Unwanted files -%__rm -f %{buildroot}%{tde_datadir}/applications/tde/kcmfontinst.desktop -%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-power.directory -%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-system.directory - -%__rm -f %{buildroot}%{tde_datadir}/applications/tde/laptop.desktop - -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/audioencoding.desktop" -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/defaultapplication.desktop" -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcm_knetworkconfmodule_ss.desktop" -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/medianotifications.desktop" -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop" - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -update-desktop-database %{tde_tdeappdir} -q &> /dev/null - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -update-desktop-database %{tde_tdeappdir} -q &> /dev/null - -%files -%defattr(-,root,root,-) -%doc README TODO -%dir %{tde_sysconfdir}/xdg -%dir %{tde_sysconfdir}/xdg/menus -%dir %{tde_sysconfdir}/xdg/menus/applications-merged -%{tde_sysconfdir}/xdg/menus/applications-merged/tde-system-settings-merge.menu -%{tde_sysconfdir}/xdg/menus/tde-system-settings.menu -%{tde_bindir}/systemsettings -%{tde_datadir}/applications/tde/audioencoding.desktop -%{tde_datadir}/applications/tde/defaultapplication.desktop -%{tde_datadir}/applications/tde/kcm_knetworkconfmodule_ss.desktop -#%{tde_datadir}/applications/tde/laptop.desktop -%{tde_datadir}/applications/tde/medianotifications.desktop -%{tde_datadir}/applications/tde/systemsettings.desktop -%{tde_datadir}/apps/systemsettings/ -%{tde_confdir}/systemsettingsrc -%{tde_datadir}/desktop-directories/*.directory -%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png -%{tde_tdedocdir}/HTML/en/systemsettings/ - - -%changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.0svn20070312-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.patch b/redhat/applications/wlassistant/wlassistant-14.0.0.patch deleted file mode 100644 index 385d4d07d..000000000 --- a/redhat/applications/wlassistant/wlassistant-14.0.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/watools.cpp b/src/watools.cpp -index 5814274..252c791 100644 ---- a/src/watools.cpp -+++ b/src/watools.cpp -@@ -192,6 +192,8 @@ int WATools::availableNetworks( const char* _ifname ) //returns a list of availa - i++; - } while (scan = scan->next); - printf( "WATools: Networks found: %i\n", i ); -+ -+ return i; - } - - diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant-14.0.0.spec index 535aa004a..ff2c05226 100644 --- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec +++ b/redhat/applications/wlassistant/wlassistant-14.0.0.spec @@ -55,7 +55,6 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: %{tde_pkg}-14.0.0.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -121,7 +120,6 @@ remembered so next time the user won't have to enter them again. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 %build diff --git a/redhat/applications/wlassistant/wlassistant-14.0.1.spec b/redhat/applications/wlassistant/wlassistant-14.0.1.spec deleted file mode 100644 index ff2c05226..000000000 --- a/redhat/applications/wlassistant/wlassistant-14.0.1.spec +++ /dev/null @@ -1,206 +0,0 @@ -# -# spec file for package wlassistant (version R14) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 2 -%if "%{?tde_version}" == "" -%define tde_version 14.0.0 -%endif -%define tde_pkg wlassistant -%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.5.7 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: User friendly TDE frontend for wireless network connection -Group: Applications/Utilities -URL: http://wlassistant.sourceforge.net/ - -%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: cmake libtool -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 - -# Wireless support -%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 -BuildRequires: wireless-tools-devel -%endif -%if 0%{?mgaversion} == 2 || 0%{?mdkversion} -BuildRequires: %{_lib}iw29-devel -%endif -%if 0%{?rhel} == 5 || 0%{?suse_version} -BuildRequires: wireless-tools -%endif -%if 0%{?suse_version} || 0%{?mgaversion} >= 3 -BuildRequires: libiw-devel -%endif - -# IDN support -BuildRequires: libidn-devel - -# GAMIN support -# Not on openSUSE. -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_gamin 1 -BuildRequires: gamin-devel -%endif -# PYTHON support -BuildRequires: python - - -%description -Wireless Assistant scans for wireless access points and displays link quality, -encryption and other useful information. When user wants to connect to a -network, Wireless Assistant opens up its wizards and guides the user through -Wi-Fi settings. After a successful connection is made the settings are -remembered so next time the user won't have to enter them again. - -########## - -%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" - -# Shitty hack for RHEL4 ... -if [ -d "/usr/X11R6" ]; then - export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -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} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWITH_GCC_VISIBILITY=OFF \ - \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DBUILD_ALL=on \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network -%endif - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc ChangeLog VERSION -%{tde_bindir}/wlassistant -%{tde_tdeappdir}/wlassistant.desktop -%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png -%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png -%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo -%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo -%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo -%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo -%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo -%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo -%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo -%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo -%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo -%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo - - -%changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.5.7-1 -- Initial release for TDE 14.0.0 |