rpms/qutim/F-11 .cvsignore, 1.3, 1.4 qutim.spec, 1.2, 1.3 sources, 1.3, 1.4

Thu Jun 3 14:05:03 UTC 2010

Author: hubbitus

Update of /cvs/pkgs/rpms/qutim/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26278

Modified Files:
	.cvsignore qutim.spec sources 
Log Message:
- plugin vkontakte from git 20100530: BZ#582476
- Add "git checkout origin/sdk02; git pull origin sdk02; git submodule update --init" in git checkout process.
- Add conditional BR qt-webkit-devel to build under rawhide (F14)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qutim/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4

--- .cvsignore	7 Jan 2010 12:25:14 -0000	1.3
+++ .cvsignore	3 Jun 2010 14:05:03 -0000	1.4
@@ -1,3 +1,4 @@
-qutim-0.2.0.tar.bz2
 qutim-0.2.0-WebKit_redraws.patch
 qutim-0.2.0-usr_lib64_plugin_search_path.patch
+qutim-0.2.0.tar.bz2
+qutim-vkontakte-0.2.git20100530.tar.xz


Index: qutim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qutim/F-11/qutim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qutim.spec	7 Jan 2010 12:25:14 -0000	1.2
+++ qutim.spec	3 Jun 2010 14:05:03 -0000	1.3
@@ -1,22 +1,29 @@
 %bcond_without gnutls
 %bcond_without openssl
 
-# Checkouted from several sources, so using date instead of revision number.
-#% define SVN 20091018
+# Checkout from several sources, so using date instead of revision number.
+#% global SVN 20091018
 
 Name:		qutim
 Version:		0.2.0
-Release:		4%{?SVN:SVN%{SVN}}%{?dist}
+Release:		8%{?SVN:SVN%{SVN}}%{?dist}
 Summary:		Multiprotocol (ICQ, Jabber, IRC etc) instant messenger with modern Qt4 interface
 Summary(ru):	Мультиплатформенный, мультипротокольный (ICQ, Jabber, IRC...) мессенджер на QT4
 License:		GPLv2+ and CC-BY-SA
 Group:		Applications/Internet
 Url:			http://www.qutim.org/
 Source0:		http://www.qutim.org/uploads/src/%{name}-%{version}.tar.bz2
-Source1:		%{name}.desktop
+# git clone git://gitorious.org/qutim/protocols.git plugins; pushd plugins;
+# git checkout origin/sdk02; git pull origin sdk02; git submodule update --init
+# popd; tar -cJf qutim-vkontakte-0.2.git20100530.tar.xz plugins/vkontakte
+Source1:		qutim-vkontakte-0.2.git20100530.tar.xz
+Source2:		%{name}.desktop
 Requires:		hicolor-icon-theme
 BuildRequires:	cmake >= 2.6, desktop-file-utils
 BuildRequires:	qt-devel >= 1:4.0, libidn-devel, dos2unix
+%if 0%{?fedora} >= 14
+BuildRequires:	qt-webkit-devel
+%endif
 %if %{with gnutls}
 BuildRequires:	gnutls-devel
 %endif
@@ -34,14 +41,14 @@ Patch1:		qutim-0.2.0-usr_lib64_plugin_se
 %description
 qutIM - free open-source multiprotocol ( ICQ, Jabber/GTalk/
 /Ya.Online/LiveJournal.com, Mail.Ru, IRC ) instant messenger for
