- tabs module is now embedded

Changed files:
    kadu.spec -> 1.300

diff --git a/kadu.spec b/kadu.spec
index 3c213c738cfc7f3eb10c91334f382f8884f6d12e..5cf35896c3f5b822c0da760429313b21e7ae6892 100644 (file)
--- a/kadu.spec
+++ b/kadu.spec
@@ -90,7 +90,6 @@
 %define                panelkadu_ver           0.9.0-7
 %define                senthistory_ver         0.9.0-7
 %define                sms_plus_pl_ver         0.6.5.4-1
-%define                tabs_ver                1.2.7
 
 Summary:       A Gadu-Gadu client for online messaging
 Summary(pl.UTF-8):     Klient Gadu-Gadu do przesyłania wiadomości po sieci
@@ -126,39 +125,37 @@ Source12: http://www.ultr.pl/kadu/senthistory-%{senthistory_ver}.tar.gz
 # Source12-md5:        fc6b8b1912adad6c5a21c47fb0c44265
 Source13:      http://kadu.net/~patryk/plus_pl_sms/plus_pl_sms-plus_pl_sms-%{sms_plus_pl_ver}.tar.bz2
 # Source13-md5:        59f7ba01a63464818acaa5ff6fd176d5
-Source14:      http://www.kadu.net/~weagle/tabs/%{name}-tabs-%{tabs_ver}.tar.bz2
-# Source14-md5:        f6eba5d0d75b79331101bf8ea438dc7e
-Source15:      http://kadu.net/~neeo/kadu/geoip/geoip_lookup-%{geoip_ver}.tar.bz2
+Source14:      http://kadu.net/~neeo/kadu/geoip/geoip_lookup-%{geoip_ver}.tar.bz2
 # Source15-md5:        83d9672c7f88b803510e7757dd36ea92
-Source16:      http://www.kadu.net/download/additions/%{name}-0.6.5.4-theme-glass-16.tar.gz
+Source15:      http://www.kadu.net/download/additions/%{name}-0.6.5.4-theme-glass-16.tar.gz
 # Source16-md5:        25374d4b876037de6d00eedca76eae0f
-Source17:      http://www.kadu.net/download/additions/%{name}-0.6.5.4-theme-glass-22.tar.gz
+Source16:      http://www.kadu.net/download/additions/%{name}-0.6.5.4-theme-glass-22.tar.gz
 # Source17-md5:        d9df73a452cf190abd5605112c53c21f
-Source18:      http://www.kadu.net/download/additions/%{name}-0.6.5.4-theme-oxygen-16.tar.gz
+Source17:      http://www.kadu.net/download/additions/%{name}-0.6.5.4-theme-oxygen-16.tar.gz
 # Source18-md5:        1dd08c856ec86f55dccf88ab19be6f5a
-Source19:      http://www.kadu.net/download/additions/%{name}-0.6.5.4-theme-tango-16.tar.gz
+Source18:      http://www.kadu.net/download/additions/%{name}-0.6.5.4-theme-tango-16.tar.gz
 # Source19-md5:        9710fd37c6fd8c24e2bae8fa377ee465
-Source20:      http://www.kadu.net/download/additions/%{name}-0.6.5-theme-kadu05.tar.gz
+Source19:      http://www.kadu.net/download/additions/%{name}-0.6.5-theme-kadu05.tar.gz
 # Source20-md5:        9174f621138b6fc28127cc4396cb59ed
-Source21:      desc_history-%{desc_history_ver}.tar.bz2
+Source20:      desc_history-%{desc_history_ver}.tar.bz2
 # Source21-md5:        cf7d7c8f86d9cfe4b5a0ab52b5deff34
-Source22:      http://www.kadu.net/~dorr/moduly/kde_notify-%{notify_kde_ver}.tar.gz
+Source21:      http://www.kadu.net/~dorr/moduly/kde_notify-%{notify_kde_ver}.tar.gz
 # Source22-md5:        2da919d6359049a6e4827e795ba46b1a
-Source23:      http://www.kadu.net/download/additions/%{name}-0.6.5.4-emots-tango.tar.gz
+Source22:      http://www.kadu.net/download/additions/%{name}-0.6.5.4-emots-tango.tar.gz
 # Source23-md5:        436f12011f209c4427a9e411091ecb0a
-Source24:      http://www.kadu.net/~dorr/moduly/%{name}-pajacyk-%{pajacyk_ver}.tar.bz2
+Source23:      http://www.kadu.net/~dorr/moduly/%{name}-pajacyk-%{pajacyk_ver}.tar.bz2
 # Source24-md5:        c87d4b68d65c923118b6ac3e9396ff13
-Source25:      http://www.kadu.net/download/additions/%{name}-sound-bns.tar.bz2
+Source24:      http://www.kadu.net/download/additions/%{name}-sound-bns.tar.bz2
 # Source25-md5:        fcf829d687df27d2ac296a077dc2814e
-Source26:      http://www.kadu.net/download/additions/%{name}-sound-drums.tar.bz2
+Source25:      http://www.kadu.net/download/additions/%{name}-sound-drums.tar.bz2
 # Source26-md5:        0f29ac64019d841b38eefadad2a49e4f
