rpms/cairo-dock/devel .cvsignore, 1.24, 1.25 cairo-dock.spec, 1.31, 1.32 sources, 1.26, 1.27

Author: mtasaka Update of /cvs/free/rpms/cairo-dock/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv12434/devel Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Sat Jun 27 2009 Mamoru Tasaka <mtaaska(a)ioa.s.u-tokyo.ac.jp&gt; - 2.0.6-1 - 2.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 24 Jun 2009 18:31:51 -0000 1.24 +++ .cvsignore 29 Jun 2009 15:01:37 -0000 1.25 @@ -1 +1,2 @@ -cairo-dock-sources-svn1833_trunk.tar.bz2 +cairo-dock-2.0.6.tar.bz2 +cairo-dock-plugins-2.0.6.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- cairo-dock.spec 24 Jun 2009 18:31:51 -0000 1.31 +++ cairo-dock.spec 29 Jun 2009 15:01:37 -0000 1.32 @@ -6,13 +6,13 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%global released 0 -%define pre_release 1 +%global released 1 +%undefine pre_release # Set the below to 1 when building unstable plug-ins %global build_other 1 %global mainver 2.0.6 -%define betaver svn1833_trunk +%undefine betaver %global build_themes 0 @@ -54,7 +54,6 @@ # plug-ins specific patches Patch100: cairo-dock-rev1677-stacks.patch -#Patch200: xorg-x11-proto-devel-workaround-bz505774.patch %if ! %{released} BuildRequires: automake @@ -202,20 +201,6 @@ pushd . -%if 0 -#### -# Workaround for bz 506656 -mkdir -p .%{_includedir}/X11/extensions -pushd .%{_includedir}/X11/extensions -cp -p %{_includedir}/X11/extensions/XTest.h . -%patch200 -p4 -popd - -%global optflags_ %{optflags} -%global optflags %{optflags_} -I%{_builddir}/%{name}-%{version}/%{_includedir} -#### -%endif - # A. main cd cairo-dock @@ -644,6 +629,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Sat Jun 27 2009 Mamoru Tasaka <mtaaska(a)ioa.s.u-tokyo.ac.jp&gt; - 2.0.6-1 +- 2.0.6 + * Thu Jun 25 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; - rev 1833 - Remove workaround for bug 506656 Index: sources =================================================================== RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 24 Jun 2009 18:31:51 -0000 1.26 +++ sources 29 Jun 2009 15:01:37 -0000 1.27 @@ -1 +1,2 @@ -79f3fc36c67b383e7f097e392a5a297d cairo-dock-sources-svn1833_trunk.tar.bz2 +8d0d213e64824445e7a291eb5f16dd45 cairo-dock-2.0.6.tar.bz2 +5444eab4192f980f9ef93d6bc95b1585 cairo-dock-plugins-2.0.6.tar.bz2