-Windows and Linux systems
+Windows and Linux systems.
 
 %description -l ru
 qutIM - Открытый мультипротокольный (уже поддерживаются:
 ICQ, Jabber, GTalk, Ya.Online, LiveJournal.com, Mail.Ru, IRC клиент
 обмена сообщениями для Linux и Windows.
-Написан с нуля и призван быть легким, простым, быстрым, красивым и
-расширяемым за счет модулей-плагинов.
+Написан с нуля и призван быть лёгким, простым, быстрым, красивым и
+расширяемым за счёт модулей-плагинов.
 
 
 %package		icq
@@ -51,23 +58,23 @@ Group:		Applications/Internet
 Requires:		%{name} = %{version}-%{release}
 
 %description	icq
-ICQ support plugin for %{name}
+ICQ support plugin for %{name}.
 
 %description	icq -l ru
-Поддержка (плагин) протокола ICQ для %{name}
+Поддержка (плагин) протокола ICQ для %{name}.
 
 
 %package		irc
 Summary:		IRC support for %{name}
 Summary(ru):	IRC плагин для %{name}
-Group:		Applications/Internet
+# Group:		Applications/Internet
 Requires:		%{name} = %{version}-%{release}
 
 %description	irc
-IRC support plugin for %{name}
+IRC support plugin for %{name}.
 
 %description	irc -l ru
-Поддержка (плагин) протокола IRC для %{name}
+Поддержка (плагин) протокола IRC для %{name}.
 
 
 %package		jabber
@@ -78,10 +85,10 @@ Requires:		%{name} = %{version}-%{releas
 Requires:		gloox >= 1:1.0-1
 
 %description	jabber
-Jabber support plugin for qutIM
+Jabber support plugin for qutIM.
 
 %description	jabber -l ru
-Поддержка (плагин) протокола Jabber для %{name}
+Поддержка (плагин) протокола Jabber для %{name}.
 
 
 %package		mrim
@@ -91,10 +98,10 @@ Group:		Applications/Internet
 Requires:		%{name} = %{version}-%{release}
 
 %description	mrim
-Mrim (Mail.ru agent) support plugin for %{name}
+Mrim (Mail.ru agent) support plugin for %{name}.
 
 %description	mrim -l ru
-Поддержка (плагин) протокола Mrim (Mail.ru agent) для %{name}
+Поддержка (плагин) протокола Mrim (Mail.ru agent) для %{name}.
 
 
 %package		histman
@@ -106,12 +113,12 @@ Requires:		%{name} = %{version}-%{releas
 %description	histman
 Histman - History Manager plugin for %{name}
 Easy and fast convert your history from other IM-clients like:
-QIP, Miranda, Pidgin, Kopete, Gajim, Psi and others!
+QIP, Miranda, Pidgin, Kopete, Gajim, Psi and others.
 
 %description	histman -l ru
 Плагин "Менеджер истории" для %{name}
 Легко и быстро сконвертирует вашу историю из других распространенных клиентов:
-QIP, Miranda, Pidgin, Kopete, Gajim, Psi и многих других!
+QIP, Miranda, Pidgin, Kopete, Gajim, Psi и многих других.
 
 
 %package		plugman
@@ -122,9 +129,9 @@ Requires:		%{name} = %{version}-%{releas
 
 %description	plugman
 Plugman - Plugin Manager plugin for %{name}
-Allow you to easy install additional themes (skins), smile sets (including famous
-and popular Kolobok), sound themes and other small usefulness, that helps do
-qutIM better.
+Allow you to easy install additional themes (skins), smile sets (including
+famous and popular Kolobok), sound themes and other small usefulness, that
+helps do qutIM better.
 
 %description	plugman -l ru
 Плагин "Менеджер плагинов" для %{name}
@@ -140,10 +147,10 @@ Group:		Applications/Internet
 Requires:		%{name} = %{version}-%{release}
 
 %description	vkontakte
-Vkontakte plugin to speak with vkontakte.ru users from %{name}
+Vkontakte plugin to speak with vkontakte.ru users from %{name}.
 
 %description	vkontakte -l ru
-Поддержка (плагин) для общения с пользователями vkontakte.ru из %{name}
+Поддержка (плагин) для общения с пользователями vkontakte.ru из %{name}.
 
 
 %package		yandexnarod
@@ -156,25 +163,28 @@ Requires:		%{name} = %{version}-%{releas
 Yandex.Narod - plugin for %{name}
 Allow upload files to Yandex.Disk (http://narod.yandex.ru/disk) and send link
 to it. What remarkably - allow to send files to offline contacts. Additional
-allow to manage previosly uploaded files.
+allow to manage previously uploaded files.
 
 %description	yandexnarod -l ru
 Плагин Yandex.Narod для %{name}
-Зальет файлы на Яндекс.Диск и передаст собеседнику на него ссылку, что
+Зальёт файлы на Яндекс.Диск и передаст собеседнику на него ссылку, что
 примечательно — так можно слать файлы и пользователям не в сети. Помимо этого
 можно управлять уже загруженными файлами.
 
 %package		devel
 Summary:		Headers for %{name}
-Group:		Applications/Internet
+Group:		Development/Libraries
 Requires:		%{name} = %{version}-%{release}
 Requires:		cmake
 
 %description	devel
-Headers for %{name}
+Headers for %{name}.
 
 %prep
 %setup -q
+# rm old plugin dir
+rm -rf plugins/vkontakte
+%setup1 -T -q -D -a 1
 
 %patch0 -p1 -b .webkit
 %patch1 -p1 -b .usr-lib64
@@ -182,10 +192,10 @@ Headers for %{name}
 # Gloox is shared, do not use bundled
 rm -rf ./plugins/jabber/libs/
 
-# Fix source files permissions to do not rpm compline spurious-executable-perm on -debuginfo sub package
+# Fix source files permissions to do not rpm complain spurious-executable-perm on -debuginfo sub package
 find \( -name '*.cpp' -or -name '*.h' \) -and -executable -exec chmod -x {} \;
 
-# Fix lineendings qtwin to avoid rpmlint complain wrong-script-end-of-line-encoding.
+# Fix line endings qtwin to avoid rpmlint complain wrong-script-end-of-line-encoding.
 dos2unix src/3rdparty/qtwin/qtwin.{cpp,h}
 
 %build
@@ -230,19 +240,18 @@ popd
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}%{_datadir}/%{name}/emoticons %{buildroot}%{_libdir}/%{name}
-install -m 644 icons/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps
-install -m 644 icons/%{name}_64.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -p -m 644 icons/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps
+install -p -m 644 icons/%{name}_64.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
-make install DESTDIR="%{buildroot}"
+make install DESTDIR="%{buildroot}" INSTALL="install -p"
 
 desktop-file-install \
-	--add-category="Network" \
 	--dir=%{buildroot}/%{_datadir}/applications \
-	%{SOURCE1}
+	%{SOURCE2}
 
 pushd plugins
 	for plugin in icq irc mrim jabber histman plugman vkontakte yandexnarod; do
-	install -m 755 $plugin/lib${plugin}.so %{buildroot}%{_libdir}/%{name}
+	install -p -m 755 $plugin/lib${plugin}.so %{buildroot}%{_libdir}/%{name}
 	done
 popd
 
@@ -250,16 +259,16 @@ popd
 rm -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-	if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-	fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-	if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-	fi
+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,-)
@@ -319,6 +328,22 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/cmake/Modules/qutimuic.cmake
 
 %changelog
+* Sun May 30 2010 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-8
+- plugin vkontakte from git 20100530: BZ#582476
+- Add "git checkout origin/sdk02; git pull origin sdk02; git submodule update --init" in git checkout process.
+- Add conditional BR qt-webkit-devel to build under rawhide (F14)
+
+* Mon May 3 2010 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-7
+- plugin vkontakte from git: BZ#582476
+
+* Mon Feb 22 2010 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-6
+- Mos of changes inspired by https://bugzilla.redhat.com/show_bug.cgi?id=494695#c41, thanks Christoph Wickert
+- Description line length fit into 80 characters in qutim-plugman.
+- Group of development package changed to Development/Libraries
+- All %%descriptions ends with dot.
+- Icons cache hadling updated.
+- Preserve timestamps during install.
+
 * Thu Jan 7 2010 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-4
 - Add Patch0 and Patch1 first to fix annoyed QT4-webkit bug, second to add /usr/lib64/qutim in plugins
 	search paths ( https://bugzilla.redhat.com/show_bug.cgi?id=494695#c32 ). Both already in upstream (I was talked


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qutim/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Jan 2010 12:25:14 -0000	1.3
+++ sources	3 Jun 2010 14:05:03 -0000	1.4
@@ -1,3 +1,4 @@
-a0cf5b7bc1a8fd9e0a6a712d6f1b98e7  qutim-0.2.0.tar.bz2
 2c21020782a7d3b96da066854554bf80  qutim-0.2.0-WebKit_redraws.patch
 8fba493a839c2743592573de93d908c8  qutim-0.2.0-usr_lib64_plugin_search_path.patch
+a0cf5b7bc1a8fd9e0a6a712d6f1b98e7  qutim-0.2.0.tar.bz2
+29857e34a5cbae338e4df93ee1c9b930  qutim-vkontakte-0.2.git20100530.tar.xz

