rpms/cairo-dock/devel .cvsignore, 1.22, 1.23 cairo-dock.spec, 1.29, 1.30 sources, 1.24, 1.25

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23488

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Tue Jun 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1832
- Remove workaround for bug 506656



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	18 Jun 2009 13:57:36 -0000	1.22
+++ .cvsignore	22 Jun 2009 17:34:42 -0000	1.23
@@ -1 +1 @@
-cairo-dock-sources-svn1826_trunk.tar.bz2
+cairo-dock-sources-svn1832_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cairo-dock.spec	18 Jun 2009 13:57:36 -0000	1.29
+++ cairo-dock.spec	22 Jun 2009 17:34:42 -0000	1.30
@@ -7,19 +7,19 @@
 # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
 
 %global		released	0
-%undefine		pre_release	
+%define		pre_release	1
 # Set the below to 1 when building unstable plug-ins
 %global		build_other	1
 
-%global		mainver		2.0.5
-%define		betaver		svn1826_trunk
+%global		mainver		2.0.6
+%define		betaver		svn1832_trunk
 
 %global		build_themes	0
 
 %global		build_webkit	1
 %global		build_xfce	1
 
-%global		fedora_main_rel	2
+%global		fedora_main_rel	1
 
 
 %global		fedora_rel	%{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -54,7 +54,7 @@
 
 # plug-ins specific patches
 Patch100:	cairo-dock-rev1677-stacks.patch
-Patch200:	xorg-x11-proto-devel-workaround-bz505774.patch
+#Patch200:	xorg-x11-proto-devel-workaround-bz505774.patch
 
 %if ! %{released}
 BuildRequires:	automake
@@ -202,6 +202,7 @@
 
 pushd .
 
+%if 0
 ####
 # Workaround for bz 506656
 mkdir -p .%{_includedir}/X11/extensions
@@ -213,6 +214,7 @@
 %global optflags_ %{optflags}
 %global optflags %{optflags_} -I%{_builddir}/%{name}-%{version}/%{_includedir}
 ####
+%endif
 
 # A. main
 cd cairo-dock
@@ -642,8 +644,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Thu Jun 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1826
+* Tue Jun 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1832
+- Remove workaround for bug 506656
 
 * Thu Jun 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1825


Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	18 Jun 2009 13:57:36 -0000	1.24
+++ sources	22 Jun 2009 17:34:42 -0000	1.25
@@ -1 +1 @@
-762c4ba8eaffb5dfdeb12e3038e4f366  cairo-dock-sources-svn1826_trunk.tar.bz2
+0a8daa85840ddf1faf027f12eaa19896  cairo-dock-sources-svn1832_trunk.tar.bz2