Author: arvenil Date: Sun Jan 20 10:54:10 2008 GMT Module: SPECS Tag: DEVEL ---- Log message: - removed crystal* icons and added Obsolete (unsupported in kadu 0.6.0) - removed nuvola* icons and added Obsolete (unsupported in kadu 0.6.0) - pass --disable-autodownload option to configure for prevent autodownload - updated TODO - cleanup in Log section
---- Files affected: SPECS: kadu.spec (1.97.2.93 -> 1.97.2.94) ---- Diffs: ================================================================ Index: SPECS/kadu.spec diff -u SPECS/kadu.spec:1.97.2.93 SPECS/kadu.spec:1.97.2.94 --- SPECS/kadu.spec:1.97.2.93 Sun Jan 20 00:52:17 2008 +++ SPECS/kadu.spec Sun Jan 20 11:54:05 2008 @@ -1,10 +1,8 @@ # $Revision$, $Date$ # # TODO: -# - downloads stuff while building: Downloading crystal16 icon theme -# --02:05:17-- http://kadu.net/autodownload/icons/kadu-0.5.0-crystal16.href -# => `kadu-0.5.0-crystal16.href' -# - some modules with bcond_with will not work for now, we need to wait for next releases +# - Some modules with bcond_with will not work for now, we need to wait for next releases +# - Add Obsoletes for modules iwait4u, powerkadu, notify_osdhints if they will not be fixed before final 0.6.0 # # NOTE: # - We use staticly linked libgadu because of no stable release with dcc7 @@ -139,18 +137,10 @@ # Source19-md5: 3b8b409b520b24de4ea1872d287a29fe Source20: http://www.kadu.net/download/modules_extra/xmms_mediaplayer/xmms_mediaplayer-%{_xmms_mod_ver}.tar.bz2 # Source20-md5: 3c2bfa4507bea42395d1d3cd02576711 -Source21: http://www.kadu.net/download/additions/%{name}-theme-crystal-16.tar.bz2 -# Source21-md5: 023085edabaf6a1b844fe6b5fc9315f9 -Source22: http://www.kadu.net/download/additions/%{name}-theme-crystal-22.tar.bz2 -# Source22-md5: 57852ff3d3fd0063a642fcc173f7fa29 Source23: http://www.kadu.net/download/additions/%{name}-0.6-theme-glass-16.tar.gz # Source23-md5: 480c08874b2cb3a23d74b371d7921df0 Source24: http://www.kadu.net/download/additions/%{name}-0.6-theme-glass-22.tar.gz # Source24-md5: 4a3e6a75c314d821c1e5afec2d537e80 -Source25: http://www.kadu.net/download/additions/%{name}-theme-nuvola-16.tar.gz -# Source25-md5: 586cc6ff9ba62f0fdd7c7c1adf229efb -Source26: http://www.kadu.net/download/additions/%{name}-theme-nuvola-22.tar.gz -# Source26-md5: 7a17b4881141b346c6268ef25c284613 Source27: http://www.kadu.net/~dorr/%{name}-firewall-%{_firewall_ver}.tar.bz2 # Source27-md5: 1ba39f4d934d66a3a5d7fbf38266ff36 Source28: http://kadu.net/~patryk/mime_tex/mime_tex-%{_mime_tex_ver}.tar.bz2 @@ -196,6 +186,10 @@ Obsoletes: kadu-module-imiface <= 0.4.3 Obsoletes: kadu-module-speech <= 0.4.3 Obsoletes: kadu-module-tcl_scripting <= 0.4.3 +Obsoletes: kadu-themes-icons-crystal16 <= 0.5.0 +Obsoletes: kadu-themes-icons-crystal22 <= 0.5.0 +Obsoletes: kadu-themes-icons-nuvola16 <= 0.5.0 +Obsoletes: kadu-themes-icons-nuvola22 <= 0.5.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _modules_dir %{_libdir}/%{name}/modules @@ -692,30 +686,6 @@ %description module-weather -l pl.UTF-8 Informacje o pogodzie w miejscowoĹci danego kontaktu. -%package theme-icons-crystal16 -Summary: Crystal16 icon theme -Summary(pl.UTF-8): Zestaw ikon crystal16 -Group: Applications/Communications -Requires: %{name} = %{version}-%{release} - -%description theme-icons-crystal16 -Crystal16 icon theme. - -%description theme-icons-crystal16 -l pl.UTF-8 -Zestaw ikon crystal16. - -%package theme-icons-crystal22 -Summary: Crystal22 icon theme -Summary(pl.UTF-8): Zestaw ikon crystal22 -Group: Applications/Communications -Requires: %{name} = %{version}-%{release} - -%description theme-icons-crystal22 -Crystal22 icon theme. - -%description theme-icons-crystal22 -l pl.UTF-8 -Zestaw ikon crystal22. - %package theme-icons-glass16 Summary: Glass16 icon theme Summary(pl.UTF-8): Zestaw ikon glass16 @@ -740,30 +710,6 @@ %description theme-icons-glass22 -l pl.UTF-8 Zestaw ikon glass22. -%package theme-icons-nuvola16 -Summary: Nuvola16 icon theme -Summary(pl.UTF-8): Zestaw ikon nuvola16 -Group: Applications/Communications -Requires: %{name} = %{version}-%{release} - -%description theme-icons-nuvola16 -Nuvola16 icon theme. - -%description theme-icons-nuvola16 -l pl.UTF-8 -Zestaw ikon nuvola16. - -%package theme-icons-nuvola22 -Summary: Nuvola22 icon theme -Summary(pl.UTF-8): Zestaw ikon nuvola22 -Group: Applications/Communications -Requires: %{name} = %{version}-%{release} - -%description theme-icons-nuvola22 -Nuvola22 icon theme. - -%description theme-icons-nuvola22 -l pl.UTF-8 -Zestaw ikon nuvola22. - %package theme-icons-oxygen16 Summary: Oxygen16 icon theme Summary(pl.UTF-8): Zestaw ikon Oxygen16 @@ -871,22 +817,11 @@ %patch1 -p1 %endif # themes-icons -tar xjf %{SOURCE21} -C varia/themes/icons -tar xjf %{SOURCE22} -C varia/themes/icons tar xzf %{SOURCE23} -C varia/themes/icons tar xzf %{SOURCE24} -C varia/themes/icons -tar xzf %{SOURCE25} -C varia/themes/icons -tar xzf %{SOURCE26} -C varia/themes/icons tar xzf %{SOURCE33} -C varia/themes/icons tar xzf %{SOURCE34} -C varia/themes/icons -# rename theme directories to be sure that they -# will not be re-downloaded by configure -for dir in varia/themes/icons/kadu-theme-*; do - theme=`echo $dir | %{__sed} -e 's/kadu-theme-//; s/[_-]//;'`; - mv $dir $theme -done - %{__sed} -i 's,dataPath("kadu/modules/*,("%{_libdir}/kadu/modules/,g' kadu-core/modules.cpp %build @@ -1086,12 +1021,8 @@ %{__sed} -i 's/module_weather=m/module_weather=n/' .config %endif -%{__sed} -i 's/icons_crystal16=n/icons_crystal16=y/' .config -%{__sed} -i 's/icons_crystal22=n/icons_crystal22=y/' .config %{__sed} -i 's/icons_glass16=n/icons_glass16=y/' .config %{__sed} -i 's/icons_glass22=n/icons_glass22=y/' .config -%{__sed} -i 's/icons_nuvola16=n/icons_nuvola16=y/' .config -%{__sed} -i 's/icons_nuvola22=n/icons_nuvola22=y/' .config %{__sed} -i 's/icons_oxygen16=n/icons_oxygen16=y/' .config %{__sed} -i 's/icons_tango16=n/icons_tango16=y/' .config @@ -1102,7 +1033,8 @@ %{__automake} %configure \ --enable-voice \ - --enable-dist-info="PLD Linux Distribution" + --enable-dist-info="PLD Linux Distribution" \ + --disable-autodownload %{__make} %install @@ -1710,14 +1642,6 @@ %{_datadir}/%{name}/modules/data/weather/icons/*.gif %endif -%files theme-icons-crystal16 -%defattr(644,root,root,755) -%{_datadir}/%{name}/themes/icons/crystal16 - -%files theme-icons-crystal22 -%defattr(644,root,root,755) -%{_datadir}/%{name}/themes/icons/crystal22 - %files theme-icons-glass16 %defattr(644,root,root,755) %{_datadir}/%{name}/themes/icons/glass16 @@ -1726,14 +1650,6 @@ %defattr(644,root,root,755) %{_datadir}/%{name}/themes/icons/glass22 -%files theme-icons-nuvola16 -%defattr(644,root,root,755) -%{_datadir}/%{name}/themes/icons/nuvola16 - -%files theme-icons-nuvola22 -%defattr(644,root,root,755) -%{_datadir}/%{name}/themes/icons/nuvola22 - %files theme-icons-oxygen16 %defattr(644,root,root,755) %{_datadir}/%{name}/themes/icons/oxygen16 @@ -1748,6 +1664,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.97.2.94 2008-01-20 10:54:05 arvenil +- removed crystal* icons and added Obsolete (unsupported in kadu 0.6.0) +- removed nuvola* icons and added Obsolete (unsupported in kadu 0.6.0) +- pass --disable-autodownload option to configure for prevent autodownload +- updated TODO +- cleanup in Log section + Revision 1.97.2.93 2008-01-19 23:52:17 arvenil - forgot to unpack oxygen and tango icon themes - proper files packaging for mime_tex module @@ -2427,19 +2350,19 @@ - updated to 0.3.0 Revision 1.16 2002/05/19 18:19:26 adasi - - added br: Readline-devel +- added br: Readline-devel Revision 1.15 2002/04/29 17:20:13 mmazur - somebody kick the libgadu (s)crew :) needed to turned on statical linking -with libgadu from the kadu tarball because the current snapshot of -libgadu segfaults kadu... stability stability :) + with libgadu from the kadu tarball because the current snapshot of + libgadu segfaults kadu... stability stability :) - and btw: rel2; STBR Revision 1.14 2002/04/26 13:00:06 misiek - add gcc31 patch (standard C++) Revision 1.13 2002/04/25 16:40:13 arturs -fixed a small typo +- fixed a small typo Revision 1.12 2002/04/16 20:37:54 marcus - added BR libgadu-devel @@ -2465,7 +2388,7 @@ - release 3. Revision 1.5 2002/01/18 02:13:28 kloczek -perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/" +- perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/" Revision 1.4 2001/12/15 22:49:00 speedy - fixed. release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kadu.spec?r1=1.97.2.93&r2=1.97.2.94&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
