[kadu/f14/master] Update to 0.6.5.4 (f14)
Radosław Lisowski
radekl at fedoraproject.org
Sun Aug 22 20:45:21 UTC 2010
commit b5fc61e37914f9538e4efd67e66117be0fe2d8fd
Author: Radosław Lisowski <radoslaw.lisowski at gmail.com>
Date: Sun Aug 22 22:43:51 2010 +0200
Update to 0.6.5.4 (f14)
.gitignore | 9 ++
kadu-dso.patch | 12 ++
kadu-gcc44.patch | 20 ---
kadu-mail-qlinkedlist.patch | 11 ++
kadu-moduledir.patch | 18 +++
kadu-profiles-fix.patch | 11 --
kadu-stath.patch | 12 ++
kadu.desktop | 12 --
kadu.spec | 327 ++++++++++++++++--------------------------
sources | 21 ++--
10 files changed, 196 insertions(+), 257 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f052e18..a5ddd3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,12 @@ mime_tex-0.6.5.3.tar.bz2
panelkadu-0.6.5-3.tar.gz
plus_pl_sms-0.6.5.1.tar.bz2
senthistory-0.6.5-4.tar.gz
+anonymous_check-0.6.5.3-1.tar.bz2
+globalhotkeys-0.6.5-15.tar.gz
+kadu-0.6.5.4.tar.bz2
+kadu-tabs-1.2.7.tar.bz2
+led_notify-0.23.tar.bz2
+mail-0.3.6.tar.bz2
+panelkadu-0.6.5-5.tar.gz
+plus_pl_sms-plus_pl_sms-0.6.5.4-1.tar.bz2
+senthistory-0.6.5-5.tar.gz
diff --git a/kadu-dso.patch b/kadu-dso.patch
new file mode 100644
index 0000000..bf72964
--- /dev/null
+++ b/kadu-dso.patch
@@ -0,0 +1,12 @@
+diff -up kadu/kadu-core/CMakeLists.txt.dso kadu/kadu-core/CMakeLists.txt
+--- kadu/kadu-core/CMakeLists.txt.dso 2009-10-11 14:41:36.000000000 +0200
++++ kadu/kadu-core/CMakeLists.txt 2010-03-23 23:54:10.000000000 +0100
+@@ -163,7 +163,7 @@ endif (MINGW)
+ else (WIN32)
+ add_executable (kadu main.cpp main_unix.cpp ${kadu_SRCS} ${MOC_FILES})
+ set_target_properties (kadu PROPERTIES ENABLE_EXPORTS ON)
+- target_link_libraries (kadu ${STATIC_MODULES} ${QT_LIBRARIES} ${LIBGADU_LIBRARIES})
++ target_link_libraries (kadu ${STATIC_MODULES} ${QT_LIBRARIES} ${LIBGADU_LIBRARIES} -lX11 -ldl)
+ endif (WIN32)
+
+ install (TARGETS kadu DESTINATION bin)
diff --git a/kadu-mail-qlinkedlist.patch b/kadu-mail-qlinkedlist.patch
new file mode 100644
index 0000000..f0ac321
--- /dev/null
+++ b/kadu-mail-qlinkedlist.patch
@@ -0,0 +1,11 @@
+diff -up kadu/modules/mail/mail.h~ kadu/modules/mail/mail.h
+--- kadu/modules/mail/mail.h~ 2008-08-31 16:42:22.000000000 +0200
++++ kadu/modules/mail/mail.h 2010-03-18 01:32:50.000000000 +0100
+@@ -13,6 +13,7 @@
+
+ #include <QTimer>
+ #include <QString>
++#include <QLinkedList>
+
+ #include "main_configuration_window.h"
+ #include "../notify/notify.h"
diff --git a/kadu-moduledir.patch b/kadu-moduledir.patch
new file mode 100644
index 0000000..89f2ad7
--- /dev/null
+++ b/kadu-moduledir.patch
@@ -0,0 +1,18 @@
+diff -up kadu/modules/mime_tex/CMakeLists.txt.moduledir kadu/modules/mime_tex/CMakeLists.txt
+--- kadu/modules/mime_tex/CMakeLists.txt.moduledir 2009-02-22 17:08:39.000000000 +0100
++++ kadu/modules/mime_tex/CMakeLists.txt 2010-03-23 23:53:38.000000000 +0100
+@@ -215,4 +215,4 @@ else (mime_tex STREQUAL STATIC)
+ endif (WIN32)
+ endif (mime_tex STREQUAL STATIC)
+
+-install (TARGETS mime_tex DESTINATION lib/kadu/modules)
++install (TARGETS mime_tex DESTINATION ${MODULEDIR})
+diff -up kadu/modules/mime_tex/mimetex/CMakeLists.txt.moduledir kadu/modules/mime_tex/mimetex/CMakeLists.txt
+--- kadu/modules/mime_tex/mimetex/CMakeLists.txt.moduledir 2009-02-22 17:08:39.000000000 +0100
++++ kadu/modules/mime_tex/mimetex/CMakeLists.txt 2010-03-23 23:53:38.000000000 +0100
+@@ -6,4 +6,4 @@ add_definitions(-DAA)
+
+ add_executable(mimetex ${SOURCES})
+ target_link_libraries(mimetex m)
+-install (TARGETS mimetex DESTINATION lib/kadu/modules/bin/mime_tex)
++install (TARGETS mimetex DESTINATION ${MODULEDIR}/bin/mime_tex)
diff --git a/kadu-stath.patch b/kadu-stath.patch
new file mode 100644
index 0000000..4a9f17f
--- /dev/null
+++ b/kadu-stath.patch
@@ -0,0 +1,12 @@
+Index: kadu-core/main.cpp
+===================================================================
+--- kadu-core/main.cpp (wersja 7321)
++++ kadu-core/main.cpp (wersja 7322)
+@@ -15,6 +15,7 @@
+ #include <errno.h>
+ #ifndef Q_WS_WIN
+ #include <sys/file.h>
++#include <sys/stat.h>
+ #include <pwd.h>
+ #else
+ #include <winsock2.h>
diff --git a/kadu.spec b/kadu.spec
index 787869e..20ea7d6 100644
--- a/kadu.spec
+++ b/kadu.spec
@@ -106,71 +106,64 @@ Name: kadu
%else
Name: kadu_opt
%endif
-Version: 0.6.5.2
-Release: 3%{?dist}
+Version: 0.6.5.4
+Release: 4%{?dist}
Summary: An Gadu-Gadu client for online messaging
Summary(pl): Klient Gadu-Gadu
Group: Applications/Internet
-License: GPLv2
+License: GPLv2+
URL: http://www.kadu.net
Source0: http://www.kadu.net/download/stable/kadu-%{version}.tar.bz2
-Source3: kadu.desktop
# external modules:
%if %{with anonymous_check}
-Source117: http://kadu.net/~patryk/anonymous_check/anonymous_check-0.6.5.1.tar.bz2
+Source117: http://kadu.net/~patryk/anonymous_check/anonymous_check-0.6.5.3-1.tar.bz2
%endif
%if %{with globalhotkeys}
-Source102: http://www.ultr.pl/kadu/globalhotkeys-0.6.5-10.tar.gz
+Source102: http://www.ultr.pl/kadu/globalhotkeys-0.6.5-15.tar.gz
%endif
%if %{with led_notify}
-Source104: http://kadu.net/~blysk/led_notify-0.21.tar.bz2
+Source104: http://kadu.net/~blysk/led_notify-0.23.tar.bz2
%endif
%if %{with mail}
-Source111: http://kadu.net/~michal/mail/mail-current.tar.bz2
+Source111: http://kadu.net/~michal/mail/mail-0.3.6.tar.bz2
%endif
%if %{with plus_pl_sms}
-Source105: http://kadu.net/~patryk/plus_pl_sms/plus_pl_sms-0.6.5.1.tar.bz2
+Source105: http://kadu.net/~patryk/plus_pl_sms/plus_pl_sms-plus_pl_sms-0.6.5.4-1.tar.bz2
%endif
%if %{with mime_tex}
-Source112: http://kadu.net/~patryk/mime_tex/mime_tex-0.6.5.3.tar.bz2
-%endif
-%if %{with osd_hints}
-Source115: http://www.kadu.net/~dorr/moduly/kadu-osd_hints-0.1.3.tar.bz2
+Source112: http://kadu.net/~patryk/mime_tex/mime_tex-0.6.5.3.tar.bz2
%endif
%if %{with panelkadu}
-Source114: http://www.ultr.pl/kadu/panelkadu-0.6.5-3.tar.gz
-%endif
-%if %{with powerkadu}
-Source118: http://www.kadu.net/~dorr/moduly/kadu-powerkadu-2.1.2.tar.bz2
+Source114: http://www.ultr.pl/kadu/panelkadu-0.6.5-5.tar.gz
%endif
%if %{with senthistory}
-Source103: http://www.ultr.pl/kadu/senthistory-0.6.5-4.tar.gz
-%endif
-%if %{with split_messages}
-Source120: http://www.kadu.net/~dorr/moduly/kadu-split_messages-0.3.tar.bz2
+Source103: http://www.ultr.pl/kadu/senthistory-0.6.5-5.tar.gz
%endif
%if %{with tabs}
-Source106: http://www.kadu.net/~arvenil/tabs/download/0.6.5/kadu-tabs-1.2.3.tar.bz2
+Source106: http://www.kadu.net/~weagle/tabs/kadu-tabs-1.2.7.tar.bz2
%endif
#Patch0: kadu-0.6.0-xmmsfix.patch
Patch0: kadu-0.6.5-voice-external-libgsm.patch
-Patch1: kadu-gcc44.patch
-# Sent to kadu-security [AT] kadu [DOT] net on 2009/04/24
-Patch2: kadu-profiles-fix.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: libpng-devel libsndfile-devel openssl-devel
BuildRequires: qt-devel
-BuildRequires: libgadu-devel > 1.8.0
+BuildRequires: libgadu-devel >= 1.9.0-0.2.rc2
BuildRequires: gsm-devel
BuildRequires: desktop-file-utils
-BuildRequires: aspell-devel alsa-lib-devel
+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
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
@@ -210,24 +203,28 @@ Obsoletes: %{name}-last_seen < 0.6.5-0.1.rc2
Provides: %{name}-last_seen = %{version}-%{release}
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}-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}-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}-xmms_mediaplayer < 0.6.5-2
-
-
%description
Kadu is a dynamically evolving instant messenger compatible with the Gadu-Gadu
protocol.
@@ -236,217 +233,139 @@ protocol.
Kadu to dynamicznie rozwijający się komunikator internetowy kompatybilny z
protokołem Gadu-Gadu.
-
-%if %{with anonymous_check}
%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}
%description anonymous_check
-Anonymous_check is a module to automatic lookup who is an interlocutor
+Anonymous_check is a module for Kadu to automatic lookup who is an interlocutor
when (s)he starts talking to you.
%description anonymous_check -l pl
-Anonymous_check to moduł, która automatycznie sprawdza dane w publicznym
+Anonymous_check to moduł dla Kadu, który automatycznie sprawdza dane w publicznym
katalogu nieznajomego, gdy ten zagada.
-%endif
-
-
-%if %{with globalhotkeys}
%package globalhotkeys
Summary: Global hotkeys support to Kadu
-Summary(pl): Obsługa skrótów globalnych
+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
-hotkeys in kadu.
+hotkeys in Kadu.
%description globalhotkeys -l pl
Globalhotkeys to moduł dodający obsługę skrótów globalnych
-w kadu.
-
-%endif
+w Kadu.
-
-%if %{with led_notify}
%package led_notify
Summary: Notification by Scroll Lock LED
Summary(pl): Powiadamianie diodą Scroll Lock
Group: Applications/Internet
+License: GPLv2+
Requires: %{name} = %{version}-%{release}
+
%description led_notify
-Led_notify is a module to notify user of some events using Scroll Lock
+Led_notify is a module for Kadu, to notify user of some events using Scroll Lock
LED.
-
%description led_notify -l pl
-Led_notify to moduł umożliwiający powiadamianie użytkownika o pewnych
+Led_notify to moduł dla Kadu umożliwiający powiadamianie użytkownika o pewnych
zdarzenia przy użyciu diody Scroll Lock.
-%endif
-
-%if %{with mail}
%package mail
-Summary: Mail checking module
-Summary(pl): Moduł do sprawdzania poczty
+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 to check whether there are new mails.
+Mail is a module for Kadu to check whether there are new mails.
%description mail -l pl
-Mail to moduł do sprawdzania czy są nowe maile.
-
-%endif
+Mail to moduł dla Kadu do sprawdzania czy są nowe maile.
-%if %{with mime_tex}
%package mime_tex
-Summary: TeX formulas support
-Summary(pl): Obsługa formuł matematycznych 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}
+
%description mime_tex
-Mime_tex is a module to edit TeX mathematic formulas in chat window.
+Mime_tex is a module for Kadu to edit TeX mathematic formulas in chat window.
%description mime_tex -l pl
-Mime_tex to moduł umożliwiający edycję formuł matematycznych TeX
+Mime_tex to moduł dla Kadu umożliwiający edycję formuł matematycznych TeX
w oknie rozmowy.
-%endif
-
-
-%if %{with plus_pl_sms}
%package plus_pl_sms
-Summary: Miasto Plusa SMS gateway support
-Summary(pl): Obsługa bramki SMS Miasto Plusa
+Summary: Miasto Plusa SMS gateway support in Kadu
+Summary(pl): Obsługa bramki SMS Miasto Plusa w Kadu
Group: Applications/Internet
+License: GPLv2+
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 to support Plus.pl SMS Gateway.
+Plus_pl_sms is a module for Kadu to support Plus.pl SMS Gateway.
%description plus_pl_sms -l pl
-Plus_pl_sms to moduł umożliwiający obsługę bramki SMS-owej "Plus.pl".
-
-%endif
-
-
-%if %{with osd_hints}
-%package osd_hints
-Summary: Notification by OSD-like hints
-Summary(pl): Powiadamanie o zdarzeniach przy pomocy dymków typu OSD
-Group: Applications/Internet
-Requires: %{name} = %{version}-%{release}
-Obsoletes: %{name}-osdhints_notify < 0.6.5-1
-Provides: %{name}-osdhints_notify = %{version}-%{release}
-%description osd_hints
-Osd_hints is a module to notify users about some events
-with OSD-like hints.
-
-%description osd_hints -l pl
-Osd_hints to moduł umożliwiający powiadamianie użytkownika
-o pewnych zdarzeniach przy pomocy dymków typu OSD.
-
-%endif
+Plus_pl_sms to moduł dla Kadu umożliwiający obsługę bramki SMS-owej "Plus.pl".
-%if %{with panelkadu}
%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
+
%description panelkadu
Panelkadu is a module to make a panel from Kadu main window.
%description panelkadu -l pl
-Panelkadu to moduł zamieniający kadu w panel na skraju ekranu.
-
-%endif
-
-
-%if %{with powerkadu}
-%package powerkadu
-Summary: PowerKadu
-Summary(pl): PowerKadu
-Group: Applications/Internet
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-anonymous_check = %{version}-%{release}
-#Requires: kadu-antistring = %{version}-%{release}
-#Requires: kadu-auto_hide = %{version}-%{release}
-#Requires: kadu-parser_extender = %{version}-%{release}
-Requires: %{name}-split_messages = %{version}-%{release}
-#Requires: kadu-word_fix = %{version}-%{release}
-
-#All submodules except anonymous-check and split_messages are now merged into kadu core,
-#so powerkadu shouldn't require them.
-
-%description powerkadu
-PowerKadu is a metapackage which contains modules known from the "old"
-powerkadu.
-
-%description powerkadu -l pl
-PowerKadu to teraz metapakiet, który zawiera moduły znane ze "starego"
-powerkadu.
-
-%endif
+Panelkadu to moduł zamieniający Kadu w panel na skraju ekranu.
-%if %{with senthistory}
%package senthistory
Summary: History of sent messages in chat windows
Summary(pl): Historia wysłanych wiadomości w oknie rozmowy
Group: Applications/Internet
+License: GPLv3+
Requires: %{name} = %{version}-%{release}
+
%description senthistory
Senthistory is a module which adds history of sent messages to
-chat windows.
+chat windows in Kadu.
%description senthistory -l pl
Senthistory to moduł, który dodaje historię wysłanych wiadomości
-do okien rozmowy.
+do okien rozmowy w Kadu.
-%endif
-
-%if %{with split_messages}
-%package split_messages
-Summary: Split too long messages
-Summary(pl): Dzielenie zbyt długich wiadomości
-Group: Applications/Internet
-Requires: %{name} = %{version}-%{release}
-
-%description split_messages
-Split_messages is a module to split a message to smaller parts
-if it's too long.
-
-%description split_messages -l pl
-Split_messages to moduł dzielący wiadomość na mniejsze części,
-jeśli jest za długa.
-
-%endif
-
-%if %{with tabs}
%package tabs
-Summary: Tabbed chat dialog
-Summary(pl): Okno rozmowy z zakładkami
+Summary: Tabbed chat dialog in Kadu
+Summary(pl): Okno rozmowy z zakładkami w Kadu
Group: Applications/Internet
+License: GPLv2+
Requires: %{name} = %{version}-%{release}
+
%description tabs
-Tabs is a module to add a feature to use one window to talk with all
+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ł dodający możliwość prowadzenia rozmów w jednym oknie,
+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.
-%endif
%prep
%setup -q -n kadu
@@ -455,17 +374,15 @@ zakładek.
%unpack_module_source 104 led_notify
%unpack_module_source 111 mail
%unpack_module_source 112 mime_tex
-%unpack_module_source 115 osd_hints
%unpack_module_source 114 panelkadu
%unpack_module_source 105 plus_pl_sms
-%unpack_module_source 118 powerkadu
%unpack_module_source 103 senthistory
-%unpack_module_source 120 split_messages
%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
@@ -478,11 +395,14 @@ zakładek.
%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
@@ -493,6 +413,8 @@ 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
+#amarok 1.x is long gone, don't build it
+sed "s#^module_amarok1_mediaplayer=.#module_amarok1_mediaplayer=n#" -i .config
#let's not annoy users with update notifies
#and disable them
@@ -509,8 +431,10 @@ sed 's@#define DETAILED.*@#define DETAILED_VERSION "%{name}-%{version}-%{release
#echo 'install (FILES "data/mediaplayer.png" DESTINATION "share/kadu/modules/data/mediaplayer")' >> modules/mediaplayer/CMakeLists.txt
%patch0
-%patch1
-%patch2
+%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" .
@@ -520,29 +444,26 @@ make -k VERBOSE=1 %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/kadu.desktop
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/kadu.desktop
-desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- %{SOURCE3}
-
-if [ "x%{_lib}" != "xlib" ]; then
- mv $RPM_BUILD_ROOT%{_prefix}/lib $RPM_BUILD_ROOT%{_libdir}
-fi
+desktop-file-install --vendor fedora --delete-original \
+ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applications/kadu.desktop
%clean
rm -rf $RPM_BUILD_ROOT
+
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -585,14 +506,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%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
@@ -607,100 +531,99 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%module_files history -ct
%module_files idle
%module_files last_seen -t
-#module_files mediaplayer -cdt
+%module_files mediaplayer -cdt
%module_files notify -ct
%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 screenshot -ct
%module_files sms -ct
%module_files sound -ct
%module_files spellchecker -ct
+%module_files split_messages -ct
%module_files voice -ct
%module_files window_notify -t
%module_files word_fix -cdt
# external modules:
-%if %{with anonymous_check}
%files anonymous_check
%defattr(-, root, root, -)
%module_files anonymous_check -ct
-%endif
-
-%if %{with globalhotkeys}
%files globalhotkeys
%defattr(-, root, root, -)
%module_files globalhotkeys -ct
-%endif
-%if %{with led_notify}
%files led_notify
%defattr(-, root, root, -)
%module_files led_notify -ct
-%endif
-%if %{with mail}
%files mail
%defattr(-, root, root, -)
%module_files mail -ct
-%endif
-%if %{with plus_pl_sms}
%files plus_pl_sms
%defattr(-, root, root, -)
%module_files plus_pl_sms -cdt
-%endif
-%if %{with mime_tex}
%files mime_tex
%defattr(-, root, root, -)
%module_files mime_tex -cdt
%{_libdir}/kadu/modules/bin/mime_tex
-%endif
-%if %{with osd_hints}
-%files osd_hints
-%defattr(-, root, root, -)
-%module_files osd_hints -cdt
-%endif
-
-%if %{with panelkadu}
%files panelkadu
%defattr(-, root, root, -)
%module_files panelkadu -ct
-%endif
-%if %{with powerkadu}
-%files powerkadu
-%defattr(-, root, root, -)
-%module_files powerkadu -dt
-%endif
-
-%if %{with senthistory}
%files senthistory
%defattr(-, root, root, -)
%module_files senthistory -ct
-%endif
-
-%if %{with split_messages}
-%files split_messages
-%defattr(-, root, root, -)
-%module_files split_messages -ct
-%endif
-
-%if %{with tabs}
%files tabs
%defattr(-, root, root, -)
%module_files tabs -ct
-%endif
%changelog
+* Sun Aug 15 2010 Radoslaw Lisowski <radoslaw.lisowski at gmail.com> - 0.6.5.4-4
+- fixing build problem with qt4-webkit-devel for f-14+
+
+* Sun Mar 28 2010 Radoslaw Lisowski <radoslaw.lisowski at gmail.com> - 0.6.5.4-3
+- Fixed URL address to plus_pl_sms module package
+- Fixed modules descriptions and packages
+- Removed if ... endif clauses around subpackages definitions
+- Added license tags to modules: GPLv2: anonymous_check, led_notify,
+ mail, mime_text, plus_pl_sms, tabs ; GPLv3+: senthistory.
+
+* Tue Mar 23 2010 Julian Sikorski <belegdol at fedoraproject.org> - 0.6.5.4-2
+- Dropped separate sources for powerkadu, split_messages and osd_hints modules -
+ they are now part of the main tarball
+- Updated tabs module to 1.2.7
+- Drop shipping the desktop file separately
+- Added GPLv3+ License tag to panelkadu and globalhotkeys
+- Dropped conditionals around subpackage definitions
+- Added now explicitly needed ldflags
+
+* Thu Mar 18 2010 Julian Sikorski <belegdol at fedoraproject.org> - 0.6.5.4-1
+- Updated kadu to 0.6.5.4
+- Updated modules to their latest versions
+- Changed license tag to GPLv2+
+- Dropped profiles and gcc44 patches
+- BR enchant-devel instead of aspell-devel
+- Updated the desktop file
+- Added patch from SVN fixing compilation on Fedora >= 13
+- Patched bogus module install paths
+- Bumped BR'd libgadu version
+- Dropped unnecessary %%install kludge
+- Re-enabled mediaplayer module
+- Dropped amarok1_mediaplayer module
+- Enabled amarok2_mediaplayer and audacious_mediaplayer modules
+
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.5.2-3
- rebuilt with new openssl
diff --git a/sources b/sources
index 286e652..3260d50 100644
--- a/sources
+++ b/sources
@@ -1,13 +1,10 @@
-c44b443ce63945acb3f13540d8564060 anonymous_check-0.6.5.1.tar.bz2
-686393540ccb3602dd419bb7aa4f8c0c globalhotkeys-0.6.5-10.tar.gz
-9cc1e59e538ff1aa416d162834ce43bb kadu-0.6.5.2.tar.bz2
-7b8b4b93bef27ff9dd815a7ccfb28cd7 kadu-osd_hints-0.1.3.tar.bz2
-cba771287dce1894d4bfbaae57e15bae kadu-powerkadu-2.1.2.tar.bz2
-604dd507df7faaa7a332c4f6d9d797f2 kadu-split_messages-0.3.tar.bz2
-b0dc5d909d9b7094bafd24a18b9b3b80 kadu-tabs-1.2.3.tar.bz2
-e857f0fb213700eb366915eca9c1e454 led_notify-0.21.tar.bz2
-8509cb081936e487d884ea4622991b9d mail-current.tar.bz2
+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
-4f8d84727e721dcfd569ab1100f7be4c panelkadu-0.6.5-3.tar.gz
-e8757b4a45766e251a5200af21366b73 plus_pl_sms-0.6.5.1.tar.bz2
-7d3b4eb3c6c74687905a963f558330ee senthistory-0.6.5-4.tar.gz
+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
More information about the scm-commits
mailing list