rpms/cairo-dock/devel .cvsignore, 1.104, 1.105 cairo-dock.spec, 1.141, 1.142 sources, 1.104, 1.105

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8306

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1496
- Include Wanda directory in Cairo-Penguin plug-in again



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- .cvsignore	21 Jan 2009 05:10:47 -0000	1.104
+++ .cvsignore	22 Jan 2009 04:53:04 -0000	1.105
@@ -1 +1 @@
-cairo-dock-sources-svn1494_trunk.tar.bz2
+cairo-dock-sources-svn1496_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- cairo-dock.spec	21 Jan 2009 05:37:56 -0000	1.141
+++ cairo-dock.spec	22 Jan 2009 04:53:04 -0000	1.142
@@ -14,7 +14,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1494_trunk
+%define		tarballver	svn1496_trunk
 
 %define		fedora_main_rel	3
 
@@ -215,10 +215,12 @@
 # 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' \
-	-e '/Wanda/d' \
 	Cairo-Penguin/data/themes/Makefile.am \
 	configure.ac
 %{__sed} -i.icon2 -e '$s|\\$||' Cairo-Penguin/data/themes/Makefile.am
@@ -640,8 +642,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Wed Jan 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1494
+* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1496
+- Include Wanda directory in Cairo-Penguin plug-in again
 
 * Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1484


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	21 Jan 2009 05:10:47 -0000	1.104
+++ sources	22 Jan 2009 04:53:04 -0000	1.105
@@ -1 +1 @@
-9f62c0cf733b113e9ad3b9e43067b2fc  cairo-dock-sources-svn1494_trunk.tar.bz2
+5793909618917764b46b857d3dcd2047  cairo-dock-sources-svn1496_trunk.tar.bz2