RHEL/Fedora/MGA/MDV/Suse: update extras for TDE 3.5.13.1

pull/3/head
Francois Andriot 12 years ago
parent 7834467b40
commit 59daf455b4

@ -5,7 +5,7 @@
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[01]*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;

@ -0,0 +1,270 @@
# 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_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Summary: Audio-decoding framework
Name: trinity-akode
Version: 2.0.2
Release: 3%{?dist}%{?_variant}
License: LGPLv2+
Group: System Environment/Libraries
#URL: http://carewolf.com/akode/
URL: http://www.kde-apps.org/content/show.php?content=30375
Source0: http://www.kde-apps.org/CONTENT/content-files/akode-%{version}.tar.bz2
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Legacy Fedora 9 patches
Patch1: akode-pulseaudio.patch
Patch2: akode-2.0.2-multilib.patch
Patch3: akode-2.0.2-flac113-portable.patch
Patch4: akode-2.0.2-gcc43.patch
# New patch for Fedora 16 / TDE 3.5.13
Patch10: akode-autotools.patch
Patch11: akode-2.0.2-fix_ffmpeg_include.patch
# Optional features that are always enabled :-)
%define _with_flac --with-flac
# Except on RHEL4 ...
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define _with_jack --with-jack
%define _with_libsamplerate --with-libsamplerate
%endif
# Pulseaudio is not available on RHEL 5 and earlier
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define _with_pulseaudio --with-pulseaudio
%endif
BuildRequires: automake libtool
BuildRequires: alsa-lib-devel
%{?_with_libsamplerate:BuildRequires: libsamplerate-devel}
BuildRequires: libvorbis-devel
BuildRequires: speex-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
%{?_with_jack:BuildRequires: %{_lib}jack-devel}
%{?_with_flac:BuildRequires: %{_lib}flac-devel}
%{?_with_pulseaudio:BuildRequires: %{_lib}pulseaudio-devel}
%endif
%if 0%{?rhel} || 0%{?fedora}
%{?_with_flac:BuildRequires: flac-devel}
%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel}
%endif
%if 0%{?suse_version}
%{?_with_flac:BuildRequires: flac-devel}
%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
%{?_with_pulseaudio:BuildRequires: pulseaudio-devel}
%endif
%description
aKode is a simple audio-decoding frame-work that provides a uniform
interface to decode the most common audio-formats. It also has a direct
playback option for a number of audio-outputs.
aKode currently has the following decoder plugins:
* mpc: Decodes musepack aka mpc audio.
* xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio.
aKode also has the following audio outputs:
* alsa: Outputs to ALSA (dmix is recommended).
%package devel
Summary: Headers for developing programs that will use %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
%{summary}.
%package jack
Summary: Jack audio output backend for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description jack
%{summary}.
%package pulseaudio
Summary: Pulseaudio output backend for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description pulseaudio
%{summary}.
Recommended for network transparent audio.
# Packaged separately to keep main/core %{akode} package LGPL-clean.
%package libsamplerate
Summary: Resampler based on libsamplerate for %{name}
Group: Development/Libraries
License: GPLv2+
Requires: %{name} = %{version}-%{release}
%description libsamplerate
%{summary}.
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup -q -n akode-%{version}
%patch1 -p1 -b .pulseaudio
%patch2 -p1 -b .multilib
%patch3 -p4 -b .flac113_portable
%patch4 -p1 -b .gcc43
%patch10 -p1
%patch11 -p1 -b .ffmpeg
# 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 cvs
%build
%configure \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_includedir} \
--datadir=%{tde_datadir} \
--disable-static \
--enable-shared \
--disable-debug --disable-warnings --disable-dependency-tracking \
--without-libltdl \
--with-alsa \
--with-oss \
%{?_with_flac} %{!?_with_flac:--without-flac} \
%{?_with_jack} %{!?_with_jack:--without-jack} \
%{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \
%{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \
--with-speex \
--with-vorbis \
--without-ffmpeg \
--without-libmad \
--enable-closure \
--enable-new-ldflags \
--enable-final
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
%install
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
# unpackaged files
%__rm -f %{buildroot}%{tde_libdir}/*.a
# rpmdocs
for file in AUTHORS COPYING NEWS README TODO ; do
test -s "$file" && install -p -m644 -D "$file" "rpmdocs/$file"
done
%clean
%__rm -rf %{buildroot}
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
%post devel
/sbin/ldconfig
%postun devel
/sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc rpmdocs/*
%{tde_bindir}/akodeplay
%{tde_libdir}/libakode.so.*
%{tde_libdir}/libakode_alsa_sink.la
%{tde_libdir}/libakode_alsa_sink.so
%{tde_libdir}/libakode_mpc_decoder.la
%{tde_libdir}/libakode_mpc_decoder.so
%{tde_libdir}/libakode_oss_sink.la
%{tde_libdir}/libakode_oss_sink.so
%{tde_libdir}/libakode_xiph_decoder.la
%{tde_libdir}/libakode_xiph_decoder.so
#files -libmad
# /opt/trinity/lib64/libakode_mpeg_decoder.la
# /opt/trinity/lib64/libakode_mpeg_decoder.so
%files devel
%defattr(-,root,root,-)
%{tde_bindir}/akode-config
%{tde_includedir}/*
%{tde_libdir}/libakode.la
%{tde_libdir}/libakode.so
%{tde_libdir}/pkgconfig/*.pc
%if "%{?_with_jack}" != ""
%files jack
%defattr(-,root,root,-)
%{tde_libdir}/libakode_jack_sink.la
%{tde_libdir}/libakode_jack_sink.so
%endif
# License: GPLv2+
%if "%{?_with_libsamplerate:1}" == "1"
%files libsamplerate
%defattr(-,root,root,-)
%{tde_libdir}/libakode_src_resampler.la
%{tde_libdir}/libakode_src_resampler.so
%endif
%if "%{?_with_pulseaudio:1}" == "1"
%files pulseaudio
%defattr(-,root,root,-)
%{tde_libdir}/libakode_polyp_sink.la
%{tde_libdir}/libakode_polyp_sink.so
%endif
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
- Initial build for TDE 3.5.13.1
* Tue Jul 30 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-2
- Re-adds '.la' files
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-1
- Port to TDE 3.5.13
- Based on spec file from Fedora 9 'akode-2.0.2-5'

@ -12,8 +12,8 @@
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}

@ -1,11 +0,0 @@
--- k3b-i18n-1.0.5/admin/cvs.sh.ORI 2012-05-09 19:45:56.106421990 +0200
+++ k3b-i18n-1.0.5/admin/cvs.sh 2012-05-09 19:46:16.264708192 +0200
@@ -68,7 +68,7 @@
echo "*** KDE requires automake $required_automake_version"
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;

@ -1,308 +0,0 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
%define _docdir %{_datadir}/doc
%endif
# TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/trinity
Name: trinity-k3b-i18n
Summary: Locale files for K3B
Version: 1.0.5
Release: 1%{?dist}%{?_variant}
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
BuildArch: noarch
# Speed build options
%define debug_package %{nil}
%define __spec_install_post %{nil}
AutoReq: no
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Group: Applications/Archiving
License: GPLv2+
Source0: k3b-i18n-1.0.5.tar.bz2
# [kde-i18n] Fix automake detection
Patch1: k3b-i18n-trinity.patch
BuildRequires: trinity-kdelibs-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
Requires(post): coreutils
Requires(postun): coreutils
Requires: trinity-k3b
%description
K3b provides a comfortable user interface to perform most CD/DVD
burning tasks. While the experienced user can take influence in all
steps of the burning process the beginner may find comfort in the
automatic settings and the reasonable k3b defaults which allow a quick
start.
%package da
Group: Applications/Archiving
Requires: trinity-k3b
Summary: Danish (da) translations for K3B [Trinity]
%description da
This package contains the Danish translations for K3B.
%package de
Group: Applications/Archiving
Requires: trinity-k3b
Summary: German (de) translations for K3B [Trinity]
%description de
This package contains the German translations for K3B.
%package el
Group: Applications/Archiving
Requires: trinity-k3b >= %{version}
Summary: Greek (el) translations for K3B [Trinity]
%description el
This package contains the greek translations for K3B.
%package es
Group: Applications/Archiving
Requires: trinity-k3b
Summary: Spanish (es) translations for K3B [Trinity]
%description es
This package contains the Spanish translations for K3B.
%package et
Group: Applications/Archiving
Requires: trinity-k3b
Summary: Estonian (et) translations for K3B [Trinity]
%description et
This package contains the Estonian translations for K3B.
%package fr
Group: Applications/Archiving
Requires: trinity-k3b
Summary: French (fr) translations for K3B [Trinity]
%description fr
This package contains the French translations for K3B.
%package it
Group: Applications/Archiving
Requires: trinity-k3b
Summary: Italian (it) translations for K3B [Trinity]
%description it
This package contains the Italian translations for K3B.
%package nl
Group: Applications/Archiving
Requires: trinity-k3b
Summary: Dutch (nl) translations for K3B [Trinity]
%description nl
This package contains the Dutch translations for K3B.
%package pl
Group: Applications/Archiving
Requires: trinity-k3b
Summary: Polish (pl) translations for K3B [Trinity]
%description pl
This package contains the Polish translations for K3B.
%package pt
Group: Applications/Archiving
Requires: trinity-k3b
Summary: Portuguese (pt) translations for K3B [Trinity]
%description pt
This package contains the Portuguese translations for K3B.
%package ptbr
Group: Applications/Archiving
Requires: trinity-k3b
Summary: Brazilian Portuguese (pt_BR) translations for K3B [Trinity]
%description ptbr
This package contains the Brazilian Portuguese translations for K3B.
%package ru
Group: Applications/Archiving
Requires: trinity-k3b
Summary: Russian (ru) translations for K3B [Trinity]
%description ru
This package contains the Russian translations for K3B.
%package sv
Group: Applications/Archiving
Requires: trinity-k3b
Summary: Swedish (sv) translations for K3B [Trinity]
%description sv
This package contains the Swedish translations for K3B.
%package uk
Group: Applications/Archiving
Requires: trinity-k3b
Summary: Ukrainian (uk) translations for K3B [Trinity]
%description uk
This package contains the Ukrainian translations for K3B.
%prep
%setup -q -n k3b-i18n-%{version}
# set in k3brc too
%patch1 -p1 -b .automake
# 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|/opt/kde3|%{_prefix}|g" \
-e "s|kde3/plugins|trinity/plugins|g" \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/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="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%configure \
--target=%{_host}
%__make %{?_smp_mflags}
%install
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%clean
%__rm -rf %{buildroot}
%files da
%defattr(-,root,root,-)
%lang(da) %{tde_docdir}/HTML/da/k3b
%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*.mo
%files de
%defattr(-,root,root,-)
%lang(de) %{tde_docdir}/HTML/de/k3b
%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*.mo
%files el
%defattr(-,root,root,-)
#%lang(el) %{tde_docdir}/HTML/el/k3b
%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*.mo
%files es
%defattr(-,root,root,-)
%lang(es) %{tde_docdir}/HTML/es/k3b
%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*.mo
%files et
%defattr(-,root,root,-)
%lang(et) %{tde_docdir}/HTML/et/k3b
%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*.mo
%files fr
%defattr(-,root,root,-)
%lang(fr) %{tde_docdir}/HTML/fr/k3b
%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*.mo
%files it
%defattr(-,root,root,-)
%lang(it) %{tde_docdir}/HTML/it/k3b
%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*.mo
%files nl
%defattr(-,root,root,-)
%lang(nl) %{tde_docdir}/HTML/nl/k3b
%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*.mo
%files pl
%defattr(-,root,root,-)
%lang(pl) %{tde_docdir}/HTML/pl/k3b
%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*.mo
%files pt
%defattr(-,root,root,-)
%lang(pt) %{tde_docdir}/HTML/pt/k3b
%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*.mo
%files ptbr
%defattr(-,root,root,-)
%lang(pt_BR) %{tde_docdir}/HTML/pt_BR/k3b
%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*.mo
%files ru
%defattr(-,root,root,-)
%lang(ru) %{tde_docdir}/HTML/ru/k3b
%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*.mo
%files sv
%defattr(-,root,root,-)
%lang(sv) %{tde_docdir}/HTML/sv/k3b
%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*.mo
%files uk
%defattr(-,root,root,-)
%lang(uk) %{tde_docdir}/HTML/uk/k3b
%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*.mo
%exclude %{_datadir}/locale/af
%exclude %{_datadir}/locale/ar
%exclude %{_datadir}/locale/bg
%exclude %{_datadir}/locale/br
%exclude %{_datadir}/locale/bs
%exclude %{_datadir}/locale/ca
%exclude %{_datadir}/locale/cs
%exclude %{_datadir}/locale/cy
%exclude %{_datadir}/locale/en_GB
%exclude %{_datadir}/locale/eu
%exclude %{_datadir}/locale/fa
%exclude %{_datadir}/locale/fi
%exclude %{_datadir}/locale/ga
%exclude %{_datadir}/locale/gl
%exclude %{_datadir}/locale/he
%exclude %{_datadir}/locale/hi
%exclude %{_datadir}/locale/hu
%exclude %{_datadir}/locale/is
%exclude %{_datadir}/locale/ja
%exclude %{_datadir}/locale/ka
%exclude %{_datadir}/locale/km
%exclude %{_datadir}/locale/lt
%exclude %{_datadir}/locale/mk
%exclude %{_datadir}/locale/ms
%exclude %{_datadir}/locale/nb
%exclude %{_datadir}/locale/nds
%exclude %{_datadir}/locale/ne
%exclude %{_datadir}/locale/nn
%exclude %{_datadir}/locale/pa
%exclude %{_datadir}/locale/rw
%exclude %{_datadir}/locale/se
%exclude %{_datadir}/locale/sk
%exclude %{_datadir}/locale/sr
%exclude %{_datadir}/locale/sr@Latn
%exclude %{_datadir}/locale/ta
%exclude %{_datadir}/locale/tr
%exclude %{_datadir}/locale/uz
%exclude %{_datadir}/locale/uz@cyrillic
%exclude %{_datadir}/locale/zh_CN
%exclude %{_datadir}/locale/zh_TW
%changelog
* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
- Initial build for TDE 3.5.13

@ -23,7 +23,7 @@
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* ) : ;;
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* ) : ;;
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.1[012]* ) : ;;
"" )
echo "*** AUTOMAKE NOT FOUND!."
echo "*** KDE requires automake $required_automake_version"

@ -0,0 +1,183 @@
%define kdecomp kasablanca
# 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_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{kdecomp}
Summary: Graphical FTP client
Version: 0.4.0.2
Release: 2%{?dist}%{?_variant}
License: GPLv2+
Url: http://kasablanca.berlios.de/
Source: http://download.berlios.de/kasablanca/kasablanca-%{version}.tar.gz
Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# [kasablanca] Fix bad content in icon (?)
Patch1: kasablanca-0.4.0.2-dt.patch
# [kasablanca] Fix detection of newer autotools
Patch2: kasablanca-0.4.0.2-fix_autotools_detection.patch
# [kasablanca] Missing LDFLAGS cause FTBFS
Patch3: kasablanca-0.4.0.2-missing_ldflags.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
BuildRequires: openssl-devel
%if 0%{?suse_version}
BuildRequires: utempter-devel
%else
BuildRequires: libutempter-devel
%endif
%description
Kasablanca is an ftp client, among its features are currently:
* ftps encryption via AUTH TLS
* fxp (direct server to server transfer), supporting alternative mode.
* advanced bookmarking system.
* fast responsive multithreaded engine.
* concurrent connections to multiple hosts.
* interactive transfer queue, movable by drag and drop.
* small nifty features, like a skiplist.
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup -q -n %{kdecomp}-%{version}
%patch1 -p1 -b .dt
%patch2 -p1
%patch3 -p1 -b .ldflags
# 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}"
export KDEDIR=%{tde_prefix}
## Needed(?) for older/legacy setups, harmless otherwise
if pkg-config openssl ; then
export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
fi
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_tdeincludedir} \
--datadir=%{tde_datadir} \
--with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
--disable-static \
--disable-rpath \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install \
--dir $RPM_BUILD_ROOT%{tde_datadir}/applications/kde \
--vendor="" \
--add-category="Network" \
--add-category="KDE" \
--delete-original \
$RPM_BUILD_ROOT%{tde_datadir}/applnk/*/*.desktop
## File lists
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
# locale's
%find_lang %{kdecomp}
%clean
%__rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &> /dev/null
gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
fi
%posttrans
gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
%files -f %{kdecomp}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{tde_bindir}/kasablanca
%{tde_tdeappdir}/kasablanca.desktop
%{tde_datadir}/apps/kasablanca/
%{tde_datadir}/config.kcfg/kbconfig.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kasablanca.png
%{tde_tdedocdir}/HTML/en/kasablanca/
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-2
- Initial build for TDE 3.5.13.1
* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-1
- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Based on Fedora 12 Spec 'kasablanca-0.4.0.2-17'

@ -0,0 +1,59 @@
#!/usr/bin/python
# -*- coding: UTF-8 -*-
"""
Copyright (C) 2007 Achim Bohnet <allee@kubuntu.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
"""
import sys
from PyQt4 import QtCore, Qt
import dbus
import dbus.mainloop.qt
import distutils.spawn
kbtcmd = [ 'kbluetooth' ]
quitprogs = [ 'kdebluetooth', 'kbluemon', 'kinputwizard' ] # FIXME: quit kbluelock too?
app = Qt.QCoreApplication(sys.argv)
dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
bus = dbus.SystemBus()
try:
manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager')
except:
print "Unable to connect to bluez."
sys.exit(1)
if len(manager.ListAdapters()):
print "# of devices at startup:", len(manager.ListAdapters())
distutils.spawn.spawn(kbtcmd)
else:
print "No BT device found"
def slotAdapterAdded(device):
print "bt dev added:", device, "# of devices:", len(manager.ListAdapters())
distutils.spawn.spawn(kbtcmd)
def slotAdapterRemoved(device):
print "bt dev removed:", device, "# num of devices:", len(manager.ListAdapters())
if len(manager.ListAdapters()) == 0:
for p in quitprogs:
print "exiting:", p, " ..."
try:
distutils.spawn.spawn(['dcop', p, 'MainApplication-Interface', 'quit'])
except:
pass
manager.connect_to_signal("AdapterAdded", slotAdapterAdded)
manager.connect_to_signal("AdapterRemoved", slotAdapterRemoved)
print "waiting for bt device (un)plug events ..."
app.exec_()

@ -0,0 +1,59 @@
#!/usr/bin/python
# -*- coding: UTF-8 -*-
"""
Copyright (C) 2007 Achim Bohnet <allee@kubuntu.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
"""
import sys
from PyQt4 import QtCore, Qt
import dbus
import dbus.mainloop.qt
import distutils.spawn
kbtcmd = [ 'kbluetooth' ]
quitprogs = [ 'kdebluetooth', 'kbluemon', 'kinputwizard' ] # FIXME: quit kbluelock too?
app = Qt.QCoreApplication(sys.argv)
dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
bus = dbus.SystemBus()
try:
manager = dbus.Interface(bus.get_object('org.bluez', '/'), 'org.bluez.Manager')
except:
print "Unable to connect to bluez."
sys.exit(1)
if len(manager.ListAdapters()):
print "# of devices at startup:", len(manager.ListAdapters())
distutils.spawn.spawn(kbtcmd)
else:
print "No BT device found"
def slotAdapterAdded(device):
print "bt dev added:", device, "# of devices:", len(manager.ListAdapters())
distutils.spawn.spawn(kbtcmd)
def slotAdapterRemoved(device):
print "bt dev removed:", device, "# num of devices:", len(manager.ListAdapters())
if len(manager.ListAdapters()) == 0:
for p in quitprogs:
print "exiting:", p, " ..."
try:
distutils.spawn.spawn(['dcop', p, 'MainApplication-Interface', 'quit'])
except:
pass
manager.connect_to_signal("AdapterAdded", slotAdapterAdded)
manager.connect_to_signal("AdapterRemoved", slotAdapterRemoved)
print "waiting for bt device (un)plug events ..."
app.exec_()

@ -0,0 +1,42 @@
[Desktop Entry]
Encoding=UTF-8
Name=KBluetoothD
Name[sv]=Kbluetoothd
Name[ta]=Kபுலுடுத்D
Name[xx]=xxKBluetoothDxx
GenericName=KDE Bluetooth Daemon
GenericName[ar]=مراقب KDE Bluetooth
GenericName[bg]=Демон за Bluetooth в KDE
GenericName[br]=Diaoul KDE Bluetooth
GenericName[bs]=KDE Bluetooth daemon
GenericName[ca]=Dimoni Bluetooth de KDE
GenericName[cs]=Bluetooth démon pro KDE
GenericName[da]=KDE Bluetooth-dæmon
GenericName[de]=KDE Bluetooth-Daemon
GenericName[el]=Ο δαίμονας Bluetooth του KDE
GenericName[es]=Daemon Bluetooth de KDE
GenericName[et]=KDE Bluetoothi deemon
GenericName[fr]=Démon KDE Bluetooth
GenericName[gl]=Servizo Bluetooth de KDE
GenericName[it]=Demone Bluetooth di KDE
GenericName[ja]=KDE Bluetooth デーモン
GenericName[ka]=KDE ბლუთუს დემონი
GenericName[nl]=KDE Bluetooth-daemon
GenericName[pa]=KDE ਬਲਿਊਟੁੱਥ ਡਾਈਮੋਨ
GenericName[pl]=Demon Bluetooth dla KDE
GenericName[pt]=Serviço Bluetooth do KDE
GenericName[ru]=Служба KDE Bluetooth
GenericName[sr]=Bluetooth демон за KDE
GenericName[sr@Latn]=Bluetooth demon za KDE
GenericName[sv]=KDE-Blåtandsdemon
GenericName[ta]=KDE புலுடுத் டேமொன்
GenericName[tr]=KDE Bluetooth Hizmeti
GenericName[xx]=xxKDE Bluetooth Daemonxx
Exec=kblueplugd
Icon=kdebluetooth
Type=Application
DocPath=kdebluetooth/index.html
Terminal=false
X-KDE-autostart-after=panel
X-KDE-StartupNotify=false
X-KDE-autostart-condition=kbluetoothrc:General:AutoStart:true

@ -0,0 +1,22 @@
--- a/kdebluetooth/libkbluetooth/dbusinit.h.ORI 2012-09-01 20:45:58.121444854 +0200
+++ a/kdebluetooth/libkbluetooth/dbusinit.h 2012-09-01 20:46:09.735185514 +0200
@@ -32,7 +32,7 @@
#include <dbus/connection.h>
#define BLUEZ_SERVICE "org.bluez"
-#define BLUEZ_PATH "/org/bluez"
+#define BLUEZ_PATH "/"
#define OBEX_SERVICE "org.openobex"
#define OBEX_PATH "/org/openobex"
--- a/kdebluetooth/libkbluetooth/inputmanager.h.ORI 2012-09-01 20:48:03.215640910 +0200
+++ a/kdebluetooth/libkbluetooth/inputmanager.h 2012-09-01 20:48:12.643428667 +0200
@@ -32,7 +32,7 @@
#include "dbussignal.h"
#include "dbusfilter.h"
-#define BLUEZ_PATH_INPUTMANAGER "/org/bluez/input"
+#define BLUEZ_PATH_INPUTMANAGER "/input"
#define INTERFACE_INPUTMANAGER "org.bluez.input.Manager"
namespace KBluetooth

@ -99,7 +99,7 @@ diff -Nuar kdebluetooth.ORI/admin/cvs.sh kdebluetooth.P/admin/cvs.sh
libkbluetooth_la_LDFLAGS = $(all_libraries)
-libkbluetooth_la_LIBADD = $(LIB_KDECORE) $(DBUS_LIBS) $(LIB_KIO) $(BLUETOOTH_LIBS) -ldbus-qt-1
+libkbluetooth_la_LIBADD = $(LIB_KDECORE) $(DBUS_LIBS) $(LIB_KIO) $(BLUETOOTH_LIBS) -ldbus-tqt-1
+libkbluetooth_la_LIBADD = $(LIB_KDECORE) $(DBUS_LIBS) $(LIB_KIO) $(BLUETOOTH_LIBS) -ldbus-tqt-1 $(LIB_QT) $(LIB_KDEUI) -lkdefx
libkbluetoothincludedir = $(includedir)/libkbluetooth
-libkbluetoothinclude_HEADERS = adapter.h dbusinit.h dbussignal.h dbussignal.h manager.h inputdevice.h inputmanager.h \
@ -114,7 +114,7 @@ diff -Nuar kdebluetooth.ORI/admin/cvs.sh kdebluetooth.P/admin/cvs.sh
kbluetooth_SOURCES = adapterconfig.cpp adapterdialog.ui authorize.cpp authdialog.ui deviceconfig.cpp trayicon.cpp main.cpp application.cpp pindefdialog.ui pindialog.cpp confirmationdlgbase.ui confirmation.cpp rfcommportlistener.cpp procinheritsock.cpp portlistener.cpp sdprecord.cpp
-kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries)
+kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-tqt-1 $(all_libraries) -lDCOP -lkdefx
+kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-tqt-1 $(all_libraries) -lDCOP -lkdefx $(LIB_QT)
kbluetooth_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI)
# this is where the desktop file will go

