[kadu] * Tue Jan 03 2012 Radoslaw Lisowski <radoslaw.lisowski at gmail.com> - 0.10.1-1 - Upgrade to 0.10.1 ver
Radosław Lisowski
radekl at fedoraproject.org
Tue Jan 3 23:15:41 UTC 2012
commit 804e7934b2febf235f4a0a3e767b91303b856d89
Author: Radek Lisowski <radoslaw.lisowski at gmail.com>
Date: Wed Jan 4 00:15:04 2012 +0100
* Tue Jan 03 2012 Radoslaw Lisowski <radoslaw.lisowski at gmail.com> - 0.10.1-1
- Upgrade to 0.10.1 version of Kadu
- Cleaning up most of mess in kadu.spec file
- Rewriting Provides/Obsoletes
- Dropping falf_mediaplayer and mprisplayer_mediaplayer module
.gitignore | 11 +
kadu-0.6.5-voice-external-libgsm.patch | 25 --
kadu-dso.patch | 12 -
kadu-mail-qlinkedlist.patch | 11 -
kadu-moduledir.patch | 18 --
kadu-stath.patch | 12 -
kadu.spec | 510 +++++++++++++++-----------------
sources | 21 +-
8 files changed, 267 insertions(+), 353 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 926e367..d4097ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,14 @@ kadu-stath.patch
kadu-moduledir.patch
kadu-dso.patch
kadu.spec
+/anonymous_check-0.10.1-1a.tar.bz2
+/globalhotkeys-0.10-27.tar.gz
+/import_history-0.10.0.tar.bz2
+/kadu-0.10.1.tar.bz2
+/lednotify-0.10-31.tar.gz
+/messagessplitter-0.10-2.tar.gz
+/mime_tex-0.10.1-2a.tar.bz2
+/networkping-0.10-2.tar.gz
+/nextinfo-0.10-7.tar.gz
+/panelkadu-0.10-8.tar.gz
+/senthistory-0.10-9.tar.gz
diff --git a/kadu.spec b/kadu.spec
index 1f07896..f7344d0 100644
--- a/kadu.spec
+++ b/kadu.spec
@@ -12,19 +12,11 @@
%define unpack_module_source() \
%if %{with %2}\
-%setup -q -D -T -a %1 -n kadu/modules\
-sed "s#^module_%2=.#module_%2=m#" -i ../.config\
+%setup -q -D -T -a %1 -n kadu-%{version}/plugins\
+sed -e '2a %2' -i ../Plugins.cmake\
%endif\
%nil
-# enable_module():
-# enable these internal modules which are not
-# enabled by default
-
-%define enable_module() \
-sed "s#^module_%1=.#module_%1=m#" -i ./.config\
-%nil
-
# module_files():
# both internal and external modules have at least their .so, .ui,
# .desc and .qm files. In order to simplify things, this macro
@@ -40,65 +32,46 @@ sed "s#^module_%1=.#module_%1=m#" -i ./.config\
# a module owns.
%define module_files(d,c,t) \
-%{_libdir}/kadu/modules/lib%{1}.so\
-%{_datadir}/kadu/modules/%1.desc\
+%{_libdir}/kadu/plugins/lib%{1}.so\
+%{_datadir}/kadu/plugins/%1.desc\
%if "%{-c}" \
-%{_datadir}/kadu/modules/configuration/%1.ui\
+%{_datadir}/kadu/plugins/configuration/%1.ui\
%endif\
%if "%{-t}" \
-%{_datadir}/kadu/modules/translations/%{1}*.qm\
+%{_datadir}/kadu/plugins/translations/%{1}*.qm\
%endif\
%if "%{-d}" \
-%{_datadir}/kadu/modules/data/%1\
+%{_datadir}/kadu/plugins/data/%1\
%endif\
%nil
# kadu.spec
# table to make it possible to find out quickly which
# subpackage has which source's number
-# LAST NUMBER: 120
+# LAST NUMBER: 204
# 117 anonymous_check
# 102 globalhotkeys
-# 104 led_notify
-# 111 mail
+# 200 import_history
+# 104 lednotify
+# 203 messagessplitter
# 112 mime_tex
-# 115 osd_hints
+# 201 networkping
+# 202 nextinfo
# 114 panelkadu
-# 105 plus_pl_sms
-# 118 powerkadu
-# 103 senthistory
-# 120 split_messages
-# 106 tabs
-# the modules above aren't all external modules
-# so here's the full list
-# anonymous_check
-# globalhotkeys
-# led_notify
-# mail
-# mime_tex
-# panelkadu
-# plus_pl_sms
-# powerkadu
-# senthistory
-# split_messages
-# tabs
+# 204 senthistory
# whether we want to build certain subpackages or not
-# some of them are disabled by default due to
-# not being adjusted to kadu-0.6.5
%bcond_without anonymous_check
%bcond_without globalhotkeys
-%bcond_without led_notify
-%bcond_without mail
+%bcond_without import_history
+%bcond_without lednotify
+%bcond_without messagessplitter
%bcond_without mime_tex
-%bcond_without osd_hints
+%bcond_without networkping
+%bcond_without nextinfo
%bcond_without panelkadu
-%bcond_without plus_pl_sms
-%bcond_without powerkadu
%bcond_without senthistory
-%bcond_without split_messages
-%bcond_without tabs
%if ! %{with opt}
@@ -106,64 +79,63 @@ Name: kadu
%else
Name: kadu_opt
%endif
-Version: 0.6.5.4
-Release: 6%{?dist}
+Version: 0.10.1
+Release: 1%{?dist}
Summary: An Gadu-Gadu client for online messaging
Summary(pl): Klient Gadu-Gadu
Group: Applications/Internet
License: GPLv2+
URL: http://www.kadu.net
-Source0: http://www.kadu.net/download/stable/kadu-%{version}.tar.bz2
+Source0: http://download.kadu.im/stable/kadu-%{version}.tar.bz2
# external modules:
%if %{with anonymous_check}
-Source117: http://kadu.net/~patryk/anonymous_check/anonymous_check-0.6.5.3-1.tar.bz2
+Source117: http://download.kadu.im/external-plugins/anonymous_check/anonymous_check-0.10.1-1a.tar.bz2
%endif
%if %{with globalhotkeys}
-Source102: http://www.ultr.pl/kadu/globalhotkeys-0.6.5-15.tar.gz
+Source102: http://ultr.pl/kadu/globalhotkeys-0.10-27.tar.gz
%endif
-%if %{with led_notify}
-Source104: http://kadu.net/~blysk/led_notify-0.23.tar.bz2
+%if %{with import_history}
+Source200: http://kicer.sileman.net.pl/kadu/import_history-0.10.0.tar.bz2
%endif
-%if %{with mail}
-Source111: http://kadu.net/~michal/mail/mail-0.3.6.tar.bz2
+%if %{with lednotify}
+Source104: http://ultr.pl/kadu/lednotify-0.10-31.tar.gz
%endif
-%if %{with plus_pl_sms}
-Source105: http://kadu.net/~patryk/plus_pl_sms/plus_pl_sms-plus_pl_sms-0.6.5.4-1.tar.bz2
+%if %{with messagessplitter}
+Source203: http://ultr.pl/kadu/messagessplitter-0.10-2.tar.gz
%endif
%if %{with mime_tex}
-Source112: http://kadu.net/~patryk/mime_tex/mime_tex-0.6.5.3.tar.bz2
+Source112: http://download.kadu.im/external-plugins/mime_tex/mime_tex-0.10.1-2a.tar.bz2
+%endif
+%if %{with networkping}
+Source201: http://ultr.pl/kadu/networkping-0.10-2.tar.gz
+%endif
+%if %{with nextinfo}
+Source202: http://ultr.pl/kadu/nextinfo-0.10-7.tar.gz
%endif
%if %{with panelkadu}
-Source114: http://www.ultr.pl/kadu/panelkadu-0.6.5-5.tar.gz
+Source114: http://ultr.pl/kadu/panelkadu-0.10-8.tar.gz
%endif
%if %{with senthistory}
-Source103: http://www.ultr.pl/kadu/senthistory-0.6.5-5.tar.gz
-%endif
-%if %{with tabs}
-Source106: http://www.kadu.net/~weagle/tabs/kadu-tabs-1.2.7.tar.bz2
+Source204: http://ultr.pl/kadu/senthistory-0.10-9.tar.gz
%endif
-#Patch0: kadu-0.6.0-xmmsfix.patch
-Patch0: kadu-0.6.5-voice-external-libgsm.patch
-Patch1: kadu-mail-qlinkedlist.patch
-Patch2: kadu-stath.patch
-Patch3: kadu-moduledir.patch
-Patch4: kadu-dso.patch
-# http://www.kadu.net/forum/viewtopic.php?t=9862 (in Polish)
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: cmake
+BuildRequires: cmake
BuildRequires: libpng-devel libsndfile-devel openssl-devel
BuildRequires: qt-devel
-BuildRequires: libgadu-devel >= 1.9.0-0.2.rc2
-BuildRequires: gsm-devel
-BuildRequires: desktop-file-utils
+BuildRequires: libgadu-devel >= 1.11.0
+BuildRequires: desktop-file-utils
BuildRequires: enchant-devel alsa-lib-devel
-BuildRequires: libao-devel
BuildRequires: libXScrnSaver-devel
BuildRequires: qca2-devel
# F-14+: qt-webkit-devel splits from qt-devel
BuildRequires: qt4-webkit-devel
+BuildRequires: libmpdclient-devel
+BuildRequires: phonon phonon-devel
+BuildRequires: libidn libidn-devel
+BuildRequires: sqlite sqlite-devel
Obsoletes: %{name}-ext_info < 0.6.0-0.1.alpha1
Obsoletes: %{name}-iwait4u < 0.6.0-0.1.alpha1
Obsoletes: %{name}-wmaker_docking < 0.6.0-0.1.alpha1
@@ -172,57 +144,36 @@ Obsoletes: %{name}-arts_sound < 0.6.5-0.1.rc2
Obsoletes: %{name}-dcopexport < 0.6.5-0.1.rc2
#dropped, there is no more DCOP in QT4
Obsoletes: %{name}-agent < 0.6.5-2
-Obsoletes: %{name}-alsa_sound < 0.6.5-2
-Provides: %{name}-alsa_sound = %{version}-%{release}
-Obsoletes: %{name}-advanced_userlist < 0.6.0-0.1.alpha1
-Provides: %{name}-advanced_userlist = %{version}-%{release}
+Obsoletes: %{name}-alsa_sound < 0.10.1-1
+Obsoletes: %{name}-advanced_userlist < 0.10.1-1
Obsoletes: %{name}-amarok_mediaplayer < 0.6.5-2
-Obsoletes: %{name}-antistring < 0.6.5-2
-Provides: %{name}-antistring = %{version}-%{release}
+Obsoletes: %{name}-antistring < 0.10.1-1
Obsoletes: %{name}-audacious_mediaplayer < 0.6.5-2
-Obsoletes: %{name}-exec_notify < 0.6.0-0.1.alpha1
-Provides: %{name}-exec_notify = %{version}-%{release}
-Obsoletes: %{name}-cenzor < 0.6.5-1
-Provides: %{name}-cenzor = %{version}-%{release}
+Obsoletes: %{name}-exec_notify < 0.10.1-1
+Obsoletes: %{name}-cenzor < 0.10.1-1
Obsoletes: %{name}-devel < 0.6.5-0.1.rc2
-Obsoletes: %{name}-ao_sound < 0.6.5-0.1.rc2
-Provides: %{name}-ao_sound = %{version}-%{release}
-Obsoletes: %{name}-autostatus < 0.6.5-0.1.rc2
-Provides: %{name}-autostatus = %{version}-%{release}
-Obsoletes: %{name}-auto_hide < 0.6.5-0.1.rc2
-Provides: %{name}-auto_hide = %{version}-%{release}
+Obsoletes: %{name}-ao_sound < 0.10.1-1
+Obsoletes: %{name}-autostatus < 0.10.1-1
+Obsoletes: %{name}-auto_hide < 0.10.1-1
Obsoletes: %{name}-esd_sound < 0.6.5-2
Obsoletes: %{name}-falf_mediaplayer < 0.6.5-2
-Obsoletes: %{name}-filedesc < 0.6.5-0.1.rc2
-Provides: %{name}-filedesc = %{version}-%{release}
-Obsoletes: %{name}-filtering < 0.6.5-0.1.rc2
-Provides: %{name}-filtering = %{version}-%{release}
-Obsoletes: %{name}-firewall < 0.6.5-0.1.rc2
-Provides: %{name}-firewall = %{version}-%{release}
-Obsoletes: %{name}-last_seen < 0.6.5-0.1.rc2
-Provides: %{name}-last_seen = %{version}-%{release}
+Obsoletes: %{name}-filedesc < 0.10.1-1
+Obsoletes: %{name}-filtering < 0.10.1-1
+Obsoletes: %{name}-firewall < 0.10.1-1
+Obsoletes: %{name}-last_seen < 0.10.1-1
Obsoletes: %{name}-mediaplayer < 0.6.5-0.1.rc2
Obsoletes: %{name}-mx610_notify < 0.6.5-2
-Obsoletes: %{name}-osd_hints < 0.6.5.4-1
-Provides: %{name}-osd_hints = %{version}-%{release}
-Obsoletes: %{name}-parser_extender < 0.6.5-0.1.rc2
-Provides: %{name}-parser_extender = %{version}-%{release}
-Obsoletes: %{name}-pcspeaker < 0.6.5-0.1.rc2
-Provides: %{name}-pcspeaker = %{version}-%{release}
-Obsoletes: %{name}-powerkadu < 0.6.5.4-1
-Provides: %{name}-powerkadu = %{version}-%{release}
-Obsoletes: %{name}-profiles < 0.6.5-0.1.rc2
-Provides: %{name}-profiles = %{version}-%{release}
-Obsoletes: %{name}-screenshot < 0.6.5-1
-Provides: %{name}-screenshot = %{version}-%{release}
+Obsoletes: %{name}-osd_hints < 0.10.1-1
+Obsoletes: %{name}-parser_extender < 0.10.1-1
+Obsoletes: %{name}-pcspeaker < 0.10.1-1
+Obsoletes: %{name}-powerkadu < 0.10.1-1
+Obsoletes: %{name}-profiles < 0.10.1-1
+Obsoletes: %{name}-screenshot < 0.10.1-1
Obsoletes: %{name}-spellchecker < 0.6.5-1
-Provides: %{name}-spellchecker = %{version}-%{release}
-Obsoletes: %{name}-split_messages < 0.6.5.4-1
-Provides: %{name}-split_messages = %{version}-%{release}
+Obsoletes: %{name}-split_messages < 0.10.1-1
Obsoletes: %{name}-water_notify < 0.6.5-2
Obsoletes: %{name}-weather < 0.6.5-2
-Obsoletes: %{name}-word_fix < 0.6.5-0.1.rc2
-Provides: %{name}-word_fix = %{version}-%{release}
+Obsoletes: %{name}-word_fix < 0.10.1-1
Obsoletes: %{name}-xmms_mediaplayer < 0.6.5-2
%description
@@ -234,11 +185,11 @@ Kadu to dynamicznie rozwijający się komunikator internetowy kompatybilny z
protokołem Gadu-Gadu.
%package anonymous_check
-Summary: Automatic lookup of an interlocutor in public directory
-Summary(pl): Automatyczne wyszukiwanie nieznajomych w katalogu
-Group: Applications/Internet
-License: GPLv2+
-Requires: %{name} = %{version}-%{release}
+Summary: Automatic lookup of an interlocutor in public directory
+Summary(pl): Automatyczne wyszukiwanie nieznajomych w katalogu
+Group: Applications/Internet
+License: GPLv2+
+Requires: %{name} = %{version}-%{release}
%description anonymous_check
Anonymous_check is a module for Kadu to automatic lookup who is an interlocutor
@@ -249,11 +200,11 @@ Anonymous_check to moduł dla Kadu, który automatycznie sprawdza dane w publicz
katalogu nieznajomego, gdy ten zagada.
%package globalhotkeys
-Summary: Global hotkeys support to Kadu
-Summary(pl): Obsługa skrótów globalnych do Kadu
-Group: Applications/Internet
-License: GPLv3+
-Requires: %{name} = %{version}-%{release}
+Summary: Global hotkeys support to Kadu
+Summary(pl): Obsługa skrótów globalnych do Kadu
+Group: Applications/Internet
+License: GPLv3+
+Requires: %{name} = %{version}-%{release}
%description globalhotkeys
Globalhotkeys is a module that adds support to global
@@ -263,40 +214,62 @@ hotkeys in Kadu.
Globalhotkeys to moduł dodający obsługę skrótów globalnych
w Kadu.
-%package led_notify
+%package import_history
+Summary: Imports history from origin GG client.
+Summary(pl): Importuje historię z oryginalnego klienta GG
+Group: Applications/Internet
+License: GPLv3+
+Requires: %{name} = %{version}-%{release}
+
+%description import_history
+Importhistory allows you to fetch history from original Gadu-Gadu client.
+Since it has not been reliably tested yet, it's good to make a copy of your
+Kadu actual history. Be aware of repeatedly import of the same history as
+the entries will be multiplied!
+
+%description import_history -l pl
+Wtyczka import_history pozwala w chwili obecnej na import historii z wszystkich
+oryginalnych klientów GG. Ponieważ nie została jeszcze solidnie przetestowana,
+przed wykonaniem importu zalecam stworzenie kopii historii kadu. Należy również
+pamiętać o tym, że wielokrotne importowanie tej samej historii powoduje powielanie
+wpisów w historii kadu.
+
+
+%package lednotify
Summary: Notification by Scroll Lock LED
Summary(pl): Powiadamianie diodą Scroll Lock
Group: Applications/Internet
-License: GPLv2+
+License: GPLv2+
Requires: %{name} = %{version}-%{release}
-%description led_notify
+%description lednotify
Led_notify is a module for Kadu, to notify user of some events using Scroll Lock
LED.
-%description led_notify -l pl
+%description lednotify -l pl
Led_notify to moduł dla Kadu umożliwiający powiadamianie użytkownika o pewnych
zdarzenia przy użyciu diody Scroll Lock.
-%package mail
-Summary: Mail checking module for Kadu
-Summary(pl): Moduł do sprawdzania poczty dla Kadu
-Group: Applications/Internet
-License: GPLv2+
-Requires: %{name} = %{version}-%{release}
-%description mail
-Mail is a module for Kadu to check whether there are new mails.
+%package messagessplitter
+Summary: Automatically splitting too long messages
+Summary(pl): Automatycznie dzieli za długie wiadomości
+Group: Applications/Internet
+License: GPLv3+
+Requires: %{name} = %{version}-%{release}
+
+%description messagessplitter
+This extension automatically splits too long messages. Brings the same functionality as an old module split_messages.
-%description mail -l pl
-Mail to moduł dla Kadu do sprawdzania czy są nowe maile.
+%description messagessplitter -l pl
+Wtyczka automatycznie dzieli za długie wiadomości. Dostarcza podobną funkcjonalność co stary moduł split_messages.
%package mime_tex
Summary: TeX formulas support in Kadu
Summary(pl): Obsługa formuł matematycznych TeX w Kadu
-Group: Applications/Internet
-License: GPLv2+
-Requires: %{name} = %{version}-%{release}
+Group: Applications/Internet
+License: GPLv2+
+Requires: %{name} = %{version}-%{release}
%description mime_tex
Mime_tex is a module for Kadu to edit TeX mathematic formulas in chat window.
@@ -305,29 +278,44 @@ Mime_tex is a module for Kadu to edit TeX mathematic formulas in chat window.
Mime_tex to moduł dla Kadu umożliwiający edycję formuł matematycznych TeX
w oknie rozmowy.
-%package plus_pl_sms
-Summary: Miasto Plusa SMS gateway support in Kadu
-Summary(pl): Obsługa bramki SMS Miasto Plusa w Kadu
+%package networkping
+Summary: Automatically reconnects when connection is lost.
+Summary(pl): Automatyczne rozlaczanie i wznawianie polaczenia z serwerem
Group: Applications/Internet
-License: GPLv2+
+License: GPLv3+
Requires: %{name} = %{version}-%{release}
-Obsoletes: %{name}-miastoplusa_sms < 0.6.5-0.1.rc2
-Provides: %{name}-miastoplusa_sms = %{version}-%{release}
-BuildRequires: curl-devel
-%description plus_pl_sms
-Plus_pl_sms is a module for Kadu to support Plus.pl SMS Gateway.
+%description networkping
+This extension frequently pings server in order to reconnect when it's needed.
+
+%description networkping -l pl
+Wtyczka sprawdza okresowo dostępność sieci i automatycznie rozłącza i wznawia
+połączenia z serwerami protokołów.
+
+%package nextinfo
+Summary: Allows to save more information about your contacts
+Summary(pl): Pozwala na zapisanie dodatkowych informacji o znajomych.
+Group: Applications/Internet
+License: GPLv3+
+Requires: %{name} = %{version}-%{release}
+
+%description nextinfo
+Nextinfo adds a possibility to store more information about your friends.
+Before the same functionality was offered by ext_info module.
+
+%description nextinfo -l pl
+Wtyczka dodaje do Kadu możliwość przechowywania dodatkowych informacji o znajomych.
+Wcześniej taką funkcjonalność zapewniał moduł ext_info, na którym częściowo wzorowane
+jest NextInfo.
-%description plus_pl_sms -l pl
-Plus_pl_sms to moduł dla Kadu umożliwiający obsługę bramki SMS-owej "Plus.pl".
%package panelkadu
Summary: Makes a panel from Kadu main window
Summary(pl): Zamienia Kadu w panel na skraju ekranu
-Group: Applications/Internet
-License: GPLv3+
-Requires: %{name} = %{version}-%{release}
-BuildRequires: libXtst-devel
+Group: Applications/Internet
+License: GPLv3+
+Requires: %{name} = %{version}-%{release}
+BuildRequires: libXtst-devel
%description panelkadu
Panelkadu is a module to make a panel from Kadu main window.
@@ -350,92 +338,52 @@ chat windows in Kadu.
Senthistory to moduł, który dodaje historię wysłanych wiadomości
do okien rozmowy w Kadu.
-%package tabs
-Summary: Tabbed chat dialog in Kadu
-Summary(pl): Okno rozmowy z zakładkami w Kadu
+%package devel
+Summary: Header files for development of kadu
+Summary(pl): Pliki nagłówkowe wymagane do rozwijania kadu
Group: Applications/Internet
-License: GPLv2+
+License: GPLv3+
Requires: %{name} = %{version}-%{release}
-%description tabs
-Tabs is a module for Kadu to add a feature to use one window to talk with all
-people and use cards to switch them.
-
-%description tabs -l pl
-Tabs to moduł dla Kadu dodający możliwość prowadzenia rozmów w jednym oknie,
-w którym pomiędzy poszczególnymi rozmówcami przełącza się przy pomocy
-zakładek.
+%description devel
+A set of header files for programmers willing to develop kadu.
+%description devel -l pl
+Zestaw plików nagłówkowych dla programistów chcących rozwijać kadu.
%prep
-%setup -q -n kadu
+%setup -q -n kadu-%{version}
%unpack_module_source 117 anonymous_check
%unpack_module_source 102 globalhotkeys
-%unpack_module_source 104 led_notify
-%unpack_module_source 111 mail
+%unpack_module_source 200 import_history
+%unpack_module_source 104 lednotify
+%unpack_module_source 203 messagessplitter
%unpack_module_source 112 mime_tex
+%unpack_module_source 201 networkping
+%unpack_module_source 202 nextinfo
%unpack_module_source 114 panelkadu
-%unpack_module_source 105 plus_pl_sms
-%unpack_module_source 103 senthistory
-%unpack_module_source 106 tabs
-%setup -q -D -T -n kadu
-
-#internal modules
-%enable_module alsa_sound
-%enable_module amarok2_mediaplayer
-%enable_module antistring
-%enable_module ao_sound
-%enable_module auto_hide
-%enable_module autostatus
-%enable_module cenzor
-%enable_module filedesc
-%enable_module filtering
-%enable_module firewall
-%enable_module gg_avatars
-%enable_module last_seen
-%enable_module qt4_docking
-%enable_module qt4_sound
-%enable_module osd_hints
-%enable_module parser_extender
-%enable_module pcspeaker
-%enable_module powerkadu
-%enable_module profiles
-%enable_module screenshot
-%enable_module spellchecker
-%enable_module split_messages
-%enable_module word_fix
-
-# exec_notify and ext_sound have always been standard modules
-# so let's keep it this way
-sed "s#^module_exec_notify=.#module_exec_notify=m#" -i .config
-sed "s#^module_ext_sound=.#module_ext_sound=m#" -i .config
-
-sed "s#^icons_glass16=.#icons_glass16=n#" -i .config
-sed "s#^icons_glass22=.#icons_glass22=n#" -i .config
+%unpack_module_source 204 senthistory
+%setup -q -D -T -n kadu-%{version}
+
#amarok 1.x is long gone, don't build it
-sed "s#^module_amarok1_mediaplayer=.#module_amarok1_mediaplayer=n#" -i .config
+sed '/amarok1_mediaplayer/d' -i Plugins.cmake
+# No falf player either
+sed '/falf_mediaplayer/d' -i Plugins.cmake
+# Neither mpris player is available in fedora
+sed '/mprisplayer_mediaplayer/d' -i Plugins.cmake
#let's not annoy users with update notifies
#and disable them
pushd kadu-core
-sed "/CheckUpdates/s#true#false#" -i kadu.cpp
+sed "/CheckUpdates/s#true#false#" -i core/core.cpp
popd
# force the right lib path and set DETAILED_VERSION
sed 's#set (LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)#set (LIBDIR %{_libdir})#' -i CMakeLists.txt
sed 's@#define DETAILED.*@#define DETAILED_VERSION "%{name}-%{version}-%{release}"@' -i kadu-config.h.cmake
-# fix mediaplayer plugin bug
-#echo 'install (FILES "data/mediaplayer.png" DESTINATION "share/kadu/modules/data/mediaplayer")' >> modules/mediaplayer/CMakeLists.txt
-
-%patch0
-%patch1 -p1 -b .qlinkedlist
-%patch2 -p0 -b .stath
-%patch3 -p1 -b .moduledir
-%patch4 -p1 -b .dso
-
%build
%{cmake} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_USE_PTHREADS:BOOL=ON -DBUILD_DESCRIPTION="Fedora" .
make -k VERBOSE=1 %{?_smp_mflags}
@@ -475,7 +423,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/kadu
%{_datadir}/applications/fedora-kadu.desktop
%dir %{_libdir}/kadu
-%dir %{_libdir}/kadu/modules
+%dir %{_libdir}/kadu/plugins
%dir %{_datadir}/kadu
%{_datadir}/kadu/syntax
%{_datadir}/kadu/AUTHORS
@@ -485,96 +433,125 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/kadu/README
%{_datadir}/kadu/THANKS
%{_datadir}/kadu/configuration
-%dir %{_datadir}/kadu/modules
-%dir %{_datadir}/kadu/modules/configuration
-%dir %{_datadir}/kadu/modules/data
-%dir %{_datadir}/kadu/modules/translations
+%dir %{_datadir}/kadu/plugins
+%dir %{_datadir}/kadu/plugins/configuration
+%dir %{_datadir}/kadu/plugins/data
+%dir %{_datadir}/kadu/plugins/translations
%dir %{_datadir}/kadu/themes
%dir %{_datadir}/kadu/themes/emoticons
%{_datadir}/kadu/themes/emoticons/penguins
+%{_datadir}/kadu/themes/emoticons/tango
%dir %{_datadir}/kadu/themes/icons
+%{_datadir}/kadu/themes/icons/oxygen
+%{_datadir}/kadu/themes/icons/glass
%{_datadir}/kadu/themes/icons/default
%dir %{_datadir}/kadu/themes/sounds
%{_datadir}/kadu/themes/sounds/default
%{_datadir}/kadu/translations
-%{_datadir}/kadu/modules/docking.desc
-%{_datadir}/kadu/modules/configuration/docking.ui
-%{_datadir}/kadu/modules/translations/docking_*.qm
+%{_datadir}/kadu/plugins/docking.desc
+%{_datadir}/kadu/plugins/configuration/docking.ui
+%{_datadir}/kadu/plugins/translations/docking_*.qm
%{_datadir}/icons/hicolor/*/apps/kadu.png
+%{_datadir}/kadu/scripts/chat-scripts.js
+%{_datadir}/kadu/plugins/sdk/configuration-ui.xsl
+%{_datadir}/kadu/plugins/sdk/plugintsupdate.sh
# internal modules:
-%module_files account_management -t
-%module_files advanced_userlist -ct
-%module_files alsa_sound -ct
-%module_files amarok2_mediaplayer
+
%module_files antistring -cdt
-%module_files ao_sound
-%module_files audacious_mediaplayer
%module_files auto_hide -ct
%module_files autoaway -ct
%module_files autoresponder -ct
%module_files autostatus -ct
%module_files cenzor -cdt
-%module_files config_wizard -td
-%module_files dbus
-%module_files dcc -ct
-%module_files default_sms -ct
-%module_files dsp_sound -ct
-%module_files encryption -ct
+%module_files chat_notify -t
+%module_files config_wizard -t
+%module_files desktop_docking -ct
+%module_files encryption_ng -t
+%{_datadir}/kadu/plugins/configuration/encryption-ng.ui
+%module_files encryption_ng_simlite
%module_files exec_notify -t
%module_files ext_sound -ct
%module_files filedesc -ct
-%module_files filtering -cdt
%module_files firewall -ct
-%module_files gg_avatars -t
+%module_files freedesktop_notify -ct
+%module_files gadu_protocol -dt
%module_files hints -ct
+%{_datadir}/kadu/plugins/configuration/hint-over-user.ui
+%{_datadir}/kadu/plugins/configuration/hints-advanced.ui
+%{_datadir}/kadu/plugins/configuration/hints-notifier.ui
%module_files history -ct
+%module_files history_migration
%module_files idle
+%module_files imagelink -t
+%{_datadir}/kadu/plugins/configuration/image-link.ui
+%module_files jabber_protocol -ct
%module_files last_seen -t
%module_files mediaplayer -cdt
-%module_files notify -ct
+%module_files mpd_mediaplayer
+%{_datadir}/kadu/plugins/configuration/mpd_config.ui
+%module_files pcspeaker -t
+%module_files phonon_sound
+%module_files profiles_import -t
%module_files qt4_docking
-%module_files qt4_sound
-%module_files osd_hints -cdt
-%module_files parser_extender -ct
-%module_files pcspeaker -ct
-%module_files powerkadu -cdt
-%module_files profiles -t
+%module_files qt4_docking_notify -t
+%{_datadir}/kadu/plugins/configuration/qt4-docking-notify.ui
+%{_libdir}/kadu/plugins/libdocking.so
+%module_files qt4_sound -t
%module_files screenshot -ct
-%module_files sms -ct
+%module_files simpleview -ct
+%module_files single_window -ct
+%module_files sms -cdt
%module_files sound -ct
+%module_files speech -ct
%module_files spellchecker -ct
-%module_files split_messages -ct
-%module_files voice -ct
-%module_files window_notify -t
+%module_files sql_history -t
+%module_files tabs -ct
%module_files word_fix -cdt
+# devel module:
+%files devel
+%defattr(-, root, root, -)
+%dir %{_includedir}/kadu
+%{_includedir}/kadu/kadu-core/
+%{_includedir}/kadu/plugins/
+%{_datadir}/kadu/ChangeLog.OLD-PL
+%{_datadir}/cmake/Modules/FindKadu.cmake
+
# external modules:
%files anonymous_check
%defattr(-, root, root, -)
-%module_files anonymous_check -ct
+%module_files anonymous_check -t
%files globalhotkeys
%defattr(-, root, root, -)
%module_files globalhotkeys -ct
-%files led_notify
+%files import_history
%defattr(-, root, root, -)
-%module_files led_notify -ct
+%module_files import_history -t
-%files mail
+%files lednotify
%defattr(-, root, root, -)
-%module_files mail -ct
+%module_files lednotify -ct
-%files plus_pl_sms
+%files messagessplitter
%defattr(-, root, root, -)
-%module_files plus_pl_sms -cdt
+%module_files messagessplitter -ct
%files mime_tex
%defattr(-, root, root, -)
%module_files mime_tex -cdt
-%{_libdir}/kadu/modules/bin/mime_tex
+%{_libdir}/kadu/plugins/bin/mime_tex/mimetex
+
+%files networkping
+%defattr(-, root, root, -)
+%module_files networkping -ct
+
+%files nextinfo
+%defattr(-, root, root, -)
+%module_files nextinfo -ct
%files panelkadu
%defattr(-, root, root, -)
@@ -584,12 +561,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-, root, root, -)
%module_files senthistory -ct
-%files tabs
-%defattr(-, root, root, -)
-%module_files tabs -ct
%changelog
+* Tue Jan 03 2012 Radoslaw Lisowski <radoslaw.lisowski at gmail.com> - 0.10.1-1
+- Upgrade to 0.10.1 version of Kadu
+- Cleaning up most of mess in kadu.spec file
+- Rewriting Provides/Obsoletes
+- Dropping falf_mediaplayer and mprisplayer_mediaplayer module
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 3260d50..354550b 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,11 @@
-f6290d67c0f45b3f43ff3f35e780615f anonymous_check-0.6.5.3-1.tar.bz2
-2b28612576276fc2b87120093428965b globalhotkeys-0.6.5-15.tar.gz
-97cb72c0ab4b5cf897bfbfc3b5ac0379 kadu-0.6.5.4.tar.bz2
-f6eba5d0d75b79331101bf8ea438dc7e kadu-tabs-1.2.7.tar.bz2
-6abcc3ab992daeb9820f9156d8d76020 led_notify-0.23.tar.bz2
-85fdf695c7fbc58e607dc15278391ab3 mail-0.3.6.tar.bz2
-f15b1c1e8933c9ba5a81cc8e19aeadc7 mime_tex-0.6.5.3.tar.bz2
-139948fe1197ff8f2a2e0dd52bc2bfc8 panelkadu-0.6.5-5.tar.gz
-59f7ba01a63464818acaa5ff6fd176d5 plus_pl_sms-plus_pl_sms-0.6.5.4-1.tar.bz2
-a58b2be2ee7e4489dc80f629b7e6f8f3 senthistory-0.6.5-5.tar.gz
+7345932807b62630788bf014e9aec8d4 anonymous_check-0.10.1-1a.tar.bz2
+c0858dfb4160680b516e3140df2968a5 globalhotkeys-0.10-27.tar.gz
+440664a811e71f6574bc2ca21ca77f2b import_history-0.10.0.tar.bz2
+6211a9a9e02d645268cbf055892601a0 kadu-0.10.1.tar.bz2
+149a86a4646e6801ccb453f30f169153 lednotify-0.10-31.tar.gz
+14de43361e3bc149478a076874e024f2 messagessplitter-0.10-2.tar.gz
+8bf1c9652e923b6e61d12372208dbaea mime_tex-0.10.1-2a.tar.bz2
+89e6e278158fe6fcea628ded23cbd2fa networkping-0.10-2.tar.gz
+96005faf7c9eb88d578bb2f50c9e81c3 nextinfo-0.10-7.tar.gz
+26772365e6aa794bc6e8155a60c9d01d panelkadu-0.10-8.tar.gz
+0ec2a68a636f2428be1f20967fa23baf senthistory-0.10-9.tar.gz
More information about the scm-commits
mailing list