RHEL/Fedora: updates kdebluetooth

pull/3/head
Francois Andriot 12 years ago
parent 3fb79c5fd7
commit 93fdadaa7f

@ -1,10 +1,22 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?tde_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_datadir}/doc
%endif %endif
%define tde_docdir %{_docdir}/kde # 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}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-kdebluetooth Name: trinity-kdebluetooth
@ -27,20 +39,26 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext BuildRequires: gettext
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: lockdev-devel BuildRequires: lockdev-devel
BuildRequires: xmms-devel #BuildRequires: xmms-devel
BuildRequires: bluez-libs-devel BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-tdepim-devel
BuildRequires: trinity-kdepim-devel
BuildRequires: openobex-devel >= 1.1 BuildRequires: openobex-devel >= 1.1
BuildRequires: libusb-devel BuildRequires: libusb-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
Buildrequires: libidn-devel Buildrequires: libidn-devel
Buildrequires: dbus-tqt-devel Buildrequires: dbus-tqt-devel
BuildRequires: obexftp-devel
BuildRequires: automake >= 1.6.1 BuildRequires: automake >= 1.6.1
BuildRequires: autoconf >= 2.52 BuildRequires: autoconf >= 2.52
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}bluez-devel
%else
BuildRequires: bluez-libs-devel
BuildRequires: obexftp-devel
%endif
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Requires: %{_bindir}/kdesu Requires: trinity-kdesu
@ -54,7 +72,6 @@ enabled devices as straightforward as possible.
%package libs %package libs
Summary: Base libraries for %{name} Summary: Base libraries for %{name}
Group: System Environment/Libraries Group: System Environment/Libraries
Obsoletes: %{name} < %{version}-%{release}
%if 0%{?fedora} >= 8 %if 0%{?fedora} >= 8
Provides: dbus-bluez-pin-helper Provides: dbus-bluez-pin-helper
@ -86,9 +103,9 @@ KDE Bluetooth framework development libraries and headers.
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \ %__sed -i "admin/acinclude.m4.in" \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|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/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" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -96,21 +113,31 @@ KDE Bluetooth framework development libraries and headers.
%build %build
export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
export CXXFLAGS="${CXXFLAGS} -I%{_includedir}/dbus-1.0"
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
%configure \ export PATH="%{tde_bindir}:${PATH}"
--disable-rpath \ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--enable-new-ldflags \
--disable-debug \
--disable-dependency-tracking \
--enable-final \
--enable-closure \
--with-extra-includes=%{_includedir}/tqt
%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool export KDEDIR=%{tde_prefix}
# FIXME: dbus-tqt headers are not found without this ...
export CXXFLAGS="${CXXFLAGS} -I%{tde_includedir}/dbus-1.0"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_tdeincludedir} \
--datadir=%{tde_datadir} \
--disable-rpath \
--enable-new-ldflags \
--disable-debug \
--disable-dependency-tracking \
--enable-final \
--enable-closure \
--with-extra-includes=%{tde_includedir}/tqt:
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
%install %install
@ -122,14 +149,13 @@ for DESK_PATH in applications/kde applnk/Utilities ; do
desktop-file-install \ desktop-file-install \
--mode=644 \ --mode=644 \
--vendor="" \ --vendor="" \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \ --dir=$RPM_BUILD_ROOT%{tde_datadir}/applications/kde \
--remove-category="Network" \ --remove-category="Network" \
--add-category="System" \ --add-category="System" \
--delete-original \ --delete-original \
$RPM_BUILD_ROOT%{_datadir}/$DESK_PATH/*.desktop ||: $RPM_BUILD_ROOT%{tde_datadir}/$DESK_PATH/*.desktop ||:
done done
touch %{name}.lang
PROG_LIST="kbluelock kbluemon kbluetooth kinputwizard PROG_LIST="kbluelock kbluemon kbluetooth kinputwizard
kcm_btpaired kio_bluetooth kio_obex2 kio_sdp kcm_btpaired kio_bluetooth kio_obex2 kio_sdp
libkbluetooth kdebluetooth" libkbluetooth kdebluetooth"
@ -139,8 +165,8 @@ done
rm -f $RPM_BUILD_ROOT/%{_datadir}/applnk/Settings/Network/Bluetooth/.directory rm -f $RPM_BUILD_ROOT/%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.a rm -f ${RPM_BUILD_ROOT}%{tde_libdir}/*.a
rm -f ${RPM_BUILD_ROOT}%{_libdir}/kde3/*.a rm -f ${RPM_BUILD_ROOT}%{tde_libdir}/kde3/*.a
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -158,48 +184,48 @@ touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||: gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
%files -f %{name}.lang %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL README %doc AUTHORS ChangeLog COPYING INSTALL README
%{_bindir}/kblue* %{tde_bindir}/kblue*
%{_bindir}/kbtobexclient %{tde_bindir}/kbtobexclient
%{_bindir}/kioobex_start %{tde_bindir}/kioobex_start
%{_bindir}/kinputwizard %{tde_bindir}/kinputwizard
%{_datadir}/applications/kde/*.desktop %{tde_tdeappdir}/*.desktop
%{_datadir}/applnk/.hidden/*.desktop %{tde_datadir}/applnk/.hidden/*.desktop
%{_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop
%{_datadir}/apps/*/* %{tde_datadir}/apps/*/*
%{_datadir}/autostart/* %{tde_datadir}/autostart/*
%{_datadir}/desktop-directories/* %{tde_datadir}/desktop-directories/*
%{_datadir}/icons/hicolor/*/*/* %{tde_datadir}/icons/hicolor/*/*/*
%{_datadir}/mimelnk/bluetooth/ %{tde_datadir}/mimelnk/bluetooth/
%{_datadir}/service*/* %{tde_datadir}/service*/*
%lang(ca) %{tde_docdir}/HTML/ca/kdebluetooth/ %lang(ca) %{tde_tdedocdir}/HTML/ca/kdebluetooth/
%lang(da) %{tde_docdir}/HTML/da/kdebluetooth/ %lang(da) %{tde_tdedocdir}/HTML/da/kdebluetooth/
%lang(en) %{tde_docdir}/HTML/en/kdebluetooth/ %lang(en) %{tde_tdedocdir}/HTML/en/kdebluetooth/
%lang(es) %{tde_docdir}/HTML/es/kdebluetooth/ %lang(es) %{tde_tdedocdir}/HTML/es/kdebluetooth/
%lang(et) %{tde_docdir}/HTML/et/kdebluetooth/ %lang(et) %{tde_tdedocdir}/HTML/et/kdebluetooth/
%lang(fr) %{tde_docdir}/HTML/fr/kdebluetooth/ %lang(fr) %{tde_tdedocdir}/HTML/fr/kdebluetooth/
%lang(it) %{tde_docdir}/HTML/it/kdebluetooth/ %lang(it) %{tde_tdedocdir}/HTML/it/kdebluetooth/
%lang(nl) %{tde_docdir}/HTML/nl/kdebluetooth/ %lang(nl) %{tde_tdedocdir}/HTML/nl/kdebluetooth/
%lang(pt) %{tde_docdir}/HTML/pt/kdebluetooth/ %lang(pt) %{tde_tdedocdir}/HTML/pt/kdebluetooth/
%lang(ru) %{tde_docdir}/HTML/ru/kdebluetooth/ %lang(ru) %{tde_tdedocdir}/HTML/ru/kdebluetooth/
%lang(sv) %{tde_docdir}/HTML/sv/kdebluetooth/ %lang(sv) %{tde_tdedocdir}/HTML/sv/kdebluetooth/
%files libs %files libs
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/*.la %{tde_libdir}/*.la
%{_libdir}/*.so.* %{tde_libdir}/*.so.*
%{_libdir}/kde3/*.so %{tde_tdelibdir}/*.so
%{_libdir}/kde3/*.la %{tde_tdelibdir}/*.la
%{_libdir}/kdebluetooth/ %{tde_libdir}/kdebluetooth/
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_includedir}/* %{tde_includedir}/*
%{_libdir}/*.so %{tde_libdir}/*.so
%changelog %changelog

Loading…
Cancel
Save