[licq] New upstream release. (#748117, #528534, #726235)
Akira TAGOH
tagoh at fedoraproject.org
Thu Jun 28 13:04:48 UTC 2012
commit eb3414764c8283a6407ac30f3e4889c096a97048
Author: Akira TAGOH <tagoh at redhat.com>
Date: Thu Jun 28 22:04:46 2012 +0900
New upstream release. (#748117, #528534, #726235)
.gitignore | 1 +
licq-1.3.5-dos.patch | 116 -----------------
licq-1.3.5-gcc43.patch | 53 --------
licq-1.3.5-gcc44.patch | 156 -----------------------
licq-1.3.5-logonfix.patch | 11 --
licq.spec | 301 +++++++++++++++++++--------------------------
sources | 3 +-
7 files changed, 130 insertions(+), 511 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 28b0c68..208b5e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
licq-1.3.5.tar.gz
+/licq-1.6.1.tar.bz2
diff --git a/licq.spec b/licq.spec
index 22d75e2..e507cd4 100644
--- a/licq.spec
+++ b/licq.spec
@@ -1,239 +1,194 @@
Name: licq
-Version: 1.3.5
-Release: 12%{?dist}
+Version: 1.6.1
+Release: 1%{?dist}
License: GPLv2+
-Source0: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
-Source1: http://prdownloads.sourceforge.net/icqnd/icqnd-0.1.9.6.tar.bz2
+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
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: qt-devel
+BuildRequires: qt-devel boost-devel
BuildRequires: gpgme-devel libgpg-error-devel
BuildRequires: openssl-devel
BuildRequires: desktop-file-utils
BuildRequires: libXScrnSaver-devel
-BuildRequires: gettext, automake, libtool
-# Patches 0,1,3 submitted upstream: http://www.licq.org/ticket/1668
-# Patch 2 is an upstream patch.
-Patch0: licq-1.3.5-gcc43.patch
-Patch1: licq-1.3.5-dos.patch
-Patch2: licq-1.3.5-logonfix.patch
-Patch3: licq-1.3.5-gcc44.patch
-
-%package kde
-Summary: Licq plugin for KDE
-Group: Applications/Internet
-Requires: %name = %version-%release
-BuildRequires: kdelibs3-devel
-
-%package osd
-Summary: OSD (On Screen Display) plugin for Licq
-Group: Applications/Internet
-Requires: %name = %version-%release
+BuildRequires: gettext, cmake
BuildRequires: xosd-devel
+BuildRequires: cdk-devel ncurses-devel
-%package msn
-Summary: MSN protocol plugin for Licq
-Group: Applications/Internet
-Requires: %name = %version-%release
+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 icqnd
-Summary: gtk2 gui for Licq.
+%package osd
+Summary: OSD (On Screen Display) plugin for Licq
Group: Applications/Internet
-Requires: %name = %version-%release
-BuildRequires: gtk2-devel
+Requires: %{name} = %{version}-%{release}
-%package auto-reply
-Summary: Auto-reply plugin for Licq.
+%package console
+Summary: Console plugin for Licq
Group: Applications/Internet
-Requires: %name = %version-%release
+Requires: %{name} = %{version}-%{release}
%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
-%description kde
-This is the KDE based GUI plugin for Licq.
-To run this plugin, you will have to
-issue the command "licq -p kde-gui"
-
%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 msn
-This is a MSN protocol plugin for Licq.
-
-%description icqnd
-A New GTK2 Gui! This one looks like it has many features already and should be used instead of the other GTK plugins.
-
-%description auto-reply
-Plugin to automatically respond to any incoming event with the output of a given program, which can be passed user arguments, or event the message text itself. Often used in conjunction with "fortune" to send people fortunes. Also included in the main distribution.
+%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.
%prep
%setup -q
-tar -C plugins -xjf %{SOURCE1}
-%patch0 -p1 -b .gcc43.patch
-%patch1 -p1 -b .dos
-%patch2 -p1 -b .logonfix
-%patch3 -b .gcc44
-
#remove cvs stuff
rm -rf `find . -name CVS`
%build
export CFLAGS="$RPM_OPT_FLAGS"
-export KDEDIR=/usr/%_lib
-
-#fix libdir issues
-sed -i s/lib/%{_lib}/ include/licq_constants.h
-sed -i "s/^libdir/#libdir/" plugins/icqnd-0.1.9.6/src/Makefile.am
-
-%configure
-make
-cd plugins
- cp -r qt-gui kde-gui
- cd kde-gui
- aclocal
- automake
- perl am_edit {src/,share/,po/}Makefile.in
- autoconf
- %configure \
- --with-kde \
- --libdir=%{_libdir}/ \
- --with-qt-includes=%{_libdir}/qt-3.3/include \
- --with-qt-libraries=%{_libdir}/qt-3.3/lib/ \
- --with-qt-moc=%{_libdir}/qt-3.3/bin/moc
- make
-cd ../qt-gui
- aclocal
- automake
- perl am_edit {src/,share/,po/}Makefile.in
- autoconf
- %configure \
- --libdir=%{_libdir}/ \
- --with-qt-includes=%{_libdir}/qt-3.3/include \
- --with-qt-libraries=%{_libdir}/qt-3.3/lib/ \
- --with-qt-moc=%{_libdir}/qt-3.3/bin/moc \
- QT_LUPDATE=/usr/lib/qt-3.3/bin/lupdate
- make
-cd ../osd
- %configure --libdir=%{_libdir}/
- make
-cd ../msn
- autoconf
- %configure --libdir=%{_libdir}/
- make
-cd ../icqnd-0.1.9.6
- aclocal
- automake
- autoconf
- %configure --libdir=%{_libdir}/licq \
- --with-licq-includes=%{_builddir}/%{buildsubdir}/include
- make
-cd ../auto-reply
- autoconf
- %configure --libdir=%{_libdir}/
- make
-%install
-rm -rf $RPM_BUILD_ROOT
+mkdir build
+pushd build
+%cmake ..
+make %{?_smp_mflags}
+popd
+
+cmakeopts="-DCMAKE_MODULE_PATH=$RPM_BUILD_DIR/%{name}-%{version}/cmake -DLicq_DIR=$RPM_BUILD_DIR/%{name}-%{version}/build/cmake"
+
+pushd plugins/auto-reply
+mkdir build
+cd build
+%cmake $cmakeopts ..
+make %{?_smp_mflags}
+popd
+
+pushd plugins/console
+mkdir build
+cd build
+%cmake $cmakeopts ..
+make %{?_smp_mflags}
+popd
+
+pushd plugins/forwarder
+mkdir build
+cd build
+%cmake $cmakeopts ..
+make %{?_smp_mflags}
+popd
+
+pushd plugins/msn
+mkdir build
+cd build
+%cmake $cmakeopts ..
+make %{?_smp_mflags}
+popd
+
+pushd plugins/osd
+mkdir build
+cd build
+%cmake $cmakeopts ..
+make %{?_smp_mflags}
+popd
+
+pushd plugins/qt4-gui
+mkdir build
+cd build
+%cmake $cmakeopts ..
+make %{?_smp_mflags}
+popd
+
+pushd plugins/rms
+mkdir build
+cd build
+%cmake $cmakeopts ..
+make %{?_smp_mflags}
+popd
+
+# move some docs
+mkdir auto-reply
+cp -a plugins/auto-reply/{README,licq_autoreply.conf,examples} auto-reply/
+mkdir forwarder
+cp -a plugins/forwarder/{README,licq_forwarder.conf} forwarder/
+mkdir msn
+cp -a plugins/msn/{README,owner.MSN_} msn/
+mkdir rms
+cp -a plugins/rms/{README,licq_rms.conf} rms/
+%install
+pushd build
make DESTDIR=$RPM_BUILD_ROOT install
-cd plugins/qt-gui
-desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- share/licq.desktop
+popd
+
+pushd plugins/auto-reply/build
make DESTDIR=$RPM_BUILD_ROOT install
+popd
-%find_lang licq
+pushd plugins/console/build
+make DESTDIR=$RPM_BUILD_ROOT install
+popd
-cd ../kde-gui
+pushd plugins/forwarder/build
make DESTDIR=$RPM_BUILD_ROOT install
-cd ../osd
+popd
+
+pushd plugins/msn/build
make DESTDIR=$RPM_BUILD_ROOT install
+popd
+pushd plugins/osd/build
+make DESTDIR=$RPM_BUILD_ROOT install
%find_lang licq_osd_plugin
+popd
-cd ../msn
+pushd plugins/qt4-gui/build
make DESTDIR=$RPM_BUILD_ROOT install
-cd ../icqnd-0.1.9.6
-make DESTDIR=$RPM_BUILD_ROOT install
-cd ../auto-reply
+desktop-file-install --vendor fedora \
+ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+ ../share/misc/licq.desktop
+%find_lang licq
+popd
+
+pushd plugins/rms/build
make DESTDIR=$RPM_BUILD_ROOT install
+popd
#remove devel
-rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq
+rm -rf $RPM_BUILD_ROOT/%{_includedir}
rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
rm -r $RPM_BUILD_ROOT/%{_datadir}/applications/licq.desktop
-rm -r $RPM_BUILD_ROOT/%{_datadir}/applications/kde/licq.desktop
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/cmake
-%files -f plugins/qt-gui/licq.lang
-%defattr(-,root,root)
+%files -f plugins/qt4-gui/build/licq.lang
+%defattr(-, root, root, -)
%{_bindir}/licq
-%{_bindir}/viewurl-lynx.sh
-%{_bindir}/viewurl-mozilla.sh
-%{_bindir}/viewurl-ncftp.sh
-%{_bindir}/viewurl-netscape.sh
-%{_bindir}/viewurl-opera.sh
-%{_bindir}/viewurl-w3m.sh
-%{_bindir}/viewurl-firefox.sh
-%{_bindir}/viewurl-seamonkey.sh
%dir %{_libdir}/licq
-%{_libdir}/licq/licq_qt-gui.so
+%{_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
%{_datadir}/licq
-%lang(bg) %{_datadir}/licq/qt-gui/locale/bg_BG.qm
-%lang(cs) %{_datadir}/licq/qt-gui/locale/cs_CZ.qm
-%lang(cs) %{_datadir}/licq/qt-gui/locale/cs.qm
-%lang(de) %{_datadir}/licq/qt-gui/locale/de.qm
-%lang(es) %{_datadir}/licq/qt-gui/locale/es.qm
-%lang(fi) %{_datadir}/licq/qt-gui/locale/fi.qm
-%lang(fr) %{_datadir}/licq/qt-gui/locale/fr.qm
-%lang(hu) %{_datadir}/licq/qt-gui/locale/hu_HU.qm
-%lang(it) %{_datadir}/licq/qt-gui/locale/it.qm
-%lang(ja) %{_datadir}/licq/qt-gui/locale/ja_JP.eucJP.qm
-%lang(pl) %{_datadir}/licq/qt-gui/locale/pl.qm
-%lang(pt) %{_datadir}/licq/qt-gui/locale/pt_BR.qm
-%lang(pt) %{_datadir}/licq/qt-gui/locale/pt.qm
-%lang(ru) %{_datadir}/licq/qt-gui/locale/ru.qm
-%lang(sr) %{_datadir}/licq/qt-gui/locale/sr.qm
-%lang(sv) %{_datadir}/licq/qt-gui/locale/sv.qm
-%lang(tr) %{_datadir}/licq/qt-gui/locale/tr.qm
-%lang(uk) %{_datadir}/licq/qt-gui/locale/uk.qm
%{_datadir}/applications/fedora-licq.desktop
%doc doc/ upgrade/ README* LICENSE
+%doc auto-reply forwarder msn rms
-%files kde
-%defattr(-,root,root)
-%{_libdir}/licq/licq_kde-gui.so
-%doc plugins/kde-gui/README.KDE
-
-%files osd -f plugins/osd/licq_osd_plugin.lang
-%defattr(-,root,root)
+%files osd -f plugins/osd/build/licq_osd_plugin.lang
+%defattr(-, root, root, -)
%{_libdir}/licq/licq_osd.so
%doc plugins/osd*/{AUTHORS,TODO,README,changelog}
-%files msn
-%defattr(-,root,root)
-%{_libdir}/licq/protocol_msn.so
-%doc plugins/msn/README
-
-%files icqnd
-%defattr(-,root,root)
-%{_libdir}/licq/licq_icqnd.so
-
-%files auto-reply
-%defattr(-,root,root)
-%{_libdir}/licq/licq_autoreply.so
-%doc plugins/auto-reply/{README,licq_autoreply.conf,examples}
+%files console
+%defattr(-, root, root, -)
+%{_libdir}/licq/licq_console.so
+%doc plugins/console/{README,licq_console.conf}
%changelog
+* Thu Jun 28 2012 Akira TAGOH <tagoh at redhat.com> - 1.6.1-1
+- New upstream release. (#748117, #528534, #726235)
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 861d932..cc0671c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-17ec100b7775deba5545c3909281c945 licq-1.3.5.tar.gz
-57d77adca3b486958fed04412296c60b icqnd-0.1.9.6.tar.bz2
+9caa6d2e215a41a8b99c64ecbc2e6299 licq-1.6.1.tar.bz2
More information about the scm-commits
mailing list