rpms/kadu/F-11 kadu-profiles-fix.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 kadu-gcc44.patch, 1.1, 1.2 kadu.spec, 1.44, 1.45 sources, 1.19, 1.20
Dawid Gajownik
gajownik at fedoraproject.org
Wed May 27 17:20:00 UTC 2009
- Previous message: rpms/slimdata/devel slimdata.spec,1.1,1.2
- Next message: rpms/chromium-bsu/devel chromium-bsu-README.license, NONE, 1.1 chromium-bsu.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gajownik
Update of /cvs/pkgs/rpms/kadu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5827
Modified Files:
.cvsignore kadu-gcc44.patch kadu.spec sources
Added Files:
kadu-profiles-fix.patch
Log Message:
- Update to 0.6.5.2
- Update kadu-gcc44.patch
- Added BuildRequires qca2-devel and libXScrnSaver-devel
- Updated globalhotkeys, mime_tex, osd_hints, panelkadu, powerkadu,
senthistory and tabs modules
- Package idle and gg_avatars modules
- Handle properly icons
- Add kadu-profiles-fix.patch
kadu-profiles-fix.patch:
--- NEW FILE kadu-profiles-fix.patch ---
--- modules/profiles/profiles.cpp.orig 2008-12-29 23:19:24.000000000 +0100
+++ modules/profiles/profiles.cpp 2009-05-11 13:14:51.000000000 +0200
@@ -670,8 +670,6 @@ void ProfileConfigurationWindow::profile
Profile p = profileManager->getProfile(item->text());
- if (index == 0) return;
-
profileName->setText(p.name);
profileDir->setText(p.directory);
profileUIN->setText(p.uin);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kadu/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore 16 Dec 2008 20:15:59 -0000 1.17
+++ .cvsignore 27 May 2009 17:19:30 -0000 1.18
@@ -1,13 +1,13 @@
anonymous_check-0.6.5.1.tar.bz2
-globalhotkeys-0.6.5-7.tar.gz
-kadu-0.6.5.tar.bz2
-kadu-powerkadu-2.1.1.tar.bz2
+globalhotkeys-0.6.5-10.tar.gz
+kadu-0.6.5.2.tar.bz2
+kadu-osd_hints-0.1.3.tar.bz2
+kadu-powerkadu-2.1.2.tar.bz2
kadu-split_messages-0.3.tar.bz2
-kadu-tabs-1.2.1.tar.bz2
+kadu-tabs-1.2.3.tar.bz2
led_notify-0.21.tar.bz2
mail-current.tar.bz2
-mime_tex-0.6.5.1.tar.bz2
-panelkadu-0.6.5-2.tar.gz
+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-3.tar.gz
-kadu-osd_hints-0.1.2.tar.bz2
+senthistory-0.6.5-4.tar.gz
kadu-gcc44.patch:
Index: kadu-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kadu/F-11/kadu-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kadu-gcc44.patch 24 Apr 2009 07:19:32 -0000 1.1
+++ kadu-gcc44.patch 27 May 2009 17:19:30 -0000 1.2
@@ -1,5 +1,5 @@
---- kadu-core/protocol.h.orig 2009-04-24 00:46:53.000000000 +0200
-+++ kadu-core/protocol.h 2009-04-24 00:47:48.000000000 +0200
+--- kadu-core/protocol.h.orig 2008-09-19 15:53:52.000000000 +0200
++++ kadu-core/protocol.h 2009-05-08 16:38:00.000000000 +0200
@@ -14,6 +14,7 @@
#include "status.h"
@@ -8,44 +8,13 @@
typedef uint32_t UinType;
---- kadu-core/userbox.h.orig 2009-04-24 00:47:07.000000000 +0200
-+++ kadu-core/userbox.h 2009-04-24 00:48:02.000000000 +0200
-@@ -20,6 +20,7 @@
- #include "userlist.h"
+--- modules/encryption/pkcs1_certificate.h.orig 2009-03-12 14:11:09.000000000 +0100
++++ modules/encryption/pkcs1_certificate.h 2009-05-08 16:38:52.000000000 +0200
+@@ -26,6 +26,7 @@
+ #define PKCS1_CERTIFICATE_H
- #include "exports.h"
+ #include <QtCrypto>
+#include <stdint.h>
- class QFontMetrics;
-
---- kadu-core/action.h.orig 2009-04-24 09:00:08.000000000 +0200
-+++ kadu-core/action.h 2009-04-24 09:01:08.000000000 +0200
-@@ -91,7 +91,7 @@
- ActionType Type;
- QString Name;
- QObject *Object;
-- char *Slot;
-+ const char *Slot;
- QString IconName;
- QString Text;
- QString CheckedText;
-@@ -107,7 +107,7 @@
- virtual void configurationUpdated();
-
- public:
-- ActionDescription(ActionType Type, const QString &Name, QObject *Object, char *Slot,
-+ ActionDescription(ActionType Type, const QString &Name, QObject *Object, const char *Slot,
- const QString &IconName, const QString &Text, bool Checkable = false, const QString &CheckedText = "", ActionBoolCallback enableCallback = 0);
- virtual ~ActionDescription();
-
---- kadu-core/action.cpp.orig 2009-04-24 09:00:13.000000000 +0200
-+++ kadu-core/action.cpp 2009-04-24 09:01:15.000000000 +0200
-@@ -115,7 +115,7 @@
- setIcon(icons_manager->loadIcon(Description->IconName));
- }
-
--ActionDescription::ActionDescription(ActionType Type, const QString &Name, QObject *Object, char *Slot,
-+ActionDescription::ActionDescription(ActionType Type, const QString &Name, QObject *Object, const char *Slot,
- const QString &IconName, const QString &Text, bool Checkable, const QString &CheckedText, ActionBoolCallback enableCallback)
- : ShortcutItem(""), ShortcutContext(Qt::WidgetShortcut)
- {
+ /**
+ * PKCS#1 certificate reader/writer (implemented according to the PKCS#1 v2.1 Specification).
Index: kadu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kadu/F-11/kadu.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- kadu.spec 24 Apr 2009 07:19:32 -0000 1.44
+++ kadu.spec 27 May 2009 17:19:30 -0000 1.45
@@ -106,8 +106,8 @@ Name: kadu
%else
Name: kadu_opt
%endif
-Version: 0.6.5
-Release: 10%{?dist}
+Version: 0.6.5.2
+Release: 1%{?dist}
Summary: An Gadu-Gadu client for online messaging
Summary(pl): Klient Gadu-Gadu
Group: Applications/Internet
@@ -121,7 +121,7 @@ Source3: kadu.desktop
Source117: http://kadu.net/~patryk/anonymous_check/anonymous_check-0.6.5.1.tar.bz2
%endif
%if %{with globalhotkeys}
-Source102: http://www.ultr.pl/kadu/globalhotkeys-0.6.5-7.tar.gz
+Source102: http://www.ultr.pl/kadu/globalhotkeys-0.6.5-10.tar.gz
%endif
%if %{with led_notify}
Source104: http://kadu.net/~blysk/led_notify-0.21.tar.bz2
@@ -133,31 +133,33 @@ Source111: http://kadu.net/~michal/
Source105: http://kadu.net/~patryk/plus_pl_sms/plus_pl_sms-0.6.5.1.tar.bz2
%endif
%if %{with mime_tex}
-Source112: http://kadu.net/~patryk/mime_tex/mime_tex-0.6.5.1.tar.bz2
+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.2.tar.bz2
+Source115: http://www.kadu.net/~dorr/moduly/kadu-osd_hints-0.1.3.tar.bz2
%endif
%if %{with panelkadu}
-Source114: http://www.ultr.pl/kadu/panelkadu-0.6.5-2.tar.gz
+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.1.tar.bz2
+Source118: http://www.kadu.net/~dorr/moduly/kadu-powerkadu-2.1.2.tar.bz2
%endif
%if %{with senthistory}
-Source103: http://www.ultr.pl/kadu/senthistory-0.6.5-3.tar.gz
+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
%endif
%if %{with tabs}
-Source106: http://www.kadu.net/~arvenil/tabs/download/0.6.5/kadu-tabs-1.2.1.tar.bz2
+Source106: http://www.kadu.net/~arvenil/tabs/download/0.6.5/kadu-tabs-1.2.3.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
+# 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
@@ -167,6 +169,8 @@ BuildRequires: gsm-devel
BuildRequires: desktop-file-utils
BuildRequires: aspell-devel alsa-lib-devel
BuildRequires: libao-devel
+BuildRequires: libXScrnSaver-devel
+BuildRequires: qca2-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
@@ -470,6 +474,7 @@ zakładek.
%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
@@ -505,6 +510,7 @@ sed 's@#define DETAILED.*@#define DETAIL
%patch0
%patch1
+%patch2
%build
%{cmake} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_USE_PTHREADS:BOOL=ON -DBUILD_DESCRIPTION="Fedora" .
@@ -524,11 +530,23 @@ if [ "x%{_lib}" != "xlib" ]; then
mv $RPM_BUILD_ROOT%{_prefix}/lib $RPM_BUILD_ROOT%{_libdir}
fi
-mv $RPM_BUILD_ROOT%{_datadir}/kadu/themes/sound $RPM_BUILD_ROOT%{_datadir}/kadu/themes/sounds
%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 || :
+
+
%files
%defattr(-,root,root,-)
@@ -558,10 +576,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/kadu/themes/sounds
%{_datadir}/kadu/themes/sounds/default
%{_datadir}/kadu/translations
-%{_datadir}/pixmaps/kadu*.png
%{_datadir}/kadu/modules/docking.desc
%{_datadir}/kadu/modules/configuration/docking.ui
%{_datadir}/kadu/modules/translations/docking_*.qm
+%{_datadir}/icons/hicolor/*/apps/kadu.png
# internal modules:
%module_files account_management -t
@@ -584,8 +602,10 @@ rm -rf $RPM_BUILD_ROOT
%module_files filedesc -ct
%module_files filtering -cdt
%module_files firewall -ct
+%module_files gg_avatars -t
%module_files hints -ct
%module_files history -ct
+%module_files idle
%module_files last_seen -t
#module_files mediaplayer -cdt
%module_files notify -ct
@@ -681,6 +701,16 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri May 08 2009 Dawid Gajownik <gajownik[AT]gmail.com> - 0.6.5.2-1
+- Update to 0.6.5.2
+- Update kadu-gcc44.patch
+- Added BuildRequires qca2-devel and libXScrnSaver-devel
+- Updated globalhotkeys, mime_tex, osd_hints, panelkadu, powerkadu,
+ senthistory and tabs modules
+- Package idle and gg_avatars modules
+- Handle properly icons
+- Add kadu-profiles-fix.patch
+
* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.6.5-10
- Fix FTBFS: added kadu-gcc44.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kadu/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources 16 Dec 2008 20:15:59 -0000 1.19
+++ sources 27 May 2009 17:19:30 -0000 1.20
@@ -1,13 +1,13 @@
c44b443ce63945acb3f13540d8564060 anonymous_check-0.6.5.1.tar.bz2
-013c8ef4966f1fb89960db451882feb0 globalhotkeys-0.6.5-7.tar.gz
-2049a1bae2eb4713615ad9a2f976e764 kadu-0.6.5.tar.bz2
-770ae1ad5a36c62e3cfc168d7ac38706 kadu-powerkadu-2.1.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
-902b7c10f28f897aeb551dfdb24477dc kadu-tabs-1.2.1.tar.bz2
+b0dc5d909d9b7094bafd24a18b9b3b80 kadu-tabs-1.2.3.tar.bz2
e857f0fb213700eb366915eca9c1e454 led_notify-0.21.tar.bz2
8509cb081936e487d884ea4622991b9d mail-current.tar.bz2
-0197d1da8143629933677c5ac56356de mime_tex-0.6.5.1.tar.bz2
-eeb5626177d38918d2611fd23f82c478 panelkadu-0.6.5-2.tar.gz
+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
-6a339ec43dd914d9b0912130077c3638 senthistory-0.6.5-3.tar.gz
-69b868bf177a3d2aee09a62a54265d23 kadu-osd_hints-0.1.2.tar.bz2
+7d3b4eb3c6c74687905a963f558330ee senthistory-0.6.5-4.tar.gz
- Previous message: rpms/slimdata/devel slimdata.spec,1.1,1.2
- Next message: rpms/chromium-bsu/devel chromium-bsu-README.license, NONE, 1.1 chromium-bsu.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list