@ -0,0 +1,20 @@
diff -Nur kdebluetooth-1.0~beta5~r695881/admin/cvs.sh kdebluetooth-1.0~beta5~r695881.new/admin/cvs.sh
--- kdebluetooth-1.0~beta5~r695881/admin/cvs.sh 2007-08-02 13:29:02.000000000 +0200
+++ kdebluetooth-1.0~beta5~r695881.new/admin/cvs.sh 2007-08-03 10:19:55.000000000 +0200
@@ -537,6 +537,8 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
+kdepotpath=/usr/include/kde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
(cd $subdir
@@ -554,7 +556,6 @@
fi
perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
if ! test -f $kdepotpath; then
kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
fi

@ -0,0 +1,48 @@
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluelock/kbluelock.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluelock/kbluelock.desktop
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluelock/kbluelock.desktop 2007-11-10 10:38:44.000000000 +0100
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluelock/kbluelock.desktop 2007-11-16 11:08:12.000000000 +0100
@@ -38,4 +38,5 @@
Comment[tg]=Намоишгари KDE Bluetooth
Comment[tr]=KDE Bluetooth İzleyici
Comment[xx]=xxKDE Bluetooth Monitorxx
+Hidden=true
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluemon/kbluemon.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluemon/kbluemon.desktop
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluemon/kbluemon.desktop 2007-11-10 10:38:44.000000000 +0100
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluemon/kbluemon.desktop 2007-11-16 11:08:12.000000000 +0100
@@ -36,4 +36,5 @@
Comment[tg]=Намоишгари KDE Bluetooth
Comment[tr]=KDE Bluetooth İzleyici
Comment[xx]=xxKDE Bluetooth Monitorxx
+Hidden=true
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluetooth/kbluetooth.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluetooth/kbluetooth.desktop
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluetooth/kbluetooth.desktop 2007-11-10 10:38:44.000000000 +0100
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluetooth/kbluetooth.desktop 2007-11-16 11:08:12.000000000 +0100
@@ -33,7 +33,7 @@
GenericName[tg]=Хидматгоҳи Bluetooth
GenericName[tr]=Bluetooth Sunucusu
GenericName[xx]=xxBluetooth Serverxx
-Categories=Settings;HardwareSettings;
+Categories=Qt;KDE;System;
OnlyShowIn=KDE;
Comment=KDE Bluetooth Framework Metaserver
Comment[bg]=Мета сървър за Bluetooth Framework
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/kbtobexclient.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/kbtobexclient.desktop
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/kbtobexclient.desktop 2007-10-27 09:44:26.000000000 +0200
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/kbtobexclient.desktop 2007-11-16 11:08:57.000000000 +0100
@@ -58,3 +58,5 @@
Comment[ta]=KDE புலுடுத் சட்டவேலைக்கான OBEX பொருள் கிளைஞ்சன்
Comment[tr]=KDEBluetooth Ortamı için OBEX Nesneleri Destek istemcisi
Comment[xx]=xxAn OBEX Object Push client for the KDEBluetooth Frameworkxx
+NoDisplay=true
+
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kinputwizard/kinputwizard.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kinputwizard/kinputwizard.desktop
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kinputwizard/kinputwizard.desktop 2007-11-10 10:38:44.000000000 +0100
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kinputwizard/kinputwizard.desktop 2007-11-16 11:08:12.000000000 +0100
@@ -36,4 +36,5 @@
Comment[tg]=Устоди KDE Bluetooth
Comment[tr]=KDE Bluetooth Sihirbazı
Comment[xx]=xxKDE Bluetooth Wizardxx
+Hidden=true

@ -0,0 +1,15 @@
diff -Nur kdebluetooth-1.0~beta6~r706091/kdebluetooth/kbluetooth/Makefile.am kdebluetooth-1.0~beta6~r706091.new/kdebluetooth/kbluetooth/Makefile.am
--- kdebluetooth-1.0~beta6~r706091/kdebluetooth/kbluetooth/Makefile.am 2007-08-29 14:03:27.000000000 +0200
+++ kdebluetooth-1.0~beta6~r706091.new/kdebluetooth/kbluetooth/Makefile.am 2007-08-29 16:39:13.000000000 +0200
@@ -12,11 +12,6 @@
#shelldesktop_DATA = kbluetooth.desktop
xdg_apps_DATA = kbluetooth.desktop
-# Autostart entry
-autostartdir = $(datadir)/autostart
-autostart_DATA = kbluetooth.autostart.desktop
-
-
#EXTRA_DIST = $(kbluetooth_SOURCES)\
# $(kde_servicetypes_DATA) \
# eventsrc

@ -0,0 +1,10 @@
diff -Nur kdebluetooth-1.0~beta6~r706853/kdebluetooth/kbtobexclient/Makefile.am kdebluetooth-1.0~beta6~r706853.new/kdebluetooth/kbtobexclient/Makefile.am
--- kdebluetooth-1.0~beta6~r706853/kdebluetooth/kbtobexclient/Makefile.am 2007-08-31 11:52:00.000000000 +0200
+++ kdebluetooth-1.0~beta6~r706853.new/kdebluetooth/kbtobexclient/Makefile.am 2007-08-31 18:31:16.000000000 +0200
@@ -1,5 +1,5 @@
# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/kdebluetooth -I$(top_srcdir)/kdebluetooth/libkbluetooth/ -Ikio $(all_includes) $(OPENOBEX_CFLAGS) $(BLUETOOTH_CFLAGS) $(DBUS_CFLAGS)
+INCLUDES = -I$(top_builddir)/kdebluetooth/libkbluetooth/ -I$(build_dir)/kdebluetooth/libkbluetooth/ -I$(top_srcdir)/kdebluetooth -I$(top_srcdir)/kdebluetooth/libkbluetooth/ -Ikio $(all_includes) $(OPENOBEX_CFLAGS) $(BLUETOOTH_CFLAGS) $(DBUS_CFLAGS)
# these are the headers for your project

@ -0,0 +1,50 @@
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/main.cpp kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/main.cpp
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/main.cpp 2007-08-30 17:30:15.000000000 +0200
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/main.cpp 2007-11-16 18:08:29.000000000 +0100
@@ -42,6 +42,7 @@
int main(int argc, char **argv)
{
+ KLocale::setMainCatalogue("kdebluetooth");
KAboutData about("kbtobexclient",
I18N_NOOP("Bluetooth OBEX Object Push client"),
0, description,
@@ -58,7 +59,6 @@
KApplication app;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- KGlobal::locale()->insertCatalogue("libkbluetooth");
KURL url;
if (args->count() == 0) {
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtserialchat/main.cpp kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtserialchat/main.cpp
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtserialchat/main.cpp 2005-04-20 21:01:14.000000000 +0200
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtserialchat/main.cpp 2007-11-16 18:08:29.000000000 +0100
@@ -37,6 +37,7 @@
int main(int argc, char **argv)
{
+ KLocale::setMainCatalogue("kdebluetooth");
KAboutData about("kbtserialchat",
I18N_NOOP("Bluetooth Serial Chat"),
version, description,
@@ -49,7 +50,6 @@
KApplication app;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- KGlobal::locale()->insertCatalogue("libkbluetooth");
if (args->isSet("rfcommconnection") && args->isSet("peeraddr") &&
args->isSet("peername")) {
int socket = QString(args->getOption("rfcommconnection"))
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp 2007-08-27 18:44:57.000000000 +0200
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp 2007-11-16 18:14:38.000000000 +0100
@@ -82,7 +82,7 @@
{
KCModule *create_btpaired(QWidget *parent, const char* /*name*/)
{
- KGlobal::locale()->insertCatalogue("btpaired");
+ KGlobal::locale()->insertCatalogue("kdebluetooth");
return new kcm_btpaired(parent, "btpaired");
}
}

File diff suppressed because it is too large Load Diff

@ -10,8 +10,9 @@
%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_datadir}/applications/kde
%define tde_tdeappdir %{tde_appdir}/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
@ -21,7 +22,7 @@
Name: trinity-kdebluetooth
Version: 1.0_beta9_r769275
Release: 1%{?dist}%{?_variant}
Release: 2%{?dist}%{?_variant}
Summary: The TDE Bluetooth Framework
@ -30,12 +31,25 @@ Group: Applications/Communications
URL: http://bluetooth.kmobiletools.org/
Source0: kdebluetooth_1.0~beta9~r769275.orig.tar.gz
Patch0: kdebluetooth-1.0_beta8-gcc43.patch
Patch1: kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff.gz
Source1: kblueplugd.bluez3
Source2: kblueplugd.bluez4
Source3: kblueplugd.desktop
Patch1: kdebluetooth-1.0_beta8-gcc43.patch
Patch2: kdebluetooth-trinity.patch
Patch3: kdebluetooth-fix_gcc_46_compilation.patch
Patch4: kdebluetooth-fix_bluez4_support.patch
Patch11: kubuntu_01_kdepot.patch
Patch12: kubuntu_02_desktop_files.patch
Patch13: kubuntu_06_no_autostart.patch
Patch14: kubuntu_07_fix_header_include.patch
Patch15: kubuntu_08_load_kdebluetooth_catalogue.patch
Patch16: kubuntu_09_french_i18n.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: lockdev-devel
@ -49,20 +63,23 @@ Buildrequires: libidn-devel
Buildrequires: dbus-tqt-devel
BuildRequires: automake >= 1.6.1
BuildRequires: autoconf >= 2.52
BuildRequires: obexftp-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}bluez-devel
%else
BuildRequires: bluez-libs-devel
BuildRequires: obexftp-devel
%endif
Requires: %{name}-libs = %{version}-%{release}
# kdesu binary
Requires: trinity-tdebase-bin
%if 0%{?fedora} >= 8
Provides: dbus-bluez-pin-helper
%endif
Obsoletes: %{name}-libs < %{version}-%{release}
Provides: %{name}-libs = %{version}-%{release}
%description
The KDE Bluetooth Framework is a set of tools built on top of Linux'
@ -71,25 +88,11 @@ common Bluetooth profiles and to make data exchange with Bluetooth
enabled devices as straightforward as possible.
%package libs
Summary: Base libraries for %{name}
Group: System Environment/Libraries
%if 0%{?fedora} >= 8
Provides: dbus-bluez-pin-helper
%endif
%description libs
KDE Bluetooth framework libraries.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: trinity-kdelibs-devel
Requires: bluez-libs-devel
Requires: %{name}-libs = %{version}-%{release}
Summary: Development files for %{name}
Group: Development/Libraries
Requires: trinity-tdelibs-devel
Requires: bluez-libs-devel
%description devel
@ -98,11 +101,21 @@ KDE Bluetooth framework development libraries and headers.
%prep
%setup -q -n kdebluetooth-1.0~beta9~r769275
%patch0 -p1
%patch1 -p1
%patch1 -p1 -b .gcc43
%patch2 -p1 -b .trinity
%patch3 -p1 -b .gcc46
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%patch4 -p1 -b .bluez4
%endif
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -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" \
@ -147,6 +160,7 @@ export PATH="%{_bindir}:${PATH}"
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT
# icons
for DESK_PATH in applications/kde applnk/Utilities ; do
desktop-file-install \
--mode=644 \
@ -158,6 +172,7 @@ for DESK_PATH in applications/kde applnk/Utilities ; do
$RPM_BUILD_ROOT%{tde_datadir}/$DESK_PATH/*.desktop ||:
done
# Locales
PROG_LIST="kbluelock kbluemon kbluetooth kinputwizard
kcm_btpaired kio_bluetooth kio_obex2 kio_sdp
libkbluetooth kdebluetooth"
@ -165,52 +180,122 @@ for PROG in $PROG_LIST ; do
%find_lang $PROG && cat $PROG.lang >> %{name}.lang ||:
done
rm -f $RPM_BUILD_ROOT/%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
rm -f ${RPM_BUILD_ROOT}%{tde_libdir}/*.a
rm -f ${RPM_BUILD_ROOT}%{tde_libdir}/kde3/*.a
%find_lang kdebluetooth
# Unwanted files
%__rm -f %{buildroot}%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
%__rm -f %{buildroot}%{tde_libdir}/*.a
%__rm -f %{buildroot}%{tde_tdelibdir}/kcm_btpaired.a
%__rm -f %{buildroot}%{tde_tdelibdir}/kio_bluetooth.a
%__rm -f %{buildroot}%{tde_tdelibdir}/kio_obex.a
%__rm -f %{buildroot}%{tde_tdelibdir}/kio_sdp.a
%__rm -f %{buildroot}%{tde_datadir}/applnk/Settings/Network/Bluetooth/.directory
# Installs 'kblueplugd'
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%__install -D -m 755 %{SOURCE2} %{buildroot}%{tde_bindir}/kblueplugd
%else
%__install -D -m 755 %{SOURCE1} %{buildroot}%{tde_bindir}/kblueplugd
%endif
%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/autostart/kblueplugd.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%__rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -qf %{tde_datadir}/icons/hicolor 2> /dev/null ||:
/sbin/ldconfig || :
update-desktop-database %{tde_appdir} 2> /dev/null || :
%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -qf %{tde_datadir}/icons/hicolor 2> /dev/null ||:
/sbin/ldconfig || :
update-desktop-database %{tde_appdir} 2> /dev/null || :
%post devel
/sbin/ldconfig || :
%files -f kdebluetooth.lang
%postun devel
/sbin/ldconfig || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL README
%{tde_bindir}/kblue*
%{tde_bindir}/kbluelock
%{tde_bindir}/kbluemon
%{tde_bindir}/kblueplugd
%{tde_bindir}/kbluetooth
%{tde_bindir}/kbtobexclient
%{tde_bindir}/kioobex_start
%{tde_bindir}/kinputwizard
%{tde_tdeappdir}/*.desktop
%{tde_datadir}/applnk/.hidden/*.desktop
%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop
%{tde_datadir}/apps/*/*
%{tde_datadir}/autostart/*
%{tde_datadir}/desktop-directories/*
%{tde_datadir}/icons/hicolor/*/*/*
%{tde_datadir}/mimelnk/bluetooth/
%{tde_datadir}/service*/*
%{tde_datadir}/apps/konqueror/servicemenus/kbtobexclient_sendfile.desktop
%{tde_datadir}/apps/kbtobexclient/kbtobexclientui.rc
%{tde_datadir}/apps/kdebluetooth/
%{tde_tdeappdir}/dunhandler.desktop
%{tde_tdeappdir}/faxhandler.desktop
%{tde_tdeappdir}/kbluelock.desktop
%{tde_tdeappdir}/kbluemon.desktop
%{tde_tdeappdir}/kbluetooth.desktop
%{tde_tdeappdir}/kbtobexclient.desktop
%{tde_tdeappdir}/kbtobexsrv.desktop
%{tde_tdeappdir}/kcm_btpaired.desktop
%{tde_tdeappdir}/kinputwizard.desktop
%{tde_datadir}/autostart/kblueplugd.desktop
%{tde_datadir}/desktop-directories/kde-settings-network-bluetooth.directory
%{tde_datadir}/icons/hicolor/*/apps/kbluetooth.png
%{tde_datadir}/icons/hicolor/*/apps/kdebluetooth.png
%{tde_datadir}/icons/hicolor/*/apps/kbluelock.png
%{tde_datadir}/icons/hicolor/scalable/apps/kdebluetooth.svgz
%{tde_datadir}/mimelnk/bluetooth/av-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/computer-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/dun-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/fax-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/handsfree-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/headset-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/imaging-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/keyboard-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/lan-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/misc-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/mouse-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/obex-ftp-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/obexobjectpush-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/peripheral-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/phone-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/serial-port-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/synchronization-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/unknown-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/unknown-profile.desktop
%{tde_datadir}/services/bluetooth.protocol
%{tde_datadir}/services/btsdp.protocol
%{tde_datadir}/services/kbluetooth_kbtobexsrv.desktop
%{tde_datadir}/services/kbluetooth_kbtobexsrv.sdp.xml
%{tde_datadir}/services/obex.protocol
%{tde_datadir}/services/sdpmime-dun-profile.desktop
%{tde_datadir}/services/sdpmime-fax-profile.desktop
%{tde_datadir}/services/sdpmime-handsfree-profile.desktop
%{tde_datadir}/services/sdpmime-headset-profile.desktop
%{tde_datadir}/services/sdpmime-obex-client-profile.desktop
%{tde_datadir}/services/sdpmime-obex-ftp-profile.desktop
%{tde_datadir}/services/sdpmime-serial-port-profile.desktop
%{tde_datadir}/services/sdpmime-synchronization-profile.desktop
%{tde_datadir}/servicetypes/sdpservicehandler.desktop
%{tde_libdir}/kdebluetooth/servers/kbtobexsrv
%{tde_libdir}/libkbluetooth.so.0
%{tde_libdir}/libkbluetooth.so.0.0.0
%{tde_libdir}/libqobex.so.0
%{tde_libdir}/libqobex.so.0.0.9
%{tde_tdelibdir}/kcm_btpaired.la
%{tde_tdelibdir}/kcm_btpaired.so
%{tde_tdelibdir}/kio_bluetooth.la
%{tde_tdelibdir}/kio_bluetooth.so
%{tde_tdelibdir}/kio_obex.la
%{tde_tdelibdir}/kio_obex.so
%{tde_tdelibdir}/kio_sdp.la
%{tde_tdelibdir}/kio_sdp.so
%lang(ca) %{tde_tdedocdir}/HTML/ca/kdebluetooth/
%lang(da) %{tde_tdedocdir}/HTML/da/kdebluetooth/
%lang(en) %{tde_tdedocdir}/HTML/en/kdebluetooth/
@ -224,22 +309,24 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
%lang(sv) %{tde_tdedocdir}/HTML/sv/kdebluetooth/
%files libs
%defattr(-,root,root,-)
%{tde_libdir}/*.la
%{tde_libdir}/*.so.*
%{tde_tdelibdir}/*.so
%{tde_tdelibdir}/*.la
%{tde_libdir}/kdebluetooth/
%files devel
%defattr(-,root,root,-)
%{tde_tdeincludedir}/*
%{tde_libdir}/*.so
%{tde_tdeincludedir}/libkbluetooth/
%{tde_tdeincludedir}/qobex/
%{tde_libdir}/libkbluetooth.la
%{tde_libdir}/libkbluetooth.so
%{tde_libdir}/libqobex.la
%{tde_libdir}/libqobex.so
%changelog
* Sat Sep 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0_beta9_r769275-2
- Rebuilt for Mageia 2 and Mandriva 2011
- Drops useless '-libs' package
- Correctly applies Ubuntu patches
- Fix support for Bluez4
* Sun Feb 12 2012 Francois Andriot <francois.andriot@free.fr> - 1.0_beta9_r769275-1
- Initial version for TDE 3.5.13
- Updates base version to 1.0_beta9_r769275 (taken from Ubuntu Hardy)
@ -332,7 +419,7 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
- Fix 64bit compile due to bad default in configure. (with_bluetooth_dir)
- Missing BR: libtempter-devel.
- Missing BT: libidn-devel.
- Added: kbluepin wrapper - configure kbluepin as the old-style pin helper.
- Added: kbluepin wrapper - cotde_datadirnfigure kbluepin as the old-style pin helper.
* Wed Apr 04 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0-0.20.beta2
- Re-merge Ville Skytta's latest .spec. (Got dropped by mistake)

@ -5,7 +5,7 @@
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[01]*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;

@ -0,0 +1,101 @@
# 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
# Speed build options
%define debug_package %{nil}
%define __spec_install_post %{nil}
AutoReq: no
# 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_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-kickoff-i18n
Summary: Kickoff translations for Trinity Desktop Environment
Version: 1.0
Release: 2%{?dist}%{?_variant}
Group: System/Internationalization
License: GPL
URL: http://www.mandriva.com
Source0: kickoff-i18n-1.0.tar.bz2
Patch0: kickoff-i18n-1.0-uz-po.patch
Patch1: kickoff-i18n-1.0-tr-po.patch
# [kickoff-i18n] Fix directories for Trinity
Patch2: kickoff-i18n-1.0-fix_trinity_location.patch
# [kickoff-i18n] Fix build with automake 1.11
Patch3: kickoff-i18n-1.0-fix_autotools_detection.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
BuildRequires: qt3-devel
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
%description
kickoff translations
%prep
%setup -q -n kickoff-i18n-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1 -b .dir
%patch3 -p1 -b .automake
# 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} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
%__make %{?_smp_mflags}
%install
%__rm -fr %{buildroot}
%__make install DESTDIR=%{?buildroot}
%find_lang kickoff
%clean
#rm -fr %{buildroot}
%files -f kickoff.lang
%defattr(-,root,root,-)
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
- Initial build for TDE 3.5.13.1
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
- Initial build for TDE 3.5.13

File diff suppressed because it is too large Load Diff

@ -0,0 +1,11 @@
--- ksensors-0.7.3/admin/cvs.sh.ORI 2012-10-07 11:06:41.616636004 +0200
+++ ksensors-0.7.3/admin/cvs.sh 2012-10-07 11:07:55.975129334 +0200
@@ -64,7 +64,7 @@
echo "*** KDE requires automake 1.6.1 or newer"
exit 1
;;
- automake*1.6.* | automake*1.7* ) : ;;
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]* ) : ;;
"" )
echo "*** AUTOMAKE NOT FOUND!."
echo "*** KDE requires automake 1.6.1 or newer"

@ -0,0 +1,10 @@
--- ksensors-0.7.3/src/sounds/Makefile.am.ORI 2012-10-07 11:24:46.315092603 +0200
+++ ksensors-0.7.3/src/sounds/Makefile.am 2012-10-07 11:25:08.288633760 +0200
@@ -5,6 +5,7 @@
EXTRA_DIST = ksensors_alert.wav
install-data-local:
+ $(mkinstalldirs) $(kde_sounddir)
$(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(kde_sounddir)/ksensors_alert.wav
uninstall-local:
rm -f $(kde_sounddir)/ksensors_alert.wav

@ -0,0 +1,84 @@
--- ksensors-0.7.3/admin/acinclude.m4.in.tdeinc 2003-09-09 16:44:53.000000000 +0200
+++ ksensors-0.7.3/admin/acinclude.m4.in 2012-10-07 11:10:55.098502427 +0200
@@ -459,14 +459,14 @@
if test "$kde_qtver" = "2"; then
kde_moduledir='\${libdir}/kde2'
else
- kde_moduledir='\${libdir}/kde3'
+ kde_moduledir='\${libdir}/trinity'
fi
fi
if test -z "$kde_styledir"; then
- kde_styledir='\${libdir}/kde3/plugins/styles'
+ kde_styledir='\${libdir}/trinity/plugins/styles'
fi
if test -z "$kde_widgetdir"; then
- kde_widgetdir='\${libdir}/kde3/plugins/designer'
+ kde_widgetdir='\${libdir}/trinity/plugins/designer'
fi
if test -z "$xdg_appsdir"; then
xdg_appsdir='\${datadir}/applications'
@@ -528,7 +528,7 @@
)
AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then
kde_save_IFS=$IFS
@@ -549,7 +549,7 @@
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
+ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -1688,8 +1688,8 @@
if test -z "$1"; then
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
+test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/tde $KDEDIR/include/kde $KDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir"
@@ -1700,7 +1700,7 @@
So, check this please and use another prefix!])
fi
-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -1708,7 +1708,7 @@
kde_widgetdir=NO
dnl this might be somewhere else
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([
@@ -1716,14 +1716,14 @@
So, check this please and use another prefix!])
fi
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by kdelibs])
fi
if test -n "$kde_widgetdir"; then
- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
+ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
fi

File diff suppressed because it is too large Load Diff

@ -0,0 +1,268 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_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_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-ksensors
Version: 0.7.3
Release: 19p3%{?dist}%{?_variant}
Summary: KDE frontend to lm_sensors
Group: Applications/System
License: GPLv2+
URL: http://ksensors.sourceforge.net/
Source0: http://downloads.sourceforge.net/ksensors/ksensors-%{version}.tar.gz
# Debian (upstream) patch
Patch2: ksensors_0.7.3-18.diff
# Fix 'lmsensor.cpp' for older lm_sensors API (< 3.x)
Patch7: ksensors-0.7.3-18-lmsensors_2x_fix.patch
# [ksensors] Fix autotools detection
Patch9: ksensors-0.7.3-fix_autotools_detection.patch
# Fix TDE directories detection
Patch10: ksensors-0.7.3-tde_includedir.patch
# Fix sound installation
Patch11: ksensors-0.7.3-fix_sound_installation.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
BuildRequires: gettext
BuildRequires: desktop-file-utils
%if 0%{?suse_version}
BuildRequires: libsensors4-devel
%else
BuildRequires: lm_sensors-devel
%endif
# Keep archs in sync with lm_sensors
ExcludeArch: s390 s390x
%description
KSensors is a nice lm-sensors frontend for the K Desktop Environment.
Install the hddtemp package if you wish to monitor hard disk
temperatures with KSensors.
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup -q -n ksensors-%{version}
%patch2 -p1 -b .debian
%patch7 -p1 -b .lm2x
%patch9 -p1 -b .autotools
%patch10 -p1 -b .tdeinc
%patch11 -p1 -b .sound
# 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"
%__sed -i -e 's|$(kde_datadir)/sounds|$(kde_sounddir)|' src/sounds/Makefile.*
for f in ChangeLog LIESMICH LISEZMOI ; do
iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
done
%build
unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export KDEDIR=%{tde_prefix}
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--disable-dependency-tracking \
--disable-rpath \
--with-extra-includes=%{tde_includedir}/tqt \
--with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir}
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
%install
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT
# Creates autostart shortcut
%__install -dm 755 $RPM_BUILD_ROOT%{tde_datadir}/autostart
%__ln_s ../applnk/Utilities/ksensors.desktop \
$RPM_BUILD_ROOT%{tde_datadir}/autostart
#__rm -rf $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML
%find_lang ksensors
%clean
%__rm -rf $RPM_BUILD_ROOT
%post
for f in locolor hicolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || :
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || :
done
%postun
for f in locolor hicolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || :
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || :
done
%files -f ksensors.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ README TODO
%lang(es) %doc LEEME
%lang(de) %doc LIESMICH
%lang(fr) %doc LISEZMOI
%{tde_bindir}/ksensors
%{tde_datadir}/applnk/Utilities/ksensors.desktop
%{tde_datadir}/apps/ksensors/
%{tde_datadir}/autostart/ksensors.desktop
%{tde_datadir}/icons/hicolor/*/apps/ksensors.png
%{tde_datadir}/icons/locolor/
%{tde_datadir}/sounds/ksensors_alert.wav
%{tde_tdedocdir}/HTML/en/ksensors/
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p3
- Initial build for TDE 3.5.13.1
* Thu Dec 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p2
- Update Debian patch to -18 release
* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p1
- Rebuilt for RHEL 6, RHEL 5, Fedora 15 with TDE 3.5.13
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Fri Feb 15 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-16
- Update Debian patch to -15 release
* Thu Jan 3 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-15
- Change BuildRequires: kdelibs-devel into kdelibs3-devel
* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-14
- Patch for and Rebuild against lm_sensors-3.0.0
* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-13
- Fix reading of min and max tresholds from libsensors
* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-12
- Update License tag for new Licensing Guidelines compliance
* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-11
- Remove OnlyShowIn=KDE; from .desktop file (I like using ksensors under GNOME,
works fine grumbel)
* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-10
- Add icon-cache update scriptlets
- Add Requires: hicolor-icon-theme for dir ownership
* Fri Jul 20 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-9
- Sync Exclu(de|sive)Arch with new lm_sensors (#249060).
* Tue Jun 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-8
- Update Debian patchset to -14 for additional fixes and translations;
drop our hddtemp detection patch in favour of the one included in it.
- Drop Application and X-Fedora categories from .desktop file, add GenericName.
- Make autostart checkbox effective again (#242570).
- Convert docs to UTF-8.
* Sat Sep 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-7
- Apply Debian -11 patchset for upstream radio button state fix,
support for hddtemp with SCSI disks and more translations.
* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-6
- Rebuild.
* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-5
- Rebuild.
* Thu Nov 3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-4
- Clean up build dependencies.
* Thu May 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-3
- Sync arch availability with FC4 lm_sensors (%%{ix86}, x86_64, alpha).
- Reduce directory ownership bloat.
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7.3-2
- rebuilt
* Sat Aug 21 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.3-0.fdr.1
- Update to 0.7.3, most patches applied upstream.
- Disable dependency tracking to speed up the build.
* Tue Jul 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.4
- Force use of multithreaded Qt with --enable-mt to fix build on FC2.
- Sync Debian patch to 0.7.2-16 to get a fix for freeze with hddtemp.
- Apply upstream patches #913569 and #915725.
- Disable RPATH.
- Don't ship the "handbook", it's just a template.
- Other minor improvements here and there.
* Sat Aug 2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.3
- Own dirs under %%{_datadir}/icons and %%{_docdir}/HTML (bug 21).
- Don't tweak path to hddtemp.
- Patch to fix hddtemp detection.
- s/--enable-xinerama/--with-xinerama/
- Borrow man page from Debian.
* Sat May 31 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.2
- Spec cleanups.
* Fri Apr 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.1
- Update to current Fedora guidelines.
- Move desktop entry to %%{_datadir}/applications using desktop-file-install.
* Sun Feb 23 2003 Warren Togami <warren@togami.com> - 0.7.2-1.fedora.2
- BuildRequires libart_lgpl-devel needed for Red Hat 8.1
* Sun Feb 23 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-1.fedora.1
- Update to 0.7.2.
- Don't apply startup crash patch, but keep it around for now.
* Sat Feb 15 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.2
- Include startup crash patch from upstream SRPM.
* Sun Feb 9 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.1
- First Fedora release.

@ -5,7 +5,7 @@
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* )
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[01]* )
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]* )
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;

@ -0,0 +1,288 @@
# 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_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Summary: Mandriva theme for TDE - Widget design
Name: trinity-style-ia-ora
Version: 1.0.8
Release: 2%{?dist}%{?_variant}
License: GPL
Group: Environment/Desktop
URL: http://www.mandrivalinux.com/
Source0: ia_ora-kde-%{version}.tar.bz2
# [ia_ora] Fix automake 1.11 detection
Patch1: ia_ora-1.08-fix_automake_detection.patch
# [ia_ora] Fix trinity directories detection
Patch2: ia_ora-1.08-fix_trinity_directories.patch
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
BuildRequires: trinity-tdebase-devel >= 3.5.13.1
Requires: trinity-twin
%description
Mandriva theme for Trinity
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup -q -n ia_ora-kde-%{version}
%patch1 -p1 -b .automake11
%patch2 -p1 -b .trinity
# 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" cvs
%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} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--disable-rpath \
--enable-closure \
--disable-dependency-tracking \
--enable-new-ldflags \
--enable-final \
--enable-shared \
--disable-static \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
%install
%__rm -rf %{buildroot}
%__make install DESTDIR=%{?buildroot}
# Removes useless files
%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a
%__rm -f %{?buildroot}%{tde_tdelibdir}/plugins/styles/*.a
%clean
%__rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{tde_tdelibdir}/kwin3_iaora.la
%{tde_tdelibdir}/kwin3_iaora.so
%{tde_tdelibdir}/kwin_iaora_config.la
%{tde_tdelibdir}/kwin_iaora_config.so
%{tde_tdelibdir}/plugins/styles/ia_ora.la
%{tde_tdelibdir}/plugins/styles/ia_ora.so
%{tde_datadir}/apps/kstyle/themes/ia_ora.themerc
%{tde_datadir}/apps/kwin/iaora.desktop
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.8-2
- Initial build for TDE 3.5.13.1
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.8-1
- Initial version for TDE 3.5.13
* Fri Aug 05 2011 Andrey Bondrov <bondrov@math.dvgu.ru> 1.0.8-9mib2011.0
- Port to 2011
* Sat Jul 10 2010 Andrey Bondrov <bondrov@math.dvgu.ru> 1.0.8-8mib2010.1
- Rebuild for MIB users
* Sun Nov 22 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1.0.8-8mvt2010.0
- Rename package to avoid unwanted KDE4 upgrade
- Merge packages in one kde-style package
- Fix package group in spec file
* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 1.0.8-7mdv2010.0
+ Rebuild for MDV 2010.0
* Thu Mar 26 2009 Helio Chissini de Castro <helio@mandriva.com> 1.0.8-6mdv2009.1
+ Revision: 361404
- Bump to rebuild against cooker
* Tue Nov 18 2008 Thierry Vignaud <tvignaud@mandriva.com> 1.0.8-5mdv2009.1
+ Revision: 304189
- rebuild for new xcb
* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 1.0.8-4mdv2009.0
+ Revision: 264680
- rebuild early 2009.0 package (before pixel changes)
* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 1.0.8-2mdv2009.0
+ Revision: 204689
- Move to /opt
* Wed Feb 27 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.8-1mdv2008.1
+ Revision: 175799
- New release (1.0.8):
* Fix drawing of buttons when using mandriva color schemes
* Update color scheme names to match the new ones
* Tue Feb 19 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.7-1mdv2008.1
+ Revision: 173100
- new release (1.0.7) fixing some drawing issues on applications that don't use
standard background colors (#33502)
* Thu Jan 03 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0.6-2mdv2008.1
+ Revision: 141786
- rebuilt against openldap-2.4.7 libs
+ Olivier Blin <oblin@mandriva.com>
- restore BuildRoot
+ Thierry Vignaud <tvignaud@mandriva.com>
- kill re-definition of %%buildroot on Pixel's request
* Wed Sep 12 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.6-1mdv2008.0
+ Revision: 84626
- new release: 1.0.6:
* Use the right color for the bottom line of menubar
* Remove some lines that were causing double borders at menubar and toolbar
ends
* Fix the bottom of toolbars: it was being drawn using the wrong color
* Use a flat background for status bars
* Add a minimum size for the scrollbar handle
- new release: 1.0.5
* Use the widget style in all separators (#33260)
* Fixed popup menu item drawing on menus that have titles (#33287)
* Thu Sep 06 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.4-1mdv2008.0
+ Revision: 81272
- new version: 1.0.4
* Restore the old color themes (as they will be kept as alternatives)
* Properly mask the rounded borders and properly draw the region previously
masked
* Create fake rounded corners on menu items
* Reduced the button margin to get normal sized buttons (not giant ones)
* Make it possible to resize windows by the top border
------------------------------------------------------------------------
r227235 | boiko | 2007-09-06 13:58:18 -0300 (Qui, 06 Set 2007) | 3 lines
* Wed Sep 05 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.3-1mdv2008.0
+ Revision: 80378
- new release: 1.0.3
* Implement highligh on hovering controls
* Threat scrollbar buttons as buttons (showing them lowered when the button
is pressed for example)
* Show the combo box button as pressed when the list is opened
* Removed Powerpack+ colors
* Changed Discovery/One to just One and adjusted colors
* Used more sane values when using ia_ora together with other KDE color
schemes
- new release:
* fix gradient colors of menus (thanks Frederic Crozat for pointing that)
* implement correctly the combo box drawing according to the ia_ora spec
* Fix the text color of menubar items
* Thu Aug 23 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.1-1mdv2008.0
+ Revision: 70685
- new version: 1.0.1
* Replace the gradient code by the Plastik one (it is better written)
* Fix drawing of menubar items and popupmenu items (#30659)
* Mon Jun 11 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1.0-18mdv2008.0
+ Revision: 38004
- REBUILD
* Thu Mar 22 2007 Laurent Montel <lmontel@mandriva.com> 1.0-17mdv2007.1
+ Revision: 147929
- Fix theme
* Mon Mar 19 2007 Laurent Montel <lmontel@mandriva.com> 1.0-16mdv2007.1
+ Revision: 146479
- Fix progressbar text color
* Wed Mar 07 2007 Laurent Montel <lmontel@mandriva.com> 1.0-15mdv2007.1
+ Revision: 134563
- Fix style
* Tue Mar 06 2007 Laurent Montel <lmontel@mandriva.com> 1.0-14mdv2007.1
+ Revision: 133854
- New update
* Wed Feb 28 2007 Laurent Montel <lmontel@mandriva.com> 1.0-13mdv2007.1
+ Revision: 127097
- New update
* Wed Jan 24 2007 Laurent Montel <lmontel@mandriva.com> 1.0-12mdv2007.1
+ Revision: 112737
- Fix theme
* Tue Jan 02 2007 Laurent Montel <lmontel@mandriva.com> 1.0-11mdv2007.1
+ Revision: 103350
- Update tarball
* Mon Dec 11 2006 Laurent Montel <lmontel@mandriva.com> 1.0-10mdv2007.1
+ Revision: 94696
- Rename spec file name too
- Rename ia_ora to ia_ora-kde
Fix a lot of bug
- Import ia_ora-kde
* Sat Sep 16 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-9
- Fix title bar
* Thu Sep 14 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-8
- Fix handle
* Thu Sep 14 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-7
- Fix toolbar color
* Thu Sep 14 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-6
- Fix Combobox/Scrollbar/Checkbox and bidi mode
* Tue Sep 12 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-5
- Fix tabbar
* Tue Sep 12 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-4
- Fix scrollbar
* Sun Sep 10 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-3
- Improve style
* Fri Sep 08 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-2
- Some fixes
* Tue Sep 05 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-1
- Initial package

@ -16,26 +16,5 @@ gpgcheck=0
name=trinity-3.5.13-source
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
enabled=1
gpgcheck=0
[trinity-extras]
name=trinity-extras
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/$basearch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras-$basearch.list
enabled=1
gpgcheck=0
[trinity-extras-noarch]
name=trinity-extras-noarch
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/noarch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras-noarch.list
enabled=1
gpgcheck=0
[trinity-extras-source]
name=trinity-extras-source
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/SRPMS
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras-SRPMS.list
enabled=1
enabled=0
gpgcheck=0

@ -13,29 +13,8 @@ enabled=1
gpgcheck=0
[trinity-3.5.13-source]
name=trinity-3.5.13-source
name=trinity-3.5.13-noarch
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
enabled=1
gpgcheck=0
[trinity-extras]
name=trinity-extras
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/$basearch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras-$basearch.list
enabled=1
gpgcheck=0
[trinity-extras-noarch]
name=trinity-extras-noarch
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/noarch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras-noarch.list
enabled=1
gpgcheck=0
[trinity-extras-source]
name=trinity-extras-source
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/SRPMS
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras-SRPMS.list
enabled=1
enabled=0
gpgcheck=0

@ -5,8 +5,8 @@
%endif
Name: trinity-desktop
Version: 3.5.13
Release: 6%{?dist}%{?_variant}
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
License: GPL
Summary: Meta-package to install TDE
Group: User Interface/Desktops
@ -42,6 +42,7 @@ Requires: trinity-tdetoys >= %{version}
Requires: hal
%if 0%{?rhel} || 0%{?fedora}
# YUM configuration file
Requires: trinity-repo >= %{version}
%endif
@ -80,21 +81,37 @@ Requires: trinity-tdewebdev >= %{version}
Group: User Interface/Desktops
Summary: Meta-package to install all TDE applications
# Some applications are disabled for now ...
# Compiz-related stuff
#Requires: trinity-compizconfig-backend-kconfig
#Requires: trinity-desktop-effects-kde
#Requires: trinity-fusion-icon
# Obsolete l10n package
#Requires: trinity-filelight-l10n
# Not even an RPM package ...
#Requires: trinity-konstruct
# Debian/Ubuntu specific ...
#Requires: trinity-adept
# Future R14 packages
#Requires: trinity-kvpnc
#Requires: trinity-qt4-tqt-theme-engine
# Warning, k9copy requires ffmpeg
# Warning, kradio requires libmp3lame
Requires: trinity-abakus
Requires: trinity-amarok
Requires: trinity-basket
Requires: trinity-bibletime
#Requires: trinity-compizconfig-backend-kconfig
#Requires: trinity-desktop-effects-kde
Requires: trinity-digikam
Requires: trinity-dolphin
Requires: trinity-filelight
#Requires: trinity-filelight-l10n
# Fusion-icon requires 'trinity-compizconfig-backend-kconfig'
#Requires: trinity-fusion-icon
Requires: trinity-gwenview
Requires: trinity-gwenview-i18n
Requires: trinity-k3b
# Warning, k9copy requires ffmpeg
Requires: trinity-k9copy
Requires: trinity-kaffeine
Requires: trinity-kaffeine-mozilla
@ -117,8 +134,6 @@ Requires: trinity-kdiff3
Requires: trinity-kdirstat
Requires: trinity-kdmtheme
Requires: trinity-keep
Requires: trinity-kerry
Requires: trinity-kgtk-qt3
Requires: trinity-kile
Requires: trinity-kima
Requires: trinity-kio-locate
@ -130,17 +145,13 @@ Requires: trinity-kmymoney
Requires: trinity-knemo
Requires: trinity-knetload
Requires: trinity-knetstats
Requires: trinity-knetworkmanager
Requires: trinity-knights
Requires: trinity-knowit
Requires: trinity-knutclient
Requires: trinity-koffice-suite
#Requires: trinity-konstruct
Requires: trinity-konversation
Requires: trinity-kopete-otr
Requires: trinity-kpicosim
Requires: trinity-kpilot
# Warning, kradio requires libmp3lame
Requires: trinity-kradio
Requires: trinity-krename
Requires: trinity-krusader
@ -150,14 +161,11 @@ Requires: trinity-kstreamripper
Requires: trinity-ksystemlog
Requires: trinity-ktechlab
Requires: trinity-ktorrent
Requires: trinity-kuickshow
Requires: trinity-kvirc
Requires: trinity-kvkbd
#Requires: trinity-kvpnc # R14 only
Requires: trinity-kwin-style-crystal
Requires: trinity-piklab
Requires: trinity-potracegui
#Requires: trinity-qt4-tqt-theme-engine
Requires: trinity-smartcardauth
Requires: trinity-smb4k
Requires: trinity-soundkonverter
@ -165,19 +173,36 @@ Requires: trinity-tellico
Requires: trinity-wlassistant
Requires: trinity-yakuake
# Disabled applications for RHEL5
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
# On RHEL 5, HAL version is too old for kpowersave .
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
Requires: trinity-kpowersave
# On RHEL 5, GTK2 version is too old for GTK stuff ...
Requires: trinity-gtk-qt-engine
# On RHEL 5, lilypond is not available, so no rosegarden :'-(
Requires: trinity-rosegarden
# RHEL5: kpilot library is too old
Requires: trinity-kpilot
%endif
# On RHEL 5, GTK2 version is too old for gtk-qt-engine.
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
Requires: trinity-gtk-qt-engine
# This one causes several crashes .
#Requires: trinity-kgtk-qt3
# Disabled applications for OPENSUSE 12.2, Mageia 2
%if 0%{?rhel} || 0%{?fedora} >= 15 || 0%{?mdkversion}
# no imlib1.x library
Requires: trinity-kuickshow
%endif
# On RHEL 5, lilypond is not available, so no rosegarden :'-(
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
Requires: trinity-rosegarden
# RHEL, openSUSE 12: no Beagle library
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
Requires: trinity-kerry
%endif
# RHEL 6 only: knetworkmanager8
# knetworkmanager9 is too unstable for now.
%if 0%{?rhel} == 6
Requires: trinity-knetworkmanager
%endif
%description applications
@ -193,9 +218,10 @@ Summary: Meta-package to install all extras (unofficial) TDE packages
Requires: trinity-akode
Requires: trinity-kasablanca
Requires: trinity-kdebluetooth
#Requires: trinity-kdebluetooth
Requires: trinity-kickoff-i18n
Requires: trinity-ksensors
Requires: trinity-style-ia-oa
Requires: trinity-style-ia-ora
%description extras
%{summary}
@ -248,14 +274,15 @@ Summary: Yum configuration files for Trinity
%__sed %{SOURCE0} \
-e 's/\$releasever/%{fedora}/g' \
-e 's/-fedora/-f%{fedora}/g' \
>%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-f%{fedora}.repo
>%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo
%endif
# RHEL repo file
# $releasever is replaced with its value
%if 0%{?rhel} > 0
%__sed %{SOURCE1} \
-e 's/\$releasever/%{rhel}/g' \
>%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-el%{rhel}.repo
>%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo
%endif
%if 0%{?fedora} || 0%{?rhel}
@ -263,6 +290,9 @@ Summary: Yum configuration files for Trinity
%endif
%changelog
* Mon Oct 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Update to major version 3.5.13.1
* Mon Aug 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
- Add 'applications' subpackage

@ -3,8 +3,6 @@
%include fedora-live-base.ks
repo --name=trinity --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-3.5.13/RPMS/$basearch
repo --name=trinity-noarch --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-3.5.13/RPMS/noarch
repo --name=trinity-extras --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-extras/RPMS/$basearch
repo --name=trinity-extras-noarch --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-extras/RPMS/noarch
%packages

@ -26,7 +26,7 @@ trinity-k3b
trinity-kaffeine
trinity-kasablanca
trinity-kbookreader
trinity-kdebluetooth
#trinity-kdebluetooth
trinity-style-lipstik
#trinity-kgtk-qt3
trinity-kio-umountwrapper

@ -1,8 +1,10 @@
%define _prefix /usr
%define tde_bindir %{tde_prefix}/bin
Name: trinity-live
Version: 3.5.13
Release: 4%{?dist}
Version: 3.5.13.1
Release: 1%{?dist}
License: GPL
Summary: Trinity Spins
Group: Applications/System
@ -45,7 +47,7 @@ cat <<EOF >openbox
# This script is used by 'firstboot' only.
# It allows to run TDE's kwin instead of openbox.
export PATH=%{_bindir}:\${PATH}
export PATH=%{tde_bindir}:\${PATH}
export HOME=/root
rm -rf \${HOME}/.DCOPserver*
@ -73,6 +75,9 @@ EOF
%changelog
* Sun Oct 07 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial build for TDE 3.5.13.1
* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Updates with new split packages

@ -31,7 +31,8 @@ EOF
# Checks RPMBUILD environment
RHEL="$( rpm -E "%{rhel}" )"
FEDORA="$( rpm -E "%{fedora}" )"
if [ "${RHEL}" = "%{rhel}" ] && [ "${FEDORA}" = "%{fedora}" ]; then
SUSE="$( rpm -E "%{suse_version}" )"
if [ "${RHEL}" = "%{rhel}" ] && [ "${FEDORA}" = "%{fedora}" ] && [ "${SUSE}" = "%{suse_version}" ]; then
cat <<EOF
Error: RPM macro %rhel or %fedora must be set to the distribution version to build !
E.g:

Loading…
Cancel
Save