summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
Diffstat (limited to 'redhat')
-rw-r--r--redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec2
-rw-r--r--redhat/applications/potracegui/potracegui-14.0.0.spec2
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-14.0.0.spec128
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-3.5.13-ftbfs.patch10
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-3.5.13.1.spec156
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-3.5.13.spec144
-rw-r--r--redhat/applications/smb4k/smb4k-14.0.0.spec107
-rw-r--r--redhat/applications/smb4k/smb4k-3.5.13-fix_gcc47_compilation.patch18
-rw-r--r--redhat/applications/smb4k/smb4k-3.5.13.1.spec188
-rw-r--r--redhat/applications/smb4k/smb4k-3.5.13.spec184
-rw-r--r--redhat/applications/soundkonverter/soundkonverter-14.0.0.spec118
-rw-r--r--redhat/applications/soundkonverter/soundkonverter-3.5.13.1.spec181
-rw-r--r--redhat/applications/soundkonverter/soundkonverter-3.5.13.spec173
-rw-r--r--redhat/applications/tde-guidance/guidance-3.5.13.1.spec414
-rw-r--r--redhat/applications/tde-guidance/guidance-3.5.13.spec390
-rw-r--r--redhat/applications/tde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch73
-rw-r--r--redhat/applications/tde-guidance/tde-guidance-14.0.0.spec137
-rw-r--r--redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec90
18 files changed, 410 insertions, 2105 deletions
diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec b/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec
index 086ef6e74..549241657 100644
--- a/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec
+++ b/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec
@@ -36,7 +36,7 @@ Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.5b
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary: A video thumbnail generator for TDE file managers.
+Summary: A video thumbnail generator for TDE file managers
Group: Applications/Multimedia
URL: http://kde-apps.org/content/show.php?content=41180
diff --git a/redhat/applications/potracegui/potracegui-14.0.0.spec b/redhat/applications/potracegui/potracegui-14.0.0.spec
index e931b2cda..d8eb6380b 100644
--- a/redhat/applications/potracegui/potracegui-14.0.0.spec
+++ b/redhat/applications/potracegui/potracegui-14.0.0.spec
@@ -78,7 +78,7 @@ BuildRequires: brp-check-trinity
A TDE interface for the commandline tracing tools potrace and/or autotrace. It
supports drag and drop as well as all image types recognized by TDE, which are
a lot more than the 4 recognized by the potrace commandline tool. Loading of
-remote files (web, ftp, ...) is also supported.
+remote files (web, ftp, ...) is also supported.
##########
diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
index aefc18948..4176d716d 100644
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
@@ -1,52 +1,78 @@
-# Default version for this component
-%define tde_pkg smartcardauth
+#
+# spec file for package smartcardauth (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 smartcardauth
+%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: 1.0
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: SmartCard Login and LUKS Decrypt, Setup Utility
+Group: Applications/System
+URL: http://www.trinitydesktop.org/
-Name: trinity-%{tde_pkg}
-Summary: SmartCard Login and LUKS Decrypt, Setup Utility
-Version: 1.0
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/System
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Vendor: Trinity Project
-Packager: Francois Andriot <[email protected]>
-URL: http://www.trinitydesktop.org/
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <[email protected]>
-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: 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
+
#BuildRequires: perl-PAR-Packer
%if 0%{?mgaversion} || 0%{?mdkversion}
Requires: perl-pcsc-perl
@@ -58,10 +84,36 @@ Requires: pcsc-perl
Requires: perl-pcsc
%endif
+# DB4/DB5 support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
+%define with_db 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires: db4-devel
+%else
+BuildRequires: db5-devel
+%endif
+%endif
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+BuildRequires: libdb-devel
+BuildRequires: libdb-cxx-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libdb-4_8-devel
+%endif
+%if 0%{?rhel} && 0%{?rhel} <= 6
+BuildRequires: db4-devel
+%endif
+%endif
+
+# PAM support
+BuildRequires: pam-devel
+
+
%description
This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
- Your encrypted LUKS partition
-- TDE3.x, including automatic login, lock, and unlock features
+- TDE, including automatic login, lock, and unlock features
It is designed to work with any ISO 7816-1,2,3,4 compliant smartcard
Examples of such cards are:
@@ -73,10 +125,13 @@ simultaneously with the certificate reading program(s) to provide single sign on
in addition to the PKCS certificate functionality
-%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}}
@@ -88,6 +143,9 @@ in addition to the PKCS certificate functionality
%build
export PATH="%{tde_bindir}:${PATH}"
+export CFLAGS="${CXXFLAGS} ${RPM_OPT_FLAGS}"
+export CXXFLAGS="${CXXFLAGS} ${RPM_OPT_FLAGS}"
+
./build_ckpasswd
@@ -104,18 +162,21 @@ export PATH="%{tde_bindir}:${PATH}"
%__mkdir_p %{buildroot}%{_sysconfdir}
%__cp -Rp etc/* %{buildroot}%{_sysconfdir}
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/smartcardauth.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/smartcardrestrict.desktop"
+
%clean
%__rm -rf %{buildroot}
%post
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%postun
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
@@ -124,8 +185,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%defattr(-,root,root,-)
%doc gpl.txt
%{_sysconfdir}/init/smartauthlogin.conf
-%{_sysconfdir}/smartauth/smartauth.sh.in
-%{_sysconfdir}/smartauth/smartauthmon.sh.in
+%{_sysconfdir}/smartauth/
%{tde_bindir}/cryptosmartcard.sh
%{tde_bindir}/scriptor.pl
%{tde_bindir}/setupcard.sh
@@ -141,5 +201,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 1.0-5
+* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:1.0-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13-ftbfs.patch b/redhat/applications/smartcardauth/smartcardauth-3.5.13-ftbfs.patch
deleted file mode 100644
index ce76facdc..000000000
--- a/redhat/applications/smartcardauth/smartcardauth-3.5.13-ftbfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- smartcardauth/src/ckpasswd.c.ORI 2011-12-04 03:44:36.047000504 -0500
-+++ smartcardauth/src/ckpasswd.c 2011-12-04 03:44:47.450745795 -0500
-@@ -30,6 +30,7 @@
- #include <fcntl.h>
- #include <pwd.h>
- #include <grp.h>
-+#include <getopt.h>
-
- #define DB_DBM_HSEARCH 1
- #include <db.h>
diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.1.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.1.spec
deleted file mode 100644
index 4c3e28317..000000000
--- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.1.spec
+++ /dev/null
@@ -1,156 +0,0 @@
-# Default version for this component
-%define kdecomp smartcardauth
-
-# 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_tdedocdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: SmartCard Login and LUKS Decrypt, Setup Utility
-Version: 1.0
-Release: 2%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/System
-
-Vendor: Trinity Project
-Packager: Francois Andriot <[email protected]>
-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
-Patch0: smartcardauth-3.5.13-ftbfs.patch
-
-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: perl-PAR-Packer
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires: perl-pcsc-perl
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-Requires: pcsc-perl
-%endif
-%if 0%{?suse_version}
-Requires: perl-pcsc
-%endif
-
-%description
-This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
-- Your encrypted LUKS partition
-- TDE3.x, including automatic login, lock, and unlock features
-
-It is designed to work with any ISO 7816-1,2,3,4 compliant smartcard
-Examples of such cards are:
-- The Schlumberger MultiFlex
-- The ACS ACOS5 / ACOS6 series of cryptographic ISO 7816 cards
-
-If a card is chosen that has PKSC support, such as the ACOS cards, this utility can run
-simultaneously with the certificate reading program(s) to provide single sign on
-in addition to the PKCS certificate functionality
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-unset QTDIR; . /etc/profile.d/qt3.sh
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch0 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "src/Makefile" \
- -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
- -e "s|/usr/include/qt3|${QTINC}|g"
-
-%__sed -i "Makefile" \
- -e "s|/usr/lib/perl5/Chipcard|/usr/lib64/perl5/vendor_perl/Chipcard|g"
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-./build_ckpasswd
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-
-%__install -D -m 755 scriptor_standalone.pl %{buildroot}%{tde_bindir}/scriptor.pl
-%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthckpasswd
-#%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthmon
-%__ln_s smartauthckpasswd %{buildroot}%{tde_bindir}/smartauthmon
-%__cp -Rp usr/* %{buildroot}%{tde_prefix}
-
-%__mkdir_p %{buildroot}%{_sysconfdir}
-%__cp -Rp etc/* %{buildroot}%{_sysconfdir}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc gpl.txt
-%{_sysconfdir}/init/smartauthlogin.conf
-%{_sysconfdir}/smartauth/smartauth.sh.in
-%{_sysconfdir}/smartauth/smartauthmon.sh.in
-%{tde_bindir}/cryptosmartcard.sh
-%{tde_bindir}/scriptor.pl
-%{tde_bindir}/setupcard.sh
-%{tde_bindir}/setupslavecard.sh
-%{tde_bindir}/smartauth.sh
-%{tde_bindir}/smartauthckpasswd
-%{tde_bindir}/smartauthmon
-%{tde_datadir}/applications/smartcardauth.desktop
-%{tde_datadir}/applications/smartcardrestrict.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
-%{tde_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
-%{tde_datadir}/initramfs-tools/hooks/cryptlukssc
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <[email protected]> - 1.0-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <[email protected]> - 1.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.spec
deleted file mode 100644
index 8143809d4..000000000
--- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.spec
+++ /dev/null
@@ -1,144 +0,0 @@
-# Default version for this component
-%define kdecomp smartcardauth
-
-# 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_tdedocdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: SmartCard Login and LUKS Decrypt, Setup Utility
-Version: 1.0
-Release: 1%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/System
-
-Vendor: Trinity Project
-Packager: Francois Andriot <[email protected]>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{kdecomp}-3.5.13.tar.gz
-Patch0: smartcardauth-3.5.13-ftbfs.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-#BuildRequires: perl-PAR-Packer
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires: perl-pcsc-perl
-%else
-Requires: pcsc-perl
-%endif
-
-%description
-This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
-- Your encrypted LUKS partition
-- TDE3.x, including automatic login, lock, and unlock features
-
-It is designed to work with any ISO 7816-1,2,3,4 compliant smartcard
-Examples of such cards are:
-- The Schlumberger MultiFlex
-- The ACS ACOS5 / ACOS6 series of cryptographic ISO 7816 cards
-
-If a card is chosen that has PKSC support, such as the ACOS cards, this utility can run
-simultaneously with the certificate reading program(s) to provide single sign on
-in addition to the PKCS certificate functionality
-
-
-%prep
-unset QTDIR; . /etc/profile.d/qt.sh
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "src/Makefile" \
- -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
- -e "s|/usr/include/qt3|${QTINC}|g"
-
-%__sed -i "Makefile" \
- -e "s|/usr/lib/perl5/Chipcard|/usr/lib64/perl5/vendor_perl/Chipcard|g"
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-./build_ckpasswd
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-
-%__install -D -m 755 scriptor_standalone.pl %{buildroot}%{tde_bindir}/scriptor.pl
-%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthckpasswd
-#%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthmon
-%__ln_s smartauthckpasswd %{buildroot}%{tde_bindir}/smartauthmon
-%__cp -Rp usr/* %{buildroot}%{tde_prefix}
-
-%__mkdir_p %{buildroot}%{_sysconfdir}
-%__cp -Rp etc/* %{buildroot}%{_sysconfdir}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc gpl.txt
-%{_sysconfdir}/init/smartauthlogin.conf
-%{_sysconfdir}/smartauth/smartauth.sh.in
-%{_sysconfdir}/smartauth/smartauthmon.sh.in
-%{tde_bindir}/cryptosmartcard.sh
-%{tde_bindir}/scriptor.pl
-%{tde_bindir}/setupcard.sh
-%{tde_bindir}/setupslavecard.sh
-%{tde_bindir}/smartauth.sh
-%{tde_bindir}/smartauthckpasswd
-%{tde_bindir}/smartauthmon
-%{tde_datadir}/applications/smartcardauth.desktop
-%{tde_datadir}/applications/smartcardrestrict.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
-%{tde_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
-%{tde_datadir}/initramfs-tools/hooks/cryptlukssc
-
-
-%Changelog
-* Sat Dec 03 2011 Francois Andriot <[email protected]> - 1.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/smb4k/smb4k-14.0.0.spec b/redhat/applications/smb4k/smb4k-14.0.0.spec
index fb499cc17..f6ccc55cd 100644
--- a/redhat/applications/smb4k/smb4k-14.0.0.spec
+++ b/redhat/applications/smb4k/smb4k-14.0.0.spec
@@ -1,54 +1,79 @@
-# Default version for this component
-%define tde_pkg smb4k
+#
+# spec file for package smb4k (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 smb4k
+%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}
-Summary: A Samba (SMB) share advanced browser for Trinity
-Version: 0.9.4
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.9.4
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: A Samba (SMB) share advanced browser for 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 <[email protected]>
-URL: http://www.trinitydesktop.org
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <[email protected]>
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-
BuildRequires: gettext
+BuildRequires: 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
Smb4K is a SMB (Windows) share browser for TDE. It uses the Samba software
@@ -82,22 +107,22 @@ possible.
%{tde_tdelibdir}/libsmb4kshareslistview.so
%{tde_tdeappdir}/smb4k.desktop
%{tde_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
-%{tde_datadir}/apps/smb4k/smb4k_shell.rc
-%{tde_datadir}/apps/smb4knetworkbrowserpart/smb4knetworkbrowser_part.rc
-%{tde_datadir}/apps/smb4ksharesiconviewpart/smb4ksharesiconview_part.rc
-%{tde_datadir}/apps/smb4kshareslistviewpart/smb4kshareslistview_part.rc
+%{tde_datadir}/apps/smb4k/
+%{tde_datadir}/apps/smb4knetworkbrowserpart/
+%{tde_datadir}/apps/smb4ksharesiconviewpart/
+%{tde_datadir}/apps/smb4kshareslistviewpart/
%{tde_datadir}/config.kcfg/smb4k.kcfg
%{tde_datadir}/icons/crystalsvg/*/apps/smb4k.png
%{tde_tdedocdir}/HTML/en/smb4k/
%post
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
touch --no-create %{tde_datadir}/icons/crystalsvg || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
/sbin/ldconfig || :
%postun
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
touch --no-create %{tde_datadir}/icons/crystalsvg || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
/sbin/ldconfig || :
@@ -125,10 +150,11 @@ Requires: %{name} = %{version}-%{release}
##########
-%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}}
@@ -170,11 +196,20 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%suse_update_desktop_file -r %{tde_pkg} System Network
+%endif
+
+# Removes duplicate files
+%fdupes -s %buildroot
+
%clean
%__rm -rf %{buildroot}
%changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 0.9.4-6
+* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:0.9.4-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/smb4k/smb4k-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/smb4k/smb4k-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 03048f58d..000000000
--- a/redhat/applications/smb4k/smb4k-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit b4c7fd481649eaa362dc426e6b5f8d23b0c9e836
-Author: Darrell Anderson <[email protected]>
-Date: 1335631847 -0500
-
- GCC 4.7 fixes.
-
-diff --git a/smb4k/configdlg/smb4kshareoptions.cpp b/smb4k/configdlg/smb4kshareoptions.cpp
-index 24e309a..6627b51 100644
---- a/smb4k/configdlg/smb4kshareoptions.cpp
-+++ b/smb4k/configdlg/smb4kshareoptions.cpp
-@@ -40,6 +40,7 @@
- // system includes
- #include <sys/types.h>
- #include <pwd.h>
-+#include <unistd.h>
-
- // applications specific includes
- #include "smb4kshareoptions.h"
diff --git a/redhat/applications/smb4k/smb4k-3.5.13.1.spec b/redhat/applications/smb4k/smb4k-3.5.13.1.spec
deleted file mode 100644
index 9b6e0320b..000000000
--- a/redhat/applications/smb4k/smb4k-3.5.13.1.spec
+++ /dev/null
@@ -1,188 +0,0 @@
-# Default version for this component
-%define kdecomp smb4k
-
-# 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_tdedocdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: A Samba (SMB) share advanced browser for Trinity
-Version: 0.9.4
-Release: 3%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <[email protected]>
-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-arts-devel >= 3.5.13.1
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires: trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-
-
-%description
-Smb4K is a SMB (Windows) share browser for KDE. It uses the Samba software
-suite to access the SMB shares of the local network neighborhood. Its purpose
-is to provide a program that's easy to use and has as many features as
-possible.
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/smb4k
-%{tde_bindir}/smb4k_cat
-%{tde_bindir}/smb4k_kill
-%{tde_bindir}/smb4k_mount
-%{tde_bindir}/smb4k_mv
-%{tde_bindir}/smb4k_umount
-%{tde_libdir}/libsmb4kcore.so.2
-%{tde_libdir}/libsmb4kcore.so.2.0.0
-%{tde_libdir}/libsmb4kdialogs.la
-%{tde_libdir}/libsmb4kdialogs.so
-%{tde_tdelibdir}/konqsidebar_smb4k.la
-%{tde_tdelibdir}/konqsidebar_smb4k.so
-%{tde_tdelibdir}/libsmb4kconfigdialog.la
-%{tde_tdelibdir}/libsmb4kconfigdialog.so
-%{tde_tdelibdir}/libsmb4knetworkbrowser.la
-%{tde_tdelibdir}/libsmb4knetworkbrowser.so
-%{tde_tdelibdir}/libsmb4ksearchdialog.la
-%{tde_tdelibdir}/libsmb4ksearchdialog.so
-%{tde_tdelibdir}/libsmb4ksharesiconview.la
-%{tde_tdelibdir}/libsmb4ksharesiconview.so
-%{tde_tdelibdir}/libsmb4kshareslistview.la
-%{tde_tdelibdir}/libsmb4kshareslistview.so
-%{tde_tdeappdir}/smb4k.desktop
-%{tde_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
-%{tde_datadir}/apps/smb4k/smb4k_shell.rc
-%{tde_datadir}/apps/smb4knetworkbrowserpart/smb4knetworkbrowser_part.rc
-%{tde_datadir}/apps/smb4ksharesiconviewpart/smb4ksharesiconview_part.rc
-%{tde_datadir}/apps/smb4kshareslistviewpart/smb4kshareslistview_part.rc
-%{tde_datadir}/config.kcfg/smb4k.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/smb4k.png
-%{tde_tdedocdir}/HTML/en/smb4k/
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-%files devel
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libsmb4kcore.la
-%{tde_libdir}/libsmb4kcore.so
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%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 -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; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <[email protected]> - 0.9.4-3
-- Initial release for TDE 3.5.13.1
-
-* Sun Apr 06 2012 Francois Andriot <[email protected]> - 0.9.4-2
-- Rebuild for Fedora 17
-- Fix compilation with GCC 4.7 |Commit #b4c7fd48]
-
-* Wed Nov 30 2011 Francois Andriot <[email protected]> - 0.9.4-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/smb4k/smb4k-3.5.13.spec b/redhat/applications/smb4k/smb4k-3.5.13.spec
deleted file mode 100644
index 8eba1163c..000000000
--- a/redhat/applications/smb4k/smb4k-3.5.13.spec
+++ /dev/null
@@ -1,184 +0,0 @@
-# Default version for this component
-%define kdecomp smb4k
-
-# 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_tdedocdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: A Samba (SMB) share advanced browser for Trinity
-Version: 0.9.4
-Release: 2%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <[email protected]>
-URL: http://www.trinitydesktop.org
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{kdecomp}-3.5.13.tar.gz
-
-# [smb4k] Fix compilation with GCC 4.7 |Commit #b4c7fd48]
-Patch1: smb4k-3.5.13-fix_gcc47_compilation.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-
-
-%description
-Smb4K is a SMB (Windows) share browser for KDE. It uses the Samba software
-suite to access the SMB shares of the local network neighborhood. Its purpose
-is to provide a program that's easy to use and has as many features as
-possible.
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/smb4k
-%{tde_bindir}/smb4k_cat
-%{tde_bindir}/smb4k_kill
-%{tde_bindir}/smb4k_mount
-%{tde_bindir}/smb4k_mv
-%{tde_bindir}/smb4k_umount
-%{tde_libdir}/libsmb4kcore.so.2
-%{tde_libdir}/libsmb4kcore.so.2.0.0
-%{tde_libdir}/libsmb4kdialogs.la
-%{tde_libdir}/libsmb4kdialogs.so
-%{tde_tdelibdir}/konqsidebar_smb4k.la
-%{tde_tdelibdir}/konqsidebar_smb4k.so
-%{tde_tdelibdir}/libsmb4kconfigdialog.la
-%{tde_tdelibdir}/libsmb4kconfigdialog.so
-%{tde_tdelibdir}/libsmb4knetworkbrowser.la
-%{tde_tdelibdir}/libsmb4knetworkbrowser.so
-%{tde_tdelibdir}/libsmb4ksearchdialog.la
-%{tde_tdelibdir}/libsmb4ksearchdialog.so
-%{tde_tdelibdir}/libsmb4ksharesiconview.la
-%{tde_tdelibdir}/libsmb4ksharesiconview.so
-%{tde_tdelibdir}/libsmb4kshareslistview.la
-%{tde_tdelibdir}/libsmb4kshareslistview.so
-%{tde_tdeappdir}/smb4k.desktop
-%{tde_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
-%{tde_datadir}/apps/smb4k/smb4k_shell.rc
-%{tde_datadir}/apps/smb4knetworkbrowserpart/smb4knetworkbrowser_part.rc
-%{tde_datadir}/apps/smb4ksharesiconviewpart/smb4ksharesiconview_part.rc
-%{tde_datadir}/apps/smb4kshareslistviewpart/smb4kshareslistview_part.rc
-%{tde_datadir}/config.kcfg/smb4k.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/smb4k.png
-%{tde_tdedocdir}/HTML/en/smb4k/
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-%files devel
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libsmb4kcore.la
-%{tde_libdir}/libsmb4kcore.so
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-# 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 -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; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-
-%Changelog
-* Sun Apr 06 2012 Francois Andriot <[email protected]> - 0.9.4-2
-- Rebuild for Fedora 17
-- Fix compilation with GCC 4.7 |Commit #b4c7fd48]
-
-* Wed Nov 30 2011 Francois Andriot <[email protected]> - 0.9.4-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
index 48516a2ee..320c979a7 100644
--- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
+++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
@@ -1,52 +1,89 @@
-# Default version for this component
-%define tde_pkg soundkonverter
+#
+# spec file for package soundkonverter (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 soundkonverter
+%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.3.8
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: Audio converter frontend for Trinity
+Group: Application/Multimedia
+URL: http://potracegui.sourceforge.net
-Name: trinity-%{tde_pkg}
-Summary: audio converter frontend for Trinity
-Version: 0.3.8
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Application/Multimedia
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Vendor: Trinity Project
-Packager: Francois Andriot <[email protected]>
-URL: http://potracegui.sourceforge.net
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <[email protected]>
-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: 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
+
+# TAGLIB support
+BuildRequires: taglib-devel
+
+# CDDA support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: libcdda-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: cdparanoia-devel
+%endif
+
%description
soundKonverter is a frontend to various audio converters.
@@ -79,10 +116,13 @@ transferring them to your media device.
See the 'soundkonverter-trinity' package for more information.
-%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}}
@@ -123,17 +163,23 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%endif
+
+
%clean
%__rm -rf %{buildroot}
%post
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%postun
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
@@ -146,11 +192,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_tdeappdir}/soundkonverter.desktop
%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
%{tde_datadir}/apps/soundkonverter
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/README
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-%{tde_tdedocdir}/HTML/en/soundkonverter/common
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.docbook
+%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/
+%{tde_tdedocdir}/HTML/en/soundkonverter/
%{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png
%{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop
%{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop
@@ -168,10 +211,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%files amarok
%defattr(-,root,root,-)
-%{tde_datadir}/apps/soundkonverter/amarokscript/README
-%{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
+%{tde_datadir}/apps/soundkonverter/amarokscript/
%changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 0.3.8-5
+* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:0.3.8-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.1.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.1.spec
deleted file mode 100644
index 221f14ed2..000000000
--- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.1.spec
+++ /dev/null
@@ -1,181 +0,0 @@
-# Default version for this component
-%define kdecomp soundkonverter
-
-# 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_tdedocdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: audio converter frontend for Trinity
-Version: 0.3.8
-Release: 2%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Application/Multimedia
-
-Vendor: Trinity Project
-Packager: Francois Andriot <[email protected]>
-URL: http://potracegui.sourceforge.net
-
-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
-
-
-%description
-soundKonverter is a frontend to various audio converters.
-
-The key features are:
- - Audio conversion
- - Replay Gain calculation
- - CD ripping
-
-soundKonverter supports reading and writing tags for many formats, so the tags
-are preserved when converting files.
-
-It comes with an Amarok script.
-
-See 'soundkonverter-amarok' package for more informations.
-
-See README.Debian for more informations on supported formats.
-
-
-%package amarok
-Summary: audio converter frontend for Trinity (Amarok script)
-Group: Application/Multimedia
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-amarok
-
-%description amarok
-Amarok script for soundKonverter. It allows you to easily transcode files when
-transferring them to your media device.
-
-See the 'soundkonverter-trinity' package for more information.
-
-
-%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 -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; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt:/usr/include/cdda \
- --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/soundkonverter
-%{tde_bindir}/userscript.sh
-%{tde_tdeappdir}/soundkonverter.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
-%{tde_datadir}/apps/soundkonverter
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/README
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-%{tde_tdedocdir}/HTML/en/soundkonverter/common
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.docbook
-%{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png
-%{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/amr.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop
-%{tde_datadir}/mimelnk/video/x-flv.soundkonverter.desktop
-
-%files amarok
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/soundkonverter/amarokscript/README
-%{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <[email protected]> - 0.3.8-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <[email protected]> - 0.3.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.spec
deleted file mode 100644
index 1e8955d15..000000000
--- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-# Default version for this component
-%define kdecomp soundkonverter
-
-# 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_tdedocdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: audio converter frontend for Trinity
-Version: 0.3.8
-Release: 1%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Application/Multimedia
-
-Vendor: Trinity Project
-Packager: Francois Andriot <[email protected]>
-URL: http://potracegui.sourceforge.net
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{kdecomp}-3.5.13.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-soundKonverter is a frontend to various audio converters.
-
-The key features are:
- - Audio conversion
- - Replay Gain calculation
- - CD ripping
-
-soundKonverter supports reading and writing tags for many formats, so the tags
-are preserved when converting files.
-
-It comes with an Amarok script.
-
-See 'soundkonverter-amarok' package for more informations.
-
-See README.Debian for more informations on supported formats.
-
-
-%package amarok
-Summary: audio converter frontend for Trinity (Amarok script)
-Group: Application/Multimedia
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-amarok
-
-%description amarok
-Amarok script for soundKonverter. It allows you to easily transcode files when
-transferring them to your media device.
-
-See the 'soundkonverter-trinity' package for more information.
-
-
-%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 -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; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_includedir} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt:/usr/include/cdda \
- --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/soundkonverter
-%{tde_bindir}/userscript.sh
-%{tde_tdeappdir}/soundkonverter.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
-%{tde_datadir}/apps/soundkonverter
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/README
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-%{tde_tdedocdir}/HTML/en/soundkonverter/common
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.docbook
-%{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png
-%{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/amr.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop
-%{tde_datadir}/mimelnk/video/x-flv.soundkonverter.desktop
-
-%files amarok
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/soundkonverter/amarokscript/README
-%{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-
-
-%Changelog
-* Sat Dec 03 2011 Francois Andriot <[email protected]> - 0.3.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tde-guidance/guidance-3.5.13.1.spec b/redhat/applications/tde-guidance/guidance-3.5.13.1.spec
deleted file mode 100644
index 3ca00a641..000000000
--- a/redhat/applications/tde-guidance/guidance-3.5.13.1.spec
+++ /dev/null
@@ -1,414 +0,0 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-# 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}
-
-%define __arch_install_post %{nil}
-
-Name: trinity-guidance
-Summary: A collection of system administration tools for Trinity
-Version: 0.8.0svn20080103
-Release: 4%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <[email protected]>
-URL: http://www.simonzone.com/software/guidance
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: kde-guidance-3.5.13.1.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires: trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-
-BuildRequires: trinity-pytdeextensions
-BuildRequires: trinity-libpythonize0-devel
-BuildRequires: python-trinity
-BuildRequires: chrpath
-BuildRequires: gcc-c++
-
-# SIP support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: python-sip
-%endif
-%if 0%{?suse_version}
-BuildRequires: python-sip-devel
-%endif
-%if 0%{?rhel} == 5
-BuildRequires: trinity-sip-devel
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires: sip-devel
-%endif
-
-# PYTHON-QT support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: python-qt
-Requires: python-qt
-%endif
-%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires: trinity-PyQt-devel
-Requires: trinity-PyQt
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires: PyQt-devel
-Requires: PyQt
-%endif
-
-
-Requires: python-trinity
-Requires: trinity-pytdeextensions
-Requires: %{name}-backends
-Requires: python
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires: hwdata
-%endif
-
-
-%if "%{tde_prefix}" == "/usr"
-Conflicts: guidance-power-manager
-Conflicts: kde-guidance-powermanager
-%endif
-
-%description
-Guidance currently consists of four programs designed to help you
-look after your system:
- o userconfig - User and Group administration
- o serviceconfig - Service/daemon administration
- o mountconfig - Disk and filesystem administration
- o wineconfig - Wine configuration
-
-These tools are available in Trinity Control Center, System Settings
-or can be run as standalone applications.
-
-
-
-%package backends
-Group: Applications/Utilities
-Summary: collection of system administration tools for GNU/Linux [Trinity]
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires: hwdata
-%endif
-Requires: python
-
-%description backends
-This package contains the platform neutral backends used in the
-Guidance configuration tools.
-
-
-%package powermanager
-Group: Applications/Utilities
-Summary: HAL based power manager applet [Trinity]
-Requires: %{name} = %{version}-%{release}
-
-%description powermanager
-A power management applet to indicate battery levels and perform hibernate or
-suspend using HAL.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n kde-guidance-3.5.13.1
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-export KDEDIR=%{tde_prefix}
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-./setup.py build
-
-
-%install
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-%__rm -rf %{buildroot}
-./setup.py install \
- --prefix=%{tde_prefix} \
- --root=%{buildroot}
-
-# Fix building directories stored inside .py files
-for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do
- %__sed -i "${f}" -e "s|%{buildroot}||g"
-done
-
-##### MAIN PACKAGE INSTALLATION
-# install icons to right place
-%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
-%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
-
-# fix binary-or-shlib-defines-rpath
-chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so
-
-# fix executable-not-elf-or-script
-%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png
-
-# move python modules in %{python_sitearch}
-%__mkdir_p %{buildroot}%{python_sitearch}/%{name}
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py %{buildroot}%{python_sitearch}/%{name}
-
-# fix the link properly
-%__rm -f %{buildroot}%{tde_bindir}/*
-#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig
-%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
-%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
-%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
-%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
-%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
-
-# (obsolete) put this here since gnome people probably don't want it by default
-#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore
-
-# fix script-not-executable
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
-
-%__mv -f %{buildroot}%{tde_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{tde_datadir}/applications/kde/guidance-displayconfig.desktop
-
-##### BACKENDS INSTALLATION
-# install displayconfig-hwprobe.py script
-%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
- %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py
-
-# The xf86misc stuff should not go under /opt/trinity bur under /usr !!!
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%endif
-
-
-##### POWERMANAGER INSTALLATION
-# install icon to right place
-%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
- %{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%__install -D -p -m0644 kde/powermanager/pics/*.png \
- %{buildroot}%{tde_datadir}/apps/guidance/pics/
-
-# install desktop file
-%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
- %{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-# copy python modules in PYSUPPORT_PATH
-%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name}
-
-# generate guidance-power-manager script
-cat <<EOF >%{buildroot}%{tde_bindir}/guidance-power-manager
-#!/bin/sh
-export PYTHONPATH=%{python_sitearch}/%{name}
-%{python_sitearch}/%{name}/guidance-power-manager.py &
-EOF
-chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
-
-# fix script-not-executable
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
-
-
-# Replace all '#!' calls to python with /usr/bin/python
-# and make them executable
-for i in `find %{buildroot} -type f`; do
- sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
- $i > $i.temp;
- if cmp --quiet $i $i.temp; then
- rm -f $i.temp;
- else
- mv -f $i.temp $i;
- chmod 755 $i;
- echo "fixed interpreter: $i";
- fi;
-done
-
-# Removes useless files
-find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
-find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
-
-# Removes obsolete display config manager
-%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore
-%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.*
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%post powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-#%{tde_bindir}/displayconfig
-#%{tde_bindir}/displayconfig-restore
-%{tde_bindir}/grubconfig
-%{tde_bindir}/mountconfig
-%{tde_bindir}/serviceconfig
-%{tde_bindir}/userconfig
-%{tde_bindir}/wineconfig
-%attr(0644,root,root) %{tde_tdelibdir}/*.so
-%attr(0644,root,root) %{tde_tdelibdir}/*.la
-%{tde_datadir}/apps/guidance/
-%{tde_datadir}/applications/kde/*.desktop
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/*/*.svg
-%{python_sitearch}/%{name}/SMBShareSelectDialog.py*
-%{python_sitearch}/%{name}/SimpleCommandRunner.py*
-%{python_sitearch}/%{name}/fuser.py*
-%{python_sitearch}/%{name}/fuser_ui.py*
-%{python_sitearch}/%{name}/grubconfig.py*
-%{python_sitearch}/%{name}/ktimerdialog.py*
-%{python_sitearch}/%{name}/mountconfig.py*
-%{python_sitearch}/%{name}/servertestdialog.py*
-%{python_sitearch}/%{name}/serviceconfig.py*
-%{python_sitearch}/%{name}/sizeview.py*
-%{python_sitearch}/%{name}/unixauthdb.py*
-%{python_sitearch}/%{name}/userconfig.py*
-%{python_sitearch}/%{name}/wineconfig.py*
-%{tde_tdedocdir}/HTML/en/guidance/
-
-# Files from backends
-%exclude %{tde_datadir}/apps/guidance/vesamodes
-%exclude %{tde_datadir}/apps/guidance/extramodes
-%exclude %{tde_datadir}/apps/guidance/widescreenmodes
-%exclude %{tde_datadir}/apps/guidance/Cards+
-%exclude %{tde_datadir}/apps/guidance/pcitable
-%exclude %{tde_datadir}/apps/guidance/MonitorsDB
-
-# Files from powermanager
-%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
-%exclude %{tde_datadir}/apps/guidance/pics/processor.png
-
-%files -n trinity-guidance-backends
-%defattr(-,root,root,-)
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/ScanPCI.py*
-%{python_sitearch}/%{name}/infimport.py*
-%{python_sitearch}/%{name}/displayconfigabstraction.py*
-%{python_sitearch}/%{name}/displayconfig-hwprobe.py*
-%{python_sitearch}/%{name}/displayconfig-restore.py*
-%{python_sitearch}/%{name}/drivedetect.py*
-%{python_sitearch}/%{name}/execwithcapture.py*
-%{python_sitearch}/%{name}/wineread.py*
-%{python_sitearch}/%{name}/winewrite.py*
-%{python_sitearch}/%{name}/xf86misc.py*
-%{python_sitearch}/%{name}/xorgconfig.py*
-%{python_sitearch}/ixf86misc.so
-%{tde_datadir}/apps/guidance/vesamodes
-%{tde_datadir}/apps/guidance/extramodes
-%{tde_datadir}/apps/guidance/widescreenmodes
-%{tde_datadir}/apps/guidance/Cards+
-%{tde_datadir}/apps/guidance/pcitable
-%{tde_datadir}/apps/guidance/MonitorsDB
-
-
-
-%files powermanager
-%defattr(-,root,root,-)
-%{tde_bindir}/guidance-power-manager
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/guidance-power-manager.py*
-%{python_sitearch}/%{name}/powermanage.py*
-%{python_sitearch}/%{name}/gpmhelper.py*
-%{python_sitearch}/%{name}/powermanager_ui.py*
-%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
-%{python_sitearch}/%{name}/notify.py*
-%{python_sitearch}/%{name}/tooltip.py*
-%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%{tde_datadir}/apps/guidance/pics/battery*.png
-%{tde_datadir}/apps/guidance/pics/processor.png
-%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <[email protected]> - 0.8.0svn20080103-4
-- Initial release for TDE 3.5.13.1
-
-* Fri May 11 2012 Francois Andriot <[email protected]> - 0.8.0svn20080103-3
-- Fix Python search dir
-
-* Tue May 01 2012 Francois Andriot <[email protected]> - 0.8.0svn20080103-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix library locations
-
-* Thu Dec 01 2011 Francois Andriot <[email protected]> - 0.8.0svn20080103-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-guidance/guidance-3.5.13.spec b/redhat/applications/tde-guidance/guidance-3.5.13.spec
deleted file mode 100644
index 3c7bcb7fe..000000000
--- a/redhat/applications/tde-guidance/guidance-3.5.13.spec
+++ /dev/null
@@ -1,390 +0,0 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-# 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}
-
-%define __arch_install_post %{nil}
-
-Name: trinity-guidance
-Summary: A collection of system administration tools for Trinity
-Version: 0.8.0svn20080103
-Release: 3%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <[email protected]>
-URL: http://www.simonzone.com/software/guidance
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: kde-guidance-3.5.13.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-
-BuildRequires: trinity-pykdeextensions
-BuildRequires: trinity-libpythonize0-devel
-BuildRequires: python-trinity
-BuildRequires: chrpath
-BuildRequires: gcc-c++
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: python-sip
-BuildRequires: python-qt
-Requires: python-qt
-%else
-%if 0%{?rhel} == 5
-BuildRequires: trinity-PyQt-devel
-BuildRequires: trinity-sip-devel
-Requires: trinity-PyQt
-%else
-BuildRequires: PyQt-devel
-BuildRequires: sip-devel
-Requires: PyQt
-%endif
-%endif
-
-
-Requires: python-trinity
-Requires: %{name}-backends
-Requires: hwdata
-Requires: python
-
-%if "%{tde_prefix}" == "/usr"
-Conflicts: guidance-power-manager
-Conflicts: kde-guidance-powermanager
-%endif
-
-%description
-Guidance currently consists of four programs designed to help you
-look after your system:
- o userconfig - User and Group administration
- o serviceconfig - Service/daemon administration
- o mountconfig - Disk and filesystem administration
- o wineconfig - Wine configuration
-
-These tools are available in Trinity Control Center, System Settings
-or can be run as standalone applications.
-
-
-
-%package backends
-Group: Applications/Utilities
-Summary: collection of system administration tools for GNU/Linux [Trinity]
-Requires: hwdata
-Requires: python
-
-%description backends
-This package contains the platform neutral backends used in the
-Guidance configuration tools.
-
-
-%package powermanager
-Group: Applications/Utilities
-Summary: HAL based power manager applet [Trinity]
-Requires: %{name} = %{version}-%{release}
-
-%description powermanager
-A power management applet to indicate battery levels and perform hibernate or
-suspend using HAL.
-
-
-%prep
-%setup -q -n applications/kde-guidance
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-export KDEDIR=%{tde_prefix}
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-./setup.py build
-
-
-%install
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-%__rm -rf %{buildroot}
-./setup.py install \
- --prefix=%{tde_prefix} \
- --root=%{buildroot}
-
-# Fix building directories stored inside .py files
-for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do
- %__sed -i "${f}" -e "s|%{buildroot}||g"
-done
-
-##### MAIN PACKAGE INSTALLATION
-# install icons to right place
-%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
-%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
-
-# fix binary-or-shlib-defines-rpath
-chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so
-
-# fix executable-not-elf-or-script
-%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png
-
-# move python modules in %{python_sitearch}
-%__mkdir_p %{buildroot}%{python_sitearch}/%{name}
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py %{buildroot}%{python_sitearch}/%{name}
-
-# fix the link properly
-%__rm -f %{buildroot}%{tde_bindir}/*
-#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig
-%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
-%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
-%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
-%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
-%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
-
-# (obsolete) put this here since gnome people probably don't want it by default
-#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore
-
-# fix script-not-executable
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
-
-%__mv -f %{buildroot}%{tde_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{tde_datadir}/applications/kde/guidance-displayconfig.desktop
-
-##### BACKENDS INSTALLATION
-# install displayconfig-hwprobe.py script
-%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
- %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py
-
-# The xf86misc stuff should not go under /opt/trinity bur under /usr !!!
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
-
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-
-
-
-##### POWERMANAGER INSTALLATION
-# install icon to right place
-%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
- %{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%__install -D -p -m0644 kde/powermanager/pics/*.png \
- %{buildroot}%{tde_datadir}/apps/guidance/pics/
-
-# install desktop file
-%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
- %{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-# copy python modules in PYSUPPORT_PATH
-%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name}
-
-# generate guidance-power-manager script
-cat <<EOF >%{buildroot}%{tde_bindir}/guidance-power-manager
-#!/bin/sh
-export PYTHONPATH=%{python_sitearch}/%{name}
-%{python_sitearch}/%{name}/guidance-power-manager.py &
-EOF
-chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
-
-# fix script-not-executable
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
-
-
-# Replace all '#!' calls to python with /usr/bin/python
-# and make them executable
-for i in `find %{buildroot} -type f`; do
- sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
- $i > $i.temp;
- if cmp --quiet $i $i.temp; then
- rm -f $i.temp;
- else
- mv -f $i.temp $i;
- chmod 755 $i;
- echo "fixed interpreter: $i";
- fi;
-done
-
-# Removes useless files
-find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
-#find %{buildroot}%{_libdir} -name "*.a" -exec rm -f {} \;
-
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/*.pyc
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/*.pyo
-
-# Removes obsolete display config manager
-%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore
-%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.*
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%post powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-#%{tde_bindir}/displayconfig
-#%{tde_bindir}/displayconfig-restore
-%{tde_bindir}/grubconfig
-%{tde_bindir}/mountconfig
-%{tde_bindir}/serviceconfig
-%{tde_bindir}/userconfig
-%{tde_bindir}/wineconfig
-%attr(0644,root,root) %{tde_tdelibdir}/*.so
-%attr(0644,root,root) %{tde_tdelibdir}/*.la
-%{tde_datadir}/apps/guidance/
-%{tde_datadir}/applications/kde/*.desktop
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/*/*.svg
-%{python_sitearch}/%{name}/SMBShareSelectDialog.py
-%{python_sitearch}/%{name}/SimpleCommandRunner.py
-%{python_sitearch}/%{name}/fuser.py
-%{python_sitearch}/%{name}/fuser_ui.py
-%{python_sitearch}/%{name}/grubconfig.py
-%{python_sitearch}/%{name}/ktimerdialog.py
-%{python_sitearch}/%{name}/mountconfig.py
-%{python_sitearch}/%{name}/servertestdialog.py
-%{python_sitearch}/%{name}/serviceconfig.py
-%{python_sitearch}/%{name}/sizeview.py
-%{python_sitearch}/%{name}/unixauthdb.py
-%{python_sitearch}/%{name}/userconfig.py
-%{python_sitearch}/%{name}/wineconfig.py
-%{tde_tdedocdir}/HTML/en/guidance/
-
-# Files from backends
-%exclude %{tde_datadir}/apps/guidance/vesamodes
-%exclude %{tde_datadir}/apps/guidance/extramodes
-%exclude %{tde_datadir}/apps/guidance/widescreenmodes
-%exclude %{tde_datadir}/apps/guidance/Cards+
-%exclude %{tde_datadir}/apps/guidance/pcitable
-%exclude %{tde_datadir}/apps/guidance/MonitorsDB
-
-# Files from powermanager
-%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
-%exclude %{tde_datadir}/apps/guidance/pics/processor.png
-
-%files -n trinity-guidance-backends
-%defattr(-,root,root,-)
-%{python_sitearch}/%{name}/MicroHAL.py
-%{python_sitearch}/%{name}/ScanPCI.py
-%{python_sitearch}/%{name}/infimport.py
-%{python_sitearch}/%{name}/displayconfigabstraction.py
-%{python_sitearch}/%{name}/displayconfig-hwprobe.py
-%{python_sitearch}/%{name}/displayconfig-restore.py
-%{python_sitearch}/%{name}/drivedetect.py
-%{python_sitearch}/%{name}/execwithcapture.py
-%{python_sitearch}/%{name}/wineread.py
-%{python_sitearch}/%{name}/winewrite.py
-%{python_sitearch}/%{name}/xf86misc.py
-%{python_sitearch}/%{name}/xorgconfig.py
-%{python_sitearch}/ixf86misc.so
-%{tde_datadir}/apps/guidance/vesamodes
-%{tde_datadir}/apps/guidance/extramodes
-%{tde_datadir}/apps/guidance/widescreenmodes
-%{tde_datadir}/apps/guidance/Cards+
-%{tde_datadir}/apps/guidance/pcitable
-%{tde_datadir}/apps/guidance/MonitorsDB
-
-
-
-%files powermanager
-%defattr(-,root,root,-)
-%{tde_bindir}/guidance-power-manager
-%{python_sitearch}/%{name}/MicroHAL.py
-%{python_sitearch}/%{name}/guidance-power-manager.py
-%{python_sitearch}/%{name}/powermanage.py
-%{python_sitearch}/%{name}/gpmhelper.py
-%{python_sitearch}/%{name}/powermanager_ui.py
-%{python_sitearch}/%{name}/guidance_power_manager_ui.py
-%{python_sitearch}/%{name}/notify.py
-%{python_sitearch}/%{name}/tooltip.py
-%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%{tde_datadir}/apps/guidance/pics/battery*.png
-%{tde_datadir}/apps/guidance/pics/processor.png
-%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-
-
-%Changelog
-* Fri May 11 2012 Francois Andriot <[email protected]> - 0.8.0svn20080103-3
-- Fix Python search dir
-
-* Tue May 01 2012 Francois Andriot <[email protected]> - 0.8.0svn20080103-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix library locations
-
-* Thu Dec 01 2011 Francois Andriot <[email protected]> - 0.8.0svn20080103-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch b/redhat/applications/tde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch
deleted file mode 100644
index 9bb5fa5b4..000000000
--- a/redhat/applications/tde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- kde-guidance/wineconfig/winewrite.py.wine 2010-08-12 05:25:24.000000000 +0200
-+++ kde-guidance/wineconfig/winewrite.py 2012-08-07 18:43:48.291577133 +0200
-@@ -60,14 +60,14 @@
- SetShellLinks(drives[26:])
-
- def SetShellLinks(shelllinks):
-- existingshelllinks = os.listdir(wineread.winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER'])
-+ existingshelllinks = os.listdir(wineread.winepath + "/dosdevices/c:/users/" + os.environ['USER'])
- set(existingshelllinks)
- shellregistry = wineread.GetShellRegistry()
-
- for link in shelllinks:
- createLink = False
- if link[1] in existingshelllinks: # The link exists
-- linkpath = wineread.winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER'] + "/" + link[1]
-+ linkpath = wineread.winepath + "/dosdevices/c:/users/" + os.environ['USER'] + "/" + link[1]
- if link[2]: # The folder is mapped
- # Compare for changes
- changed = False
-@@ -98,7 +98,7 @@
- continue
-
- if createLink:
-- os.symlink(link[2], wineread.winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER'] + "/" + link[1])
-+ os.symlink(link[2], wineread.winepath + "/dosdevices/c:/windows/users/" + os.environ['USER'] + "/" + link[1])
- if shellregistry.has_key(link[1]):
- SetShellRegistry(link)
-
-@@ -426,7 +426,7 @@
- if not path:
- path = wineread.default_winepath
-
-- os.system("WINEPREFIX=" + path + " wineprefixcreate --wait")
-+ os.system("WINEPREFIX=" + path + " wineboot")
-
- # ----- Theming -----
-
-@@ -486,4 +486,4 @@
- winport = ports_translation[port.rstrip("012345678")] +\
- str(int(port.lstrip("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")) + 1)
- os.symlink("/dev/" + port, wineread.winepath + "/dosdevices/" + winport)
--
-\ Pas de fin de ligne à la fin du fichier
-+
---- kde-guidance/wineconfig/wineread.py.ORI 2012-08-07 18:44:08.910051574 +0200
-+++ kde-guidance/wineconfig/wineread.py 2012-08-07 18:44:38.675294351 +0200
-@@ -23,7 +23,7 @@
- # Assumes the fake windows is installed in ~/.wine
- default_winepath = os.environ['HOME'] + "/.wine"
- winepath = default_winepath
--defaultwinfolderspath = "c:\\windows\\profiles\\" + os.environ['USER']
-+defaultwinfolderspath = "c:\\users\\" + os.environ['USER']
-
- # Where the dll's are
- default_winebuildpath = "/usr/lib/wine"
-@@ -113,7 +113,7 @@
- [30,"My Video","","","",""])
-
- folder_nonexistent = "This folder does not exist, please map it."
--profilesdirectory = winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER']
-+profilesdirectory = winepath + "/dosdevices/c:/users/" + os.environ['USER']
-
- def GetEmptyShellLinks():
- """ Returns a list of important windows folders """
-@@ -537,7 +537,7 @@
- if not path:
- path = self.default_winepath
-
-- return os.path.exists(path + "/dosdevices/c:/windows/profiles/" + os.environ['USER']) and \
-+ return os.path.exists(path + "/dosdevices/c:/users/" + os.environ['USER']) and \
- os.path.exists(path + "/dosdevices/c:/windows/system32") and \
- os.path.exists(path + "/system.reg") and os.path.exists(path + "/userdef.reg") and \
- os.path.exists(path + "/user.reg")
diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
index 8193e5b10..f57c335a8 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -1,53 +1,62 @@
-# Default version for this component
-%define tde_pkg tde-guidance
+#
+# spec file for package tde-guidance (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
-
-# REMOVE KDELIBS4-DEVEL before building !!!!
-
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-# 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 tde-guidance
+%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}
-
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define __arch_install_post %{nil}
-Name: trinity-%{tde_pkg}
-Summary: A collection of system administration tools for Trinity
-Version: 0.8.0svn20080103
-Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.8.0svn20080103
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: A collection of system administration tools for Trinity
+Group: Applications/Utilities
+URL: http://www.simonzone.com/software/guidance
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Vendor: Trinity Project
-Packager: Francois Andriot <[email protected]>
-URL: http://www.simonzone.com/software/guidance
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <[email protected]>
-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
@@ -56,7 +65,21 @@ BuildRequires: trinity-pytdeextensions
BuildRequires: trinity-libpythonize0-devel
BuildRequires: trinity-python-trinity
BuildRequires: chrpath
+
+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
# SIP support
BuildRequires: sip4-tqt-devel >= 4.10.5
@@ -67,6 +90,53 @@ BuildRequires: python-tqt-devel
BuildRequires: trinity-python-trinity-devel
BuildRequires: trinity-pytqt-tools
+# LIBXXF86VM support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xxf86vm-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires: libXxf86vm-devel
+%endif
+
+# XSCREENSAVER support
+# RHEL 4: disabled
+# RHEL 6: available in EPEL
+# RHEL 7: available in NUX
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?suse_version} || 0%{?with_xscreensaver}
+%define with_xscreensaver 1
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires: libXScrnSaver-devel
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-base
+BuildRequires: xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires: xscreensaver-extras-base
+%endif
+BuildRequires: xscreensaver-gl-base
+BuildRequires: xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
+BuildRequires: libXScrnSaver-devel
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-data
+BuildRequires: xscreensaver-data-extra
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xscrnsaver-devel
+%else
+BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
+%endif
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-base
+BuildRequires: xscreensaver-extrusion
+BuildRequires: xscreensaver-gl
+%endif
+%endif
+
Requires: python-tqt
Requires: trinity-python-trinity
Requires: trinity-pytdeextensions
@@ -160,6 +230,7 @@ Guidance configuration tools.
%files backends
%defattr(-,root,root,-)
+%dir %{python_sitearch}/%{name}
%{python_sitearch}/%{name}/MicroHAL.py*
%{python_sitearch}/%{name}/drivedetect.py*
%{python_sitearch}/%{name}/wineread.py*
@@ -218,7 +289,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -387,5 +458,5 @@ find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
%changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 0.8.0svn20080103-8
+* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:0.8.0svn20080103-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
index 4759dabe3..0154c60ef 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
+++ b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
@@ -1,52 +1,78 @@
-# Default version for this component
-%define tde_pkg tdeio-apt
+#
+# spec file for package tdeio-apt (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-apt
+%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: An apt-cache ioslave for Trinity
-Version: 0.13.2
-Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.13.2
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: An apt-cache ioslave for Trinity
+Group: Applications/Utilities
+URL: http://lpnotfr.free.fr/
-License: GPLv2+
-Group: Applications/Utilities
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Vendor: Trinity Project
-Packager: Francois Andriot <[email protected]>
-URL: http://lpnotfr.free.fr/
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <[email protected]>
-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: 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
tdeio-apt is an ioslave which provides the apt:/ protocol. It
@@ -58,10 +84,13 @@ browsing the packages easier. It provides:
- apt-cache policy: apt:/policy?package
-%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}}
@@ -112,8 +141,7 @@ export PATH="%{tde_bindir}:${PATH}"
%doc AUTHORS CHANGELOG ChangeLog COPYING
%{tde_tdelibdir}/tdeio_apt.la
%{tde_tdelibdir}/tdeio_apt.so
-%{tde_datadir}/apps/tdeio_apt/kdedeb_logo.png
-%{tde_datadir}/apps/tdeio_apt/tdeio_apt.css
+%{tde_datadir}/apps/tdeio_apt/
%{tde_datadir}/services/apt+http.protocol
%{tde_datadir}/services/apt.protocol
%{tde_datadir}/services/searchproviders/apt-file.desktop
@@ -122,5 +150,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 0.13.2-3
+* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:0.13.2-1
- Initial release for TDE 14.0.0