[packages/google-talkplugin] - up to 3.14.17.0; works for me

arekm arekm at pld-linux.org
Wed Feb 27 12:27:29 CET 2013


commit aded47f205346f4bf6d9677d5dfb1443e454d831
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Feb 27 12:27:27 2013 +0100

    - up to 3.14.17.0; works for me

 google-talkplugin.spec | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/google-talkplugin.spec b/google-talkplugin.spec
index 50f4d6c..82fe647 100644
--- a/google-talkplugin.spec
+++ b/google-talkplugin.spec
@@ -1,14 +1,15 @@
 Summary:	Call phones from Gmail
 Name:		google-talkplugin
-Version:	2.2.2.0
-Release:	0.5
+Version:	3.14.17.0
+Release:	0.1
 License:	Multiple, see http://chrome.google.com/
 Group:		Applications/Networking
 Source0:	http://dl.google.com/linux/talkplugin/rpm/stable/i386/%{name}-%{version}-1.i386.rpm
-# Source0-md5:	4b75f6584cf78b7a62f53c4e7e928a7e
+# Source0-md5:	1416f39d4f53ccba0dc28187108a7650
 Source1:	http://dl.google.com/linux/talkplugin/rpm/stable/x86_64/%{name}-%{version}-1.x86_64.rpm
-# Source1-md5:	217114d81cdf0648a9af20ee45935b09
+# Source1-md5:	a05df0c17c3fc9df2c9ae4d9d18de8aa
 URL:		http://www.google.com/chat/video/
+BuildRequires:	perl-base
 BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	sed >= 4.0
 Requires:	browser-plugins >= 2.0
@@ -46,34 +47,39 @@ mv ./opt/google/talkplugin/* .
 chrpath -r %{_libdir}/gtalk libnpgtpo3dautoplugin.so
 
 # hack: replace $org with target path
-org=/opt/google/talkplugin/
-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 GoogleTalkPlugin
+%if "%{_lib}" == "lib64"
+dst=///////usr/lib64/gtalk/
+%else
+dst=/////////usr/lib/gtalk/
+%endif
+perl -pi -e "s#/opt/google/talkplugin/#$dst#g" *.so GoogleTalkPlugin
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir}/gtalk,%{_datadir}/locale,%{_browserpluginsdir}}
 # plugin
-install -p libnpgoogletalk*.so libnpgtpo3dautoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+install -p libgoogletalkremoting.so libnpgoogletalk*.so libnpgtpo3dautoplugin.so libnpo1d.so $RPM_BUILD_ROOT%{_browserpluginsdir}
 # support libs
 install -p lib/*.so $RPM_BUILD_ROOT%{_libdir}/gtalk
-# 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}
+
+for loc in $RPM_BUILD_ROOT%{_datadir}/locale/*-*; do
+	d=$(dirname $loc)
+	b=$(basename $loc | tr '-' '_')
+	newloc="$d/$b"
+	mv $loc $newloc
+done
+
 # not supported in pld
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/es-419
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/es_419
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/iw
 
 %find_lang windowpicker
@@ -96,5 +102,7 @@ fi
 %attr(755,root,root) %{_libdir}/gtalk/libCgGL.so
 %attr(755,root,root) %{_libdir}/gtalk/GoogleTalkPlugin
 %{_libdir}/gtalk/windowpicker.glade
+%attr(755,root,root) %{_browserpluginsdir}/libgoogletalkremoting.so
 %attr(755,root,root) %{_browserpluginsdir}/libnpgoogletalk*.so
 %attr(755,root,root) %{_browserpluginsdir}/libnpgtpo3dautoplugin.so
+%attr(755,root,root) %{_browserpluginsdir}/libnpo1d.so
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/google-talkplugin.git/commitdiff/aded47f205346f4bf6d9677d5dfb1443e454d831



More information about the pld-cvs-commit mailing list