Author: arekm Date: Sun Oct 25 13:50:22 2009 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.3.7; new qt4-gui and kde4-gui packages; qt3/kde3 packages disabled (bcond)
---- Files affected: packages/licq: licq.spec (1.115 -> 1.116) , licq-kde4-gui.desktop (NONE -> 1.1) (NEW), licq-qt4-gui.desktop (NONE -> 1.1) (NEW), licq-1.3.5-dos.patch (1.1 -> NONE) (REMOVED), licq-c++.patch (1.3 -> NONE) (REMOVED), licq-logonfix.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/licq/licq.spec diff -u packages/licq/licq.spec:1.115 packages/licq/licq.spec:1.116 --- packages/licq/licq.spec:1.115 Wed Jul 2 20:29:07 2008 +++ packages/licq/licq.spec Sun Oct 25 14:50:16 2009 @@ -1,6 +1,7 @@ # $Revision$, $Date$ # TODO: # - subpackage with licqweb +%bcond_with qt3 Summary: An ICQ client for online messaging Summary(es.UTF-8): licq es un clone del ICQ(tm) escrito Summary(pl.UTF-8): Klient ICQ do przesyłania wiadomości po sieci @@ -8,28 +9,33 @@ Summary(ru.UTF-8): Клон ICQ для онлайновго обмена сообщениями Summary(uk.UTF-8): Клон ICQ для онлайновго обміну повідомленнями Name: licq -Version: 1.3.5 -Release: 3 +Version: 1.3.7 +Release: 1 License: GPL Group: Applications/Communications Source0: http://dl.sourceforge.net/licq/%{name}-%{version}.tar.bz2 -# Source0-md5: 842a73c82980721961fe824f40377292 +# Source0-md5: 28a69f8e01f06715d990a52674379766 Source1: %{name}-qt-gui.desktop Source2: %{name}-kde-gui.desktop -Patch0: %{name}-1.3.5-dos.patch -Patch1: %{name}-c++.patch -Patch2: %{name}-logonfix.patch +Source3: %{name}-qt4-gui.desktop +Source4: %{name}-kde4-gui.desktop URL: http://www.licq.org/ BuildRequires: automake +BuildRequires: boost-devel >= 1.33.1 BuildRequires: cdk-devel >= 5.0 +BuildRequires: cmake BuildRequires: gettext-devel BuildRequires: gpgme-devel +%if %{with qt3} BuildRequires: kdelibs-devel +BuildRequires: qt-devel >= 3:3.0.5 +BuildRequires: qt-linguist +%endif +BuildRequires: QtGui-devel +BuildRequires: kde4-kdelibs-devel BuildRequires: libstdc++-devel BuildRequires: ncurses-devel >= 5.0 BuildRequires: openssl-devel >= 0.9.7d -BuildRequires: qt-devel >= 3:3.0.5 -BuildRequires: qt-linguist BuildRequires: xosd-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -150,6 +156,58 @@ Ten pakiet zawiera graficzny interfejs dla Licq, używający widgetów KDE. +%package qt4-gui-common +Summary: Common files for QT4 based GUI plugins +Summary(pl.UTF-8): Wspólne pliki dla wtyczek GUI opartych na QT4 +Group: Applications/Communications +Requires: %{name} = %{version}-%{release} + +%description qt4-gui-common +Common files for QT4 based GUI plugins. + +%description qt4-gui-common -l pl.UTF-8 +Wspólne pliki dla wtyczek GUI opartych na QT4. + +%package qt4-gui +Summary: Qt4 GUI for Licq +Summary(es.UTF-8): Qt4 user interface for licq +Summary(pl.UTF-8): Graficzne środowisko użytkownika dla Licq, wykorzystujące Qt4 +Summary(pt_BR.UTF-8): Interface Qt4 para o licq +Summary(ru.UTF-8): Qt4 интерфейс к licq +Summary(uk.UTF-8): Qt4 інтерфейс до licq +Group: Applications/Communications +Requires: %{name} = %{version}-%{release} +Requires: %{name}-qt4-gui-common = %{version}-%{release} + +%description qt4-gui +This package contains graphical interface for Licq, using Qt4 wigets. + +%description qt4-gui -l pl.UTF-8 +Ten pakiet zawiera graficzny interfejs dla Licq, używający widgetów +Qt4. + +%description qt4-gui -l uk.UTF-8 +Licq - це клон системи онлайнового обміну повідомленнями ICQ. +%{name}-qt4 - це графічний інтерфейс до licq написаний на Qt4. + +%description qt4-gui -l ru.UTF-8 +Licq - это клон системы онлайнового обмена сообщенями ICQ. %{name}-qt4 +- это графический интерфейс к licq написанный на Qt4. + +%package kde4-gui +Summary: KDE4 GUI for Licq +Summary(pl.UTF-8): Graficzny interfejs KDE4 dla Licq +Group: Applications/Communications +Requires: %{name} = %{version}-%{release} +Requires: %{name}-qt4-gui-common = %{version}-%{release} + +%description kde4-gui +This package contains graphical interface for Licq, using KDE4 wigets. + +%description kde4-gui -l pl.UTF-8 +Ten pakiet zawiera graficzny interfejs dla Licq, używający widgetów +KDE4. + %package text Summary: Text terminal user interface for Licq Summary(pl.UTF-8): Interfejs użytkownika dla Licq pod terminal tekstowy @@ -254,16 +312,14 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p0 -%patch2 -p0 find . -type d -name autom4te.cache | xargs rm -rf %build cp -pr plugins/qt-gui plugins/kde-gui +cp -pr plugins/qt4-gui plugins/kde4-gui # plugins/jons-gtk-gui -MODULES=". plugins/auto-reply plugins/console plugins/email plugins/msn plugins/osd plugins/kde-gui plugins/qt-gui plugins/rms" +MODULES=". plugins/auto-reply plugins/console plugins/email plugins/msn plugins/osd %{?with_qt3:plugins/kde-gui plugins/qt-gui} plugins/rms" BASE=$(pwd) @@ -280,11 +336,38 @@ cd $BASE done +for module in plugins/qt4-gui plugins/kde4-gui; do + cd $module + install -d build + cd build + %{cmake} \ + $([ "$module" = "plugins/kde4-gui" ] && echo -n "-DWITH_KDE=ON") \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DCONFIG_INSTALL_DIR=%{_datadir}/config \ + -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \ + -DDATA_INSTALL_DIR=%{_datadir}/apps \ + -DKCFG_INSTALL_DIR=%{_datadir}/config.kcfg \ + -DTEMPLATES_INSTALL_DIR=%{_datadir}/templates \ + -DHTML_INSTALL_DIR=%{_kdedocdir} \ +%if "%{_lib}" == "lib64" + -DLIB_SUFFIX=64 \ +%endif + -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \ + .. + cd $BASE +done + # build for module in $MODULES; do %{__make} cd $BASE done +for module in plugins/qt4-gui plugins/kde4-gui; do + cd $module/build + %{__make} + cd $BASE +done %install rm -rf $RPM_BUILD_ROOT @@ -292,14 +375,20 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -for d in plugins/{auto-reply,console,email,msn,osd,kde-gui,qt-gui,rms} ; do +for d in plugins/{auto-reply,console,email,msn,osd,%{?with_qt3:kde-gui,qt-gui,}rms}; do # plugins/jons-gtk-gui %{__make} -C $d install \ DESTDIR=$RPM_BUILD_ROOT done +for d in plugins/{kde4-gui,qt4-gui}; do + %{__make} -C $d/build install \ + DESTDIR=$RPM_BUILD_ROOT +done install -D %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/licq-qt_gui.desktop install -D %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/licq-kde_gui.desktop +install -D %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/licq-qt4_gui.desktop +install -D %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/licq-kde4_gui.desktop cp -f plugins/auto-reply/README doc/README.AUTOREPLY cp -f plugins/console/README doc/README.CONSOLE @@ -321,8 +410,8 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc doc/{BUGS,CHANGELOG,CREDITS,HINTS,*.HOWTO,TODO} README -%doc doc/README{2,-0.70-0.71,-0.61-0.70,-1.2.0,-1.3.0,.CodingStyle,.FIFO,.SOCKS} +%doc doc/{BUGS,CHANGELOG,CREDITS,HINTS,*.HOWTO} README +%doc doc/README{2,-0.70-0.71,-0.61-0.70,-1.2.0,-1.3.0,.FIFO,.SOCKS} %doc upgrade/* %attr(755,root,root) %{_bindir}/licq %attr(755,root,root) %{_bindir}/viewurl-* @@ -336,6 +425,7 @@ %defattr(644,root,root,755) %{_includedir}/licq +%if %{with qt3} %files qt-gui-common %defattr(644,root,root,755) %doc plugins/qt-gui/doc/* @@ -371,6 +461,46 @@ %defattr(644,root,root,755) %attr(755,root,root) %{plugindir}/licq_kde-gui.so %{_desktopdir}/licq-kde_gui.desktop +%endif + +%files qt4-gui-common +%defattr(644,root,root,755) +%doc plugins/qt-gui/doc/* +%dir %{_datadir}/licq/qt4-gui +%{_datadir}/licq/qt4-gui/dock +%{_datadir}/licq/qt4-gui/emoticons +%{_datadir}/licq/qt4-gui/exticons +%{_datadir}/licq/qt4-gui/icons +%{_datadir}/licq/qt4-gui/skins +%dir %{_datadir}/licq/qt4-gui/locale +%lang(be) %{_datadir}/licq/qt4-gui/locale/be*.qm +%lang(bg) %{_datadir}/licq/qt4-gui/locale/bg*.qm +%lang(cs) %{_datadir}/licq/qt4-gui/locale/cs*.qm +%lang(de) %{_datadir}/licq/qt4-gui/locale/de.qm +%lang(es) %{_datadir}/licq/qt4-gui/locale/es.qm +%lang(fi) %{_datadir}/licq/qt4-gui/locale/fi.qm +%lang(fr) %{_datadir}/licq/qt4-gui/locale/fr.qm +%lang(hu) %{_datadir}/licq/qt4-gui/locale/hu_HU.qm +%lang(it) %{_datadir}/licq/qt4-gui/locale/it.qm +%lang(ja) %{_datadir}/licq/qt4-gui/locale/ja_JP.qm +%lang(pl) %{_datadir}/licq/qt4-gui/locale/pl.qm +%lang(pt) %{_datadir}/licq/qt4-gui/locale/pt.qm +%lang(pt_BR) %{_datadir}/licq/qt4-gui/locale/pt_BR.qm +%lang(ru) %{_datadir}/licq/qt4-gui/locale/ru.qm +%lang(sr) %{_datadir}/licq/qt4-gui/locale/sr.qm +%lang(sv) %{_datadir}/licq/qt4-gui/locale/sv.qm +%lang(tr) %{_datadir}/licq/qt4-gui/locale/tr.qm +%lang(uk) %{_datadir}/licq/qt4-gui/locale/uk.qm + +%files qt4-gui +%defattr(644,root,root,755) +%attr(755,root,root) %{plugindir}/licq_qt4-gui.so +%{_desktopdir}/licq-qt4_gui.desktop + +%files kde4-gui +%defattr(644,root,root,755) +%attr(755,root,root) %{plugindir}/licq_kde4-gui.so +%{_desktopdir}/licq-kde4_gui.desktop %files text %defattr(644,root,root,755) @@ -413,6 +543,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.116 2009/10/25 13:50:16 arekm +- up to 1.3.7; new qt4-gui and kde4-gui packages; qt3/kde3 packages disabled (bcond) + Revision 1.115 2008/07/02 18:29:07 arekm - rel 3; fix build with new glibc/gcc; allow client to log in after aol blocking old clients ================================================================ Index: packages/licq/licq-kde4-gui.desktop diff -u /dev/null packages/licq/licq-kde4-gui.desktop:1.1 --- /dev/null Sun Oct 25 14:50:22 2009 +++ packages/licq/licq-kde4-gui.desktop Sun Oct 25 14:50:16 2009 @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Licq (KDE) +Comment=Unix/KDE ICQ clone +Comment[pl]=Klon ICQ pod Uniksa/KDE +Comment[pt]=Cliente Gráfico de ICQ +Comment[pt_BR]=Cliente Gráfico de ICQ +Exec=licq -p kde4-gui +Icon=licq +Terminal=false +Type=Application +Categories=Qt;Network;InstantMessaging; +# vi: encoding=utf-8 ================================================================ Index: packages/licq/licq-qt4-gui.desktop diff -u /dev/null packages/licq/licq-qt4-gui.desktop:1.1 --- /dev/null Sun Oct 25 14:50:22 2009 +++ packages/licq/licq-qt4-gui.desktop Sun Oct 25 14:50:16 2009 @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Licq (QT4) +Comment=Unix/Qt4 ICQ clone +Comment[pl]=Klon ICQ pod Uniksa/Qt4 +Comment[pt]=Cliente Gráfico de ICQ +Comment[pt_BR]=Cliente Gráfico de ICQ +Exec=licq -p qt4-gui +Icon=licq +Terminal=false +Type=Application +Categories=Qt;Network;InstantMessaging; +# vi: encoding=utf-8 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/licq/licq.spec?r1=1.115&r2=1.116&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
