Author: mtasaka Update of /cvs/free/rpms/cairo-dock/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv2166 Modified Files: cairo-dock.spec sources Log Message: Previous one was actually rev 1687, not 1689... Index: cairo-dock.spec =================================================================== RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cairo-dock.spec 26 Apr 2009 11:11:17 -0000 1.6 +++ cairo-dock.spec 26 Apr 2009 18:40:59 -0000 1.7 @@ -17,7 +17,7 @@ %global build_webkit 1 %global build_xfce 1 -%global fedora_main_rel 5 +%global fedora_main_rel 6 %if 0%{?released} < 1 @@ -51,11 +51,7 @@ %if %{build_themes} Source1: http://download.berlios.de/cairo-dock/%{name}-themes-%{mainver}%{?betaver... %endif -# Some trademarked icons under Cairo-Penguin should be removed -# After unpacking tarball, remove: -# - Cairo-Penguin/data/themes/{Mario,The_Simpsons} -#Source2: http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betave... -Source2: %{name}-plugins-%{mainver}%{?betaver:-%betaver}-modified.tar.bz2 +Source2: http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betave... %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -126,6 +122,9 @@ but with more options. %package themes +# Kill AutoProv to remove unwilling desktop prov +AutoProv: No +BuildArch: noarch Summary: Additional themes for %{name} Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} @@ -246,38 +245,6 @@ # source code fix -# Cairo-Penguin -## Removing trademarked icons -## The following directories are (should be) also removed from the tarball -## -## Note: -## This is under discussion with upstream -%{__sed} -i.icon \ - -e '/The_Simpsons/d' \ - -e '/Mario/d' \ -%if 0%{?released} < 1 - Cairo-Penguin/data/themes/Makefile.am \ - configure.ac -%else - Cairo-Penguin/data/themes/Makefile.in -%endif -%if 0%{?released} < 1 -%{__sed} -i.icon2 -e '$s|\\$||' Cairo-Penguin/data/themes/Makefile.am -%else -%{__sed} -i.icon2 -e 's|SantaClaus \\|SantaClaus|' Cairo-Penguin/data/themes/Makefile.in -%{__sed} -i.icon \ - -e '/ac_config_files/s|Cairo-Penguin[^ ][^ ]*/Mario/Makefile| |g' \ - -e '/ac_config_files/s|Cairo-Penguin[^ ][^ ]*/The_Simpsons/Makefile| |g' \ - -e &#39;\@CONFIG_FILES=.*Mario/Makefile(a)d&#39; \ - -e &#39;\@CONFIG_FILES=.*The_Simpsons/Makefile(a)d&#39; \ - configure -%endif - -# Toons -%{__sed} -i.tools \ - -e 's|^\([ \t][ \t]*\)\(data/themes/\)|\1Toons/\2|' \ - configure.ac - # dialog-rendering find dialog-rendering -type f \ \( -not -path '*/.svn/*' -and -not -name \*.png \) \ @@ -650,9 +617,13 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sun Apr 26 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; +* Mon Apr 27 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; - rev 1689 +* Mon Apr 27 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; - 2.0.0-0.6.svn1689_trunk +- Kill AutoProv on -themes subpackage to avoid unneeded desktop prov +- Build -themes subpackage as noarch + * Sat Apr 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; - 2.0.0-0.4.rc3 - 2.0.0 rc3 - Move to rpmfusion Index: sources =================================================================== RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Apr 2009 16:10:46 -0000 1.4 +++ sources 26 Apr 2009 18:40:59 -0000 1.5 @@ -1 +1 @@ -c9d8a8aad69e1a64f712dc47ca38d0b1 cairo-dock-sources-svn1689_trunk.tar.bz2 +d8e57757e6450d1c5f833a1e4d8c9f0d cairo-dock-sources-svn1689_trunk.tar.bz2