packages: google-talkplugin/google-talkplugin.spec - up to 2.2.2.0

[glen]

Author: glen                         Date: Tue Aug 30 17:08:24 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.2.2.0

---- Files affected:
packages/google-talkplugin:
   google-talkplugin.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/google-talkplugin/google-talkplugin.spec
diff -u packages/google-talkplugin/google-talkplugin.spec:1.3 packages/google-talkplugin/google-talkplugin.spec:1.4
--- packages/google-talkplugin/google-talkplugin.spec:1.3	Wed Nov  3 10:30:21 2010
+++ packages/google-talkplugin/google-talkplugin.spec	Tue Aug 30 19:08:19 2011
@@ -1,17 +1,15 @@
 # $Revision$, $Date$
-# NOTE
-# - it needs openssl-0.9.8 at runtime
 Summary:	Call phones from Gmail
 Name:		google-talkplugin
-Version:	1.5.1.0
-Release:	0.1
+Version:	2.2.2.0
+Release:	0.5
 License:	Multiple, see http://chrome.google.com/
 Group:		Applications/Networking
-Source0:	http://dl.google.com/linux/direct/%{name}_current_i386.deb
-# Source0-md5:	4293b2d5ad4a3098fc06a9b35056c290
-Source1:	http://dl.google.com/linux/direct/%{name}_current_amd64.deb
-# Source1-md5:	737283cd4e504dc5d3add2cb057bd273
-URL:		http://www.google.com/chat/voice/
+Source0:	http://dl.google.com/linux/talkplugin/rpm/stable/i386/%{name}-%{version}-1.i386.rpm
+# Source0-md5:	4b75f6584cf78b7a62f53c4e7e928a7e
+Source1:	http://dl.google.com/linux/talkplugin/rpm/stable/x86_64/%{name}-%{version}-1.x86_64.rpm
+# Source1-md5:	217114d81cdf0648a9af20ee45935b09
+URL:		http://www.google.com/chat/video/
 BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	sed >= 4.0
 Requires:	browser-plugins >= 2.0
@@ -21,9 +19,6 @@
 %define		_enable_debug_packages	0
 %define		no_install_post_strip	1
 
-# our openssl does not have this symbol
-%define		_noautoreq		libcrypto.so.0.9.8(OPENSSL_0.9.8) libssl.so.0.9.8(OPENSSL_0.9.8)
-
 %description
 The Google Talk Plugin is a browser plugin that enables you to use
 Google voice and video chat to chat face to face with family and
@@ -38,17 +33,11 @@
 SOURCE=%{S:1}
 %endif
 
-ar x $SOURCE
-tar zxf control.tar.gz
-tar zxf data.tar.gz
-
-version=$(awk '/Version:/{print $2}' control)
-if [ $version != %{version}-1 ]; then
+V=$(rpm -qp --nodigest --nosignature --qf '%{V}' $SOURCE)
+if [ version:$V != version:%{version} ]; then
 	exit 1
 fi
-
-mv .%{_docdir}/google-talkplugin/changelog.Debian.gz .
-gzip -d changelog.Debian.gz
+rpm2cpio $SOURCE | cpio -i -d
 
 mv ./opt/google/talkplugin/* .
 #cron/google-talkplugin
@@ -62,17 +51,33 @@
 src=%{_libdir}/gtalk
 len=$(($(echo -n "$src" | wc -c) + 1))
 dst=$(echo $org | %{__sed} -re "s,^.{$len},$src"'\\x0,')
-%{__sed} -i~ -e "s,$org,$dst," *.so
+%{__sed} -i~ -e "s,$org,$dst," *.so GoogleTalkPlugin
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/gtalk,%{_browserpluginsdir}}
+install -d $RPM_BUILD_ROOT{%{_libdir}/gtalk,%{_datadir}/locale,%{_browserpluginsdir}}
 # plugin
 install -p libnpgoogletalk*.so libnpgtpo3dautoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
 # support libs
 install -p lib/*.so $RPM_BUILD_ROOT%{_libdir}/gtalk
-# hmmz, 32bit
+# NOTE: 32bit
 install -p GoogleTalkPlugin $RPM_BUILD_ROOT%{_libdir}/gtalk
+cp -p windowpicker.glade $RPM_BUILD_ROOT%{_libdir}/gtalk
+
+cp -a locale/* $RPM_BUILD_ROOT%{_datadir}/locale
+
+# google dudes don't get the locales right, fixup
+mv $RPM_BUILD_ROOT%{_datadir}/locale/{en-GB,en_GB}
+mv $RPM_BUILD_ROOT%{_datadir}/locale/{no,nb}
+mv $RPM_BUILD_ROOT%{_datadir}/locale/{pt-BR,pt_BR}
+mv $RPM_BUILD_ROOT%{_datadir}/locale/{pt-PT,pt}
+mv $RPM_BUILD_ROOT%{_datadir}/locale/{zh-CN,zh_CN}
+mv $RPM_BUILD_ROOT%{_datadir}/locale/{zh-TW,zh_TW}
+# not supported in pld
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/es-419
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/iw
+
+%find_lang windowpicker
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,12 +90,13 @@
 	%update_browser_plugins
 fi
 
-%files
+%files -f windowpicker.lang
 %defattr(644,root,root,755)
 %dir %{_libdir}/gtalk
 %attr(755,root,root) %{_libdir}/gtalk/libCg.so
 %attr(755,root,root) %{_libdir}/gtalk/libCgGL.so
 %attr(755,root,root) %{_libdir}/gtalk/GoogleTalkPlugin
+%{_libdir}/gtalk/windowpicker.glade
 %attr(755,root,root) %{_browserpluginsdir}/libnpgoogletalk*.so
 %attr(755,root,root) %{_browserpluginsdir}/libnpgtpo3dautoplugin.so
 
@@ -100,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/08/30 17:08:19  glen
+- up to 2.2.2.0
+
 Revision 1.3  2010/11/03 09:30:21  jajcus
 - Version: 1.5.1.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/google-talkplugin/google-talkplugin.spec?r1=1.3&r2=1.4&f=u