Author: mtasaka Update of /cvs/free/rpms/cairo-dock/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv28351 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Thu Jul 2 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; - F-12: rebuild against new libxklavier Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 29 Jun 2009 15:01:37 -0000 1.25 +++ .cvsignore 2 Jul 2009 11:58:43 -0000 1.26 @@ -1,2 +1 @@ -cairo-dock-2.0.6.tar.bz2 -cairo-dock-plugins-2.0.6.tar.bz2 +cairo-dock-sources-svn1841_trunk.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- cairo-dock.spec 29 Jun 2009 15:01:37 -0000 1.32 +++ cairo-dock.spec 2 Jul 2009 11:58:43 -0000 1.33 @@ -6,20 +6,20 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%global released 1 +%global released 0 %undefine pre_release # Set the below to 1 when building unstable plug-ins %global build_other 1 %global mainver 2.0.6 -%undefine betaver +%define betaver svn1841_trunk %global build_themes 0 %global build_webkit 1 %global build_xfce 1 -%global fedora_main_rel 1 +%global fedora_main_rel 2 %global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver} @@ -83,6 +83,11 @@ BuildRequires: libexif-devel BuildRequires: libgnomeui-devel BuildRequires: libxklavier-devel +# (for now make it sure that buildtree used is correctly synced with rawhide tree +# and new libxklavier is correctly used) +%if 0%{?fedora} >= 12 +BuildRequires: libxklavier-devel >= 4.0 +%endif BuildRequires: libXxf86vm-devel BuildRequires: vte-devel # Not shown in .pc files @@ -629,6 +634,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jul 2 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; +- F-12: rebuild against new libxklavier + * Sat Jun 27 2009 Mamoru Tasaka <mtaaska(a)ioa.s.u-tokyo.ac.jp&gt; - 2.0.6-1 - 2.0.6 Index: sources =================================================================== RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 29 Jun 2009 15:01:37 -0000 1.27 +++ sources 2 Jul 2009 11:58:43 -0000 1.28 @@ -1,2 +1 @@ -8d0d213e64824445e7a291eb5f16dd45 cairo-dock-2.0.6.tar.bz2 -5444eab4192f980f9ef93d6bc95b1585 cairo-dock-plugins-2.0.6.tar.bz2 +1bd158afc6c53fdc4ee7524bd41c59a2 cairo-dock-sources-svn1841_trunk.tar.bz2