-Source27:      http://www.kadu.net/download/additions/%{name}-sound-florkus.tar.bz2
+Source26:      http://www.kadu.net/download/additions/%{name}-sound-florkus.tar.bz2
 # Source27-md5:        d90070390134c2809a2b53df07563712
-Source28:      http://www.kadu.net/download/additions/%{name}-sound-michalsrodek.tar.bz2
+Source27:      http://www.kadu.net/download/additions/%{name}-sound-michalsrodek.tar.bz2
 # Source28-md5:        5951d828833ea0e452654dbc80c02787
-Source29:      http://www.kadu.net/download/additions/%{name}-sound-percussion.tar.bz2
+Source28:      http://www.kadu.net/download/additions/%{name}-sound-percussion.tar.bz2
 # Source29-md5:        124175025038cd1fedb3d0caa3a0d478
-Source30:      http://www.kadu.net/download/additions/%{name}-sound-ultr.tar.bz2
+Source29:      http://www.kadu.net/download/additions/%{name}-sound-ultr.tar.bz2
 # Source30-md5:        1caec2ba480a2f47430d12ec681aa871
 Patch0:                %{name}-sounds.patch
 Patch1:                %{name}-mail.patch
@@ -1206,39 +1203,36 @@ tar xzf %{SOURCE12} -C plugins
 %if %{with sms_plus_pl}
 tar xjf %{SOURCE13} -C plugins
 %endif
-%if %{with tabs}
-#tar xjf %{SOURCE14} -C plugins
-%endif
 %if %{with geoip}
-tar xjf %{SOURCE15} -C plugins
+tar xjf %{SOURCE14} -C plugins
 %endif
 %if %{with desc_history}
-tar xjf %{SOURCE21} -C plugins
+tar xjf %{SOURCE20} -C plugins
 %endif
 %if %{with notify_kde}
-#tar xzf %{SOURCE22} -C plugins
+#tar xzf %{SOURCE21} -C plugins
 %endif
 %if %{with pajacyk}
-tar xjf %{SOURCE24} -C plugins
+tar xjf %{SOURCE23} -C plugins
 %endif
 
 # themes-icons
+tar xzf %{SOURCE14} -C varia/themes/icons
 tar xzf %{SOURCE16} -C varia/themes/icons
 tar xzf %{SOURCE17} -C varia/themes/icons
 tar xzf %{SOURCE18} -C varia/themes/icons
 tar xzf %{SOURCE19} -C varia/themes/icons
-tar xzf %{SOURCE20} -C varia/themes/icons
 
 # themes-emoticons
-tar xzf %{SOURCE23} -C varia/themes/emoticons
+tar xzf %{SOURCE22} -C varia/themes/emoticons
 
 # themes-sounds
+tar xjf %{SOURCE24} -C varia/themes/sounds
 tar xjf %{SOURCE25} -C varia/themes/sounds
 tar xjf %{SOURCE26} -C varia/themes/sounds
 tar xjf %{SOURCE27} -C varia/themes/sounds
 tar xjf %{SOURCE28} -C varia/themes/sounds
 tar xjf %{SOURCE29} -C varia/themes/sounds
-tar xjf %{SOURCE30} -C varia/themes/sounds
 
 # Drop this in 0.6.6 - fix external modules installation on x86_64
 %if "%{_lib}" == "lib64"
@@ -1476,11 +1470,7 @@ echo 'MODULE_LIBS_PATH="%{_libdir}"' >> plugins/amarok2_mediaplayer/spec
 %else
 %{__sed} -i 's/module_split_messages=m/module_split_messages=n/' .config
 %endif
-%if %{with tabs}
-%{__sed} -i 's/module_tabs=n/module_tabs=m/' .config
-%else
-%{__sed} -i 's/module_tabs=m/module_tabs=n/' .config
-%endif
+%{!?with_tabs:%{__sed} -i 's/\ttabs$/\t#tabs/' Plugins.cmake}
 %if %{with voice}
 %{__sed} -i 's/module_voice=n/module_voice=m/' .config
 %else
@@ -2323,6 +2313,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modules_lib_dir}/libsplit_messages.so
 %lang(pl) %{modules_data_dir}/translations/split_messages_pl.qm
 %endif
+%endif
 
 %if %{with tabs}
 %files module-tabs
@@ -2330,12 +2321,12 @@ rm -rf $RPM_BUILD_ROOT
 %{modules_data_dir}/tabs.desc
 %{modules_data_dir}/configuration/tabs.ui
 %attr(755,root,root) %{modules_lib_dir}/libtabs.so
+%lang(cs) %{modules_data_dir}/translations/tabs_cs.qm
 %lang(de) %{modules_data_dir}/translations/tabs_de.qm
-%lang(fr) %{modules_data_dir}/translations/tabs_fr.qm
-%lang(it) %{modules_data_dir}/translations/tabs_it.qm
 %lang(pl) %{modules_data_dir}/translations/tabs_pl.qm
 %endif
 
+%if 0
 %if %{with voice}
 %files module-voice
 %defattr(644,root,root,755)