[licq/f18: 4/4] BZ#977150.

[Christopher Meng]

commit bcca7b4038616303cc10e4cdad2f884c7aa8fe20
Author: Christopher Meng <rpm at cicku.me>
Date:   Mon Aug 5 15:21:20 2013 +0800

    BZ#977150.

 licq.spec |  114 +++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 66 insertions(+), 48 deletions(-)
---
diff --git a/licq.spec b/licq.spec
index 19f322b..54d7cd2 100644
--- a/licq.spec
+++ b/licq.spec
@@ -1,48 +1,52 @@
-Name: licq
-Version: 1.7.1
-Release: 4%{?dist}
-License: GPLv2+
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-
-URL: http://www.licq.org/
-Summary: Licq - A graphical ICQ Client for Linux
-Group: Applications/Internet
-BuildRequires: qt-devel boost-devel
-BuildRequires: gpgme-devel libgpg-error-devel 
-BuildRequires: openssl-devel
-BuildRequires: desktop-file-utils
-BuildRequires: libXScrnSaver-devel
-BuildRequires: gettext, cmake
-BuildRequires: xosd-devel
-BuildRequires: cdk-devel ncurses-devel
-
+Name:           licq
+Version:        1.7.1
+Release:        5%{?dist}
+License:        GPLv2+
+Summary:        A graphical ICQ Client for Linux
+URL:            http://www.licq.org
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+BuildRequires:  qt4-devel boost-devel
+BuildRequires:  gpgme-devel libgpg-error-devel 
+BuildRequires:  openssl-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  libXScrnSaver-devel
+BuildRequires:  gettext, cmake
+BuildRequires:  xosd-devel
+BuildRequires:  cdk-devel ncurses-devel
+BuildRequires:  gloox-devel
 # fcami - licq calls "play" directly
 Requires: sox
 
 Provides: %{name}-kde = %{version}-%{release}, %{name}-msn = %{version}-%{release}, %{name}-icqnd = %{version}-%{release}, %{name}-auto-reply = %{version}-%{release}
 Obsoletes: %{name}-kde < 1.6.1, %{name}-msn < 1.6.1, %{name}-icqnd < 1.6.1, %{name}-auto-reply < 1.6.1
 
-%package osd
-Summary: OSD (On Screen Display) plugin for Licq
-Group: Applications/Internet
-Requires: %{name} = %{version}-%{release}
+%description
+Licq is a instant messaging client for UNIX supporting multiple 
+protocols (currently ICQ, MSN and Jabber). Licq uses a extensive plugin 
+system to manage many different functions.
+
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%package console
-Summary: Console plugin for Licq
-Group: Applications/Internet
-Requires: %{name} = %{version}-%{release}
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
-%description
-Licq is a ICQ Client for the common ICQ network. It provides a graphical
-user interface based on QT and is enhanceable with many powerful plugins.
-For more information visit Licq's Homepage http://www.licq.org
+%package        osd
+Summary:        OSD (On Screen Display) plugin for Licq
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description osd
+%description    osd
 This is a small plugin, which uses libxosd2 to
 display new arriving messages as OSD (On Screen Display)
 text on your desktop.
 
-%description console
+%package        console
+Summary:        Console plugin for Licq
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    console
 This is a console ui plugin for the Licq ICQ client.  It is considered beta
 at this point and does not have all the features that the qt-gui supports.
 
@@ -83,6 +87,13 @@ cd build
 make %{?_smp_mflags}
 popd
 
+pushd plugins/jabber
+mkdir build
+cd build
+%cmake $cmakeopts ..
+make %{?_smp_mflags}
+popd
+
 pushd plugins/msn
 mkdir build
 cd build
@@ -138,6 +149,10 @@ pushd plugins/forwarder/build
 make DESTDIR=$RPM_BUILD_ROOT install
 popd
 
+pushd plugins/jabber/build
+make DESTDIR=$RPM_BUILD_ROOT install
+popd
+
 pushd plugins/msn/build
 make DESTDIR=$RPM_BUILD_ROOT install
 popd
@@ -159,36 +174,39 @@ pushd plugins/rms/build
 make DESTDIR=$RPM_BUILD_ROOT install
 popd
 
-#remove devel 
-rm -rf $RPM_BUILD_ROOT/%{_includedir}
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/cmake
+find %{buildroot} -name '*.la' -delete
 
 %files -f plugins/qt4-gui/build/licq.lang
-%defattr(-, root, root, -)
-%{_bindir}/licq
-%dir %{_libdir}/licq
-%{_libdir}/licq/licq_qt4-gui.so
-%{_libdir}/licq/protocol_msn.so
-%{_libdir}/licq/licq_autoreply.so
-%{_libdir}/licq/licq_forwarder.so
-%{_libdir}/licq/licq_rms.so
+%{_bindir}/%{name}
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/licq_qt4-gui.so
+%{_libdir}/%{name}/protocol_msn.so
+%{_libdir}/%{name}/licq_autoreply.so
+%{_libdir}/%{name}/licq_forwarder.so
+%{_libdir}/%{name}/protocol_jabber.so
+%{_libdir}/%{name}/licq_rms.so
 %{_datadir}/licq
 %{_datadir}/applications/*licq.desktop
 %doc doc/ upgrade/ README* LICENSE
 %doc auto-reply forwarder msn rms
 
 %files osd -f plugins/osd/build/licq_osd_plugin.lang
-%defattr(-, root, root, -)
-%{_libdir}/licq/licq_osd.so
+%{_libdir}/%{name}/licq_osd.so
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %files console
-%defattr(-, root, root, -)
-%{_libdir}/licq/licq_console.so
+%{_libdir}/%{name}/licq_console.so
 %doc plugins/console/{README,licq_console.conf}
 
+%files devel 
+%{_includedir}/*
+%{_datadir}/cmake
+
 %changelog
+* Mon Aug 05 2013 Christopher Meng <rpm at cicku.me> - 1.7.1-5
+- Add devel package.
+- Add gloox BR for jabber support(BZ#977150).
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild