summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec91
-rw-r--r--redhat/applications/tdeio-locate/kio-locate-3.5.12.spec111
-rw-r--r--redhat/applications/tdeio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch40
-rw-r--r--redhat/applications/tdeio-locate/kio-locate-3.5.13.1.spec135
-rw-r--r--redhat/applications/tdeio-locate/kio-locate-3.5.13.spec113
-rw-r--r--redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec98
-rw-r--r--redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec95
-rw-r--r--redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.1.spec157
-rw-r--r--redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.spec140
-rw-r--r--redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec91
-rw-r--r--redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec208
-rw-r--r--redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc1
12 files changed, 391 insertions, 889 deletions
diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec
index 8c50b6a0e..014858e5c 100644
--- a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec
+++ b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec
@@ -1,59 +1,95 @@
-# 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
-
-# Default version for this component
-%define tde_pkg tdeio-ftps
+#
+# spec file for package tdeio-ftps (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
-
-# TDE specific building variables
+%define tde_pkg tdeio-ftps
+%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/kde
+%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}
-Version: 0.1
-Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-Summary: An ftps TDEIO slave for Trinity
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.1
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: An ftps TDEIO slave for Trinity
+Group: Productivity/Networking/Ftp/Clients
+URL: http://www.trinitydesktop.org/
-Group: Productivity/Networking/Ftp/Clients
-License: GPLv2+
-URL: http://www.trinitydesktop.org/
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+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: 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
+
Obsoletes: trinity-kio-ftps < %{version}-%{release}
Provides: trinity-kio-ftps < %{version}-%{release}
+
%description
An ftps TDEIO slave for Trinity, based on rfc4217. It should work yet with
most server implementations.
-%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}}
@@ -100,8 +136,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-2
-- Initial release for TDE 14.0.0
-
-* Sat Mar 09 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.1-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/tdeio-locate/kio-locate-3.5.12.spec b/redhat/applications/tdeio-locate/kio-locate-3.5.12.spec
deleted file mode 100644
index 83bfc919b..000000000
--- a/redhat/applications/tdeio-locate/kio-locate-3.5.12.spec
+++ /dev/null
@@ -1,111 +0,0 @@
-# Default version for this component
-%define kdecomp kio-locate
-
-# 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: kio-slave for the locate command [Trinity]
-Version: 0.4.5
-Release: 2%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{kdecomp}-3.5.12.tar.gz
-
-# [kio-locate] Fix compilation with GCC 4.7
-Patch1: kio-locate-3.5.13-fix_gcc47_compilation.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires: scons
-
-%description
-Adds support for the "locate:" and "locater:"
-protocols to Konqueror and other TDE applications.
-
-This enables you to perform locate searches as you
-would in a terminal. The result is displayed just
-as a directory.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-#patch1 -p1 -b .install
-
-# Ugly hack to modify TQT include directory inside SCONS files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/kde.py" \
- -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CXXFLAGS="-I%{tde_includedir}/tqt ${CXXFLAGS}"
-scons configure
-scons
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-scons install DESTDIR=%{buildroot}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_tdelibdir}/kio_locate.la
-%{tde_tdelibdir}/kio_locate.so
-%{tde_tdedocdir}/HTML/en/kio-locate/
-%{tde_datadir}/services/locate.protocol
-%{tde_datadir}/services/locater.protocol
-%{tde_datadir}/services/rlocate.protocol
-%{tde_datadir}/services/searchproviders/locate.desktop
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-- Fix compilation with GCC 4.7
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tdeio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/tdeio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 00ca8561c..000000000
--- a/redhat/applications/tdeio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- kio-locate/src/SConscript.ORI 2012-05-02 00:23:36.637608539 +0200
-+++ kio-locate/src/SConscript 2012-05-02 00:23:44.142459165 +0200
-@@ -28,7 +28,7 @@
- pattern.cpp
- """
- obj.libs='tqt kio'
--obj.linkflags='-module' # add more link flags
-+#obj.linkflags='-module' # add more link flags
- obj.execute()
-
- # Install the protocol files
---- kio-locate/admin/kde.py.install 2011-07-07 08:10:05.000000000 +0200
-+++ kio-locate/admin/kde.py 2012-05-06 20:29:48.236024293 +0200
-@@ -337,7 +337,7 @@
- opts.Save(cachefile, env)
-
- ## set default variables, one can override them in sconscript files
-- env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I/usr/include/tqt' ],
-+ env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I/opt/trinity/include/tqt' ],
- LIBPATH = [env['KDELIBPATH'], env['QTLIBPATH'] ])
-
- env['QT_AUTOSCAN'] = 1
-@@ -773,7 +773,7 @@
- ## Define this to 1 if you are writing documentation else to 0 :)
- #if lenv.has_key('i_am_a_documentation_writer'):
- for file in docbook_list:
-- lenv.Depends( folder+'index.cache.bz2', nodefile )
-+ lenv.Depends( folder+'index.cache.bz2', file )
-
- if lenv.has_key('_BUILDDIR_'): folder=lenv.join(lenv['_BUILDDIR_'], folder)
-
-@@ -781,7 +782,7 @@
- lenv.KDEinstall( 'KDEDOC', lenv.join(lang,destination), lenv.join(folder,'index.cache.bz2') )
-
- if env['_INSTALL']:
-- dir=lenv.join(lenv.getInstDirForResType('KDEDOC'), lang, destination)
-+ dir=lenv.join(env['DESTDIR'], lenv.getInstDirForResType('KDEDOC'), lang, destination)
- comp='mkdir -p %s && cd %s && rm -f common && ln -s ../common common' % (dir, dir)
- lenv.Execute(comp)
-
diff --git a/redhat/applications/tdeio-locate/kio-locate-3.5.13.1.spec b/redhat/applications/tdeio-locate/kio-locate-3.5.13.1.spec
deleted file mode 100644
index 24f010d15..000000000
--- a/redhat/applications/tdeio-locate/kio-locate-3.5.13.1.spec
+++ /dev/null
@@ -1,135 +0,0 @@
-# Default version for this component
-%define kdecomp kio-locate
-
-# 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: kio-slave for the locate command [Trinity]
-Version: 0.4.5
-Release: 3%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-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: cmake >= 2.8
-
-%description
-Adds support for the "locate:" and "locater:"
-protocols to Konqueror and other TDE applications.
-
-This enables you to perform locate searches as you
-would in a terminal. The result is displayed just
-as a directory.
-
-
-%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 SCONS files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/kde.py" \
- -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-
-%cmake \
- -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} \
- -DCMAKE_SKIP_RPATH="OFF" \
- -DBUILD_ALL=ON \
- ..
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_tdelibdir}/kio_locate.la
-%{tde_tdelibdir}/kio_locate.so
-%{tde_tdedocdir}/HTML/en/kio-locate/
-%{tde_datadir}/services/locate.protocol
-%{tde_datadir}/services/locater.protocol
-%{tde_datadir}/services/rlocate.protocol
-%{tde_datadir}/services/searchproviders/locate.desktop
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-- Fix compilation with GCC 4.7
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tdeio-locate/kio-locate-3.5.13.spec b/redhat/applications/tdeio-locate/kio-locate-3.5.13.spec
deleted file mode 100644
index a43cea13a..000000000
--- a/redhat/applications/tdeio-locate/kio-locate-3.5.13.spec
+++ /dev/null
@@ -1,113 +0,0 @@
-# Default version for this component
-%define kdecomp kio-locate
-
-# 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: kio-slave for the locate command [Trinity]
-Version: 0.4.5
-Release: 2%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{kdecomp}-3.5.13.tar.gz
-
-# [kio-locate] Fix compilation with GCC 4.7
-Patch1: kio-locate-3.5.13-fix_gcc47_compilation.patch
-
-Patch2: kio-locate-3.5.13-downgrade_3512.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires: scons
-
-%description
-Adds support for the "locate:" and "locater:"
-protocols to Konqueror and other TDE applications.
-
-This enables you to perform locate searches as you
-would in a terminal. The result is displayed just
-as a directory.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1 -b .install
-%patch2 -p7
-
-# Ugly hack to modify TQT include directory inside SCONS files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/kde.py" \
- -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-scons configure
-scons
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-scons install DESTDIR=%{buildroot}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_tdelibdir}/kio_locate.la
-%{tde_tdelibdir}/kio_locate.so
-%{tde_tdedocdir}/HTML/en/kio-locate/
-%{tde_datadir}/services/locate.protocol
-%{tde_datadir}/services/locater.protocol
-%{tde_datadir}/services/rlocate.protocol
-%{tde_datadir}/services/searchproviders/locate.desktop
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-- Fix compilation with GCC 4.7
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
index d3a53bd8a..93d0a0ca4 100644
--- a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
+++ b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
@@ -1,57 +1,93 @@
-# Default version for this component
-%define tde_pkg tdeio-locate
+#
+# spec file for package tdeio-locate (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 tdeio-locate
+%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}
-Summary: tdeio-slave for the locate command [Trinity]
-Version: 0.4.5
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.4.5
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: Tdeio-slave for the locate command [Trinity]
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org
-License: GPLv2+
-Group: Applications/Utilities
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
-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: cmake >= 2.8
+BuildRequires: 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
+
+# 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
Obsoletes: trinity-kio-locate < %{version}-%{release}
Provides: trinity-kio-locate = %{version}-%{release}
+
%description
Adds support for the "locate" and "locater:"
protocols to Konqueror and other TDE applications.
@@ -61,10 +97,14 @@ would in a terminal. The result is displayed just
as a directory.
-%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}}
@@ -126,5 +166,5 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/services/searchproviders/locate.desktop
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.5-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.4.5-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
index c71b4093b..8f44108ee 100644
--- a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
+++ b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
@@ -1,48 +1,84 @@
-# 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
-
-# Default version for this component
-%define tde_pkg tdeio-sword
+#
+# spec file for package tdeio-sword (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
-
-# TDE specific building variables
+%define tde_pkg tdeio-sword
+%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/kde
+%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}
-Version: 0.3
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary: tdeio-slave for the Sword Bible tool
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.3
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: Tdeio-slave for the Sword Bible tool
+Group: Productivity/Networking/Ftp/Clients
+URL: http://lukeplant.me.uk/kio-sword/
-Group: Productivity/Networking/Ftp/Clients
-License: GPLv2+
-URL: http://lukeplant.me.uk/kio-sword/
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+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: 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: sword
+BuildRequires: sword-devel
+Requires: sword
+
+
%description
TDEio-Sword provides access to Bibles, commentaries
and other texts in an easy to use and attractive
@@ -51,10 +87,14 @@ using the SWORD Bible project and implementing a TDE
ioslave, providing the sword:/ protocol.
-%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}}
@@ -115,8 +155,7 @@ done
%doc AUTHORS ChangeLog COPYING README TODO
%{tde_tdelibdir}/tdeio_sword.la
%{tde_tdelibdir}/tdeio_sword.so
-%{tde_datadir}/apps/tdeio_sword/swordvertical.png
-%{tde_datadir}/apps/tdeio_sword/tdeio_sword.css
+%{tde_datadir}/apps/tdeio_sword/
%{tde_tdedocdir}/HTML/en/tdeio_sword/
%{tde_datadir}/icons/hicolor/*/apps/tdeio_sword.png
%{tde_datadir}/icons/hicolor/scalable/apps/tdeio_sword.svgz
@@ -124,5 +163,5 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.3-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.1.spec b/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.1.spec
deleted file mode 100644
index b13800f97..000000000
--- a/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.1.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-# Default version for this component
-%define kdecomp kio-umountwrapper
-
-# 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: progress dialog for safely removing devices in Trinity.
-Version: 0.2
-Release: 4%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://frode.kde.no/misc/kio_umountwrapper/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{kdecomp}-3.5.13.1.tar.gz
-Source1: media_safelyremove.desktop
-
-
-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
-
-
-%description
-Wrapper around kio_media_mountwrapper.
-Provides a progress dialog for Safely Removing of devices in Trinity.
-
-
-
-%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} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-
-
-%clean
-%__rm -rf %{buildroot}
-
-%post
-for f in konqueror d3lphin; do
-%if 0%{?suse_version}
- update-alternatives --install \
-%else
- alternatives --install \
-%endif
- %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \
- media_safelyremove.desktop_${f} \
- %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \
- 20
-done
-
-
-%postun
-if [ $1 -eq 0 ]; then
- for f in konqueror d3lphin; do
-%if 0%{?suse_version}
- update-alternatives --remove \
-%else
- alternatives --remove \
-%endif
- media_safelyremove.desktop_${f} \
- %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper
- done
-fi
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kio_umountwrapper
-%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-#%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-3
-- Add 'desktop' file, to make this program useful :-)
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.spec b/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.spec
deleted file mode 100644
index 968f3cab9..000000000
--- a/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.spec
+++ /dev/null
@@ -1,140 +0,0 @@
-# Default version for this component
-%define kdecomp kio-umountwrapper
-
-# 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: progress dialog for safely removing devices in Trinity.
-Version: 0.2
-Release: 3%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://frode.kde.no/misc/kio_umountwrapper/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{kdecomp}-3.5.13.tar.gz
-Source1: media_safelyremove.desktop
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-Wrapper around kio_media_mountwrapper.
-Provides a progress dialog for Safely Removing of devices in Trinity.
-
-
-
-%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} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-
-
-%clean
-%__rm -rf %{buildroot}
-
-%post
-for f in konqueror d3lphin; do
- alternatives --install \
- %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \
- media_safelyremove.desktop_${f} \
- %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \
- 20
-done
-
-
-%postun
-if [ $1 -eq 0 ]; then
- for f in konqueror d3lphin; do
- alternatives --remove \
- media_safelyremove.desktop_${f} \
- %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper
- done
-fi
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kio_umountwrapper
-%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-#%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-
-%Changelog
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-3
-- Add 'desktop' file, to make this program useful :-)
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
index 36fe098ba..ecf4a7cf1 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
+++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
@@ -1,50 +1,61 @@
-# Default version for this component
-%define tde_pkg tdeio-umountwrapper
+#
+# spec file for package tdeio-umountwrapper (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 tdeio-umountwrapper
+%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.2
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: Progress dialog for safely removing devices in Trinity
+Group: Applications/Utilities
+URL: http://frode.kde.no/misc/tdeio_umountwrapper/
-Name: trinity-%{tde_pkg}
-Summary: progress dialog for safely removing devices in Trinity.
-Version: 0.2
-Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://frode.kde.no/misc/tdeio_umountwrapper/
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
-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
Source1: media_safelyremove.desktop_tdeio
-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
@@ -52,15 +63,35 @@ BuildRequires: desktop-file-utils
Obsoletes: trinity-kio-umountwrapper < %{version}-%{release}
Provides: trinity-kio-umountwrapper = %{version}-%{release}
+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
+
+
%description
Wrapper around tdeio_media_mountwrapper.
Provides a progress dialog for Safely Removing of devices in Trinity.
-%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}}
@@ -129,9 +160,11 @@ fi
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{tde_bindir}/tdeio_umountwrapper
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
+%dir %{tde_datadir}/apps/d3lphin
+%dir %{tde_datadir}/apps/d3lphin/servicemenus
%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-8
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.2-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
index 5df794508..4ede492cb 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
@@ -1,52 +1,79 @@
-# Default version for this component
-%define tde_pkg tdenetworkmanager
+#
+# spec file for package tdeio-tdenetworkmanager (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 tdenetworkmanager
+%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_tdedocdir}
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.9
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: Trinity applet for Network Manager
+Group: Applications/Internet
+URL: http://www.trinitydesktop.org/
-Name: trinity-%{tde_pkg}
-Version: 0.9
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Summary: Trinity applet for Network Manager
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
-Group: Applications/Internet
-License: GPLv2+
-#URL: http://en.opensuse.org/Projects/KNetworkManager
-URL: http://www.trinitydesktop.org/
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1: %{name}-rpmlintrc
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-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: 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
Obsoletes: trinity-knetworkmanager < %{version}-%{release}
Provides: trinity-knetworkmanager = %{version}-%{release}
@@ -75,10 +102,64 @@ Requires: NetworkManager
BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9
BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires: libudev-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
+
+
%description
TDENetworkManager is a system tray applet for controlling network
connections on systems that use the NetworkManager daemon.
+%post
+update-desktop-database %{tde_tdeappdir} > /dev/null
+/sbin/ldconfig
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+# Prevent autostart of 'nm-applet', if installed.
+if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then
+ if ! grep -qw "TDE" "/etc/xdg/autostart/nm-applet.desktop" ; then
+ sed -i "/etc/xdg/autostart/nm-applet.desktop" -e "s|\(NotShowIn=.*\)|\1TDE;|"
+ fi
+fi
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/tdenetworkmanager
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{_sysconfdir}/dbus-1/system.d/tdenetworkmanager.conf
+%{tde_tdeappdir}/tdenetworkmanager.desktop
+%{tde_datadir}/apps/tdenetworkmanager
+%{tde_datadir}/icons/hicolor/*/apps/tdenetworkmanager*
+%{tde_datadir}/servicetypes/tdenetworkmanager_plugin.desktop
+%{tde_datadir}/servicetypes/tdenetworkmanager_vpnplugin.desktop
+%{tde_datadir}/autostart/tdenetworkmanager.desktop
+%{tde_datadir}/services/tdenetman_openvpn.desktop
+%{tde_datadir}/services/tdenetman_pptp.desktop
+%{tde_datadir}/services/tdenetman_strongswan.desktop
+%{tde_datadir}/services/tdenetman_vpnc.desktop
+%{tde_tdedocdir}/HTML/en/tdenetworkmanager/
+
+##########
+
+%postun
+update-desktop-database %{tde_tdeappdir} > /dev/null
+/sbin/ldconfig
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
%package devel
Summary: Common data shared among the MySQL GUI Suites
@@ -88,13 +169,28 @@ Requires: %{name} = %{version}-%{release}
%description devel
Development headers for tdenetworkmanager
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/*.h
+%{tde_tdelibdir}/*.la
+%{tde_tdelibdir}/*.so
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
+##########
+
-%prep
+%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -131,60 +227,16 @@ fi
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=%{?buildroot} -C build
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet
+%endif
+
%clean
%__rm -rf $RPM_BUILD_ROOT
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-# Prevent autostart of 'nm-applet', if installed.
-if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then
- if ! grep -qw "TDE" "/etc/xdg/autostart/nm-applet.desktop" ; then
- sed -i "/etc/xdg/autostart/nm-applet.desktop" -e "s|\(NotShowIn=.*\)|\1TDE;|"
- fi
-fi
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/tdenetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{_sysconfdir}/dbus-1/system.d/tdenetworkmanager.conf
-%{tde_tdeappdir}/tdenetworkmanager.desktop
-%{tde_datadir}/apps/tdenetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/tdenetworkmanager*
-%{tde_datadir}/servicetypes/tdenetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/tdenetworkmanager_vpnplugin.desktop
-%{tde_datadir}/autostart/tdenetworkmanager.desktop
-%{tde_datadir}/services/tdenetman_openvpn.desktop
-%{tde_datadir}/services/tdenetman_pptp.desktop
-%{tde_datadir}/services/tdenetman_strongswan.desktop
-%{tde_datadir}/services/tdenetman_vpnc.desktop
-%{tde_tdedocdir}/HTML/en/tdenetworkmanager/
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
-
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.9-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc b/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
new file mode 100644
index 000000000..8668d5e81
--- /dev/null
+++ b/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
@@ -0,0 +1 @@
+setBadness('suse-dbus-unauthorized-service', 0)