Author: mtasaka Update of /cvs/free/rpms/cairo-dock/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv3896/F-12 Modified Files: .cvsignore cairo-dock.spec sources Added Files: cairo-dock-plugins-2.1.2.4-showDesklets.patch Removed Files: cairo-dock-2.0.0-dock-rendering-compile.patch cairo-dock-rev1816-dnd2share.patch cairo-dock-rev1821-cairodock.patch cairo-dock-rev1823-cairodock.patch Log Message: * Fri Dec 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; - 2.1.2.4-1 - 2.1.2-4 cairo-dock-plugins-2.1.2.4-showDesklets.patch: configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE cairo-dock-plugins-2.1.2.4-showDesklets.patch --- === modified file 'configure.ac' --- configure.ac 2009-12-05 13:29:23 +0000 +++ configure.ac 2009-12-17 18:54:04 +0000 @@ -124,7 +124,7 @@ [ --enable-rssreader : Enable rssreader applet (default=no) ], [ with_rssreader=${enableval} ], [ with_rssreader=no ]) -AC_ARG_ENABLE(, +AC_ARG_ENABLE(show-desklets, [ --enable-show-desklets : Enable showDesklets applet (default=no) ], [ with_showDesklets=${enableval} ], [ with_showDesklets=no ]) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/cairo-dock/F-12/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 5 Nov 2009 15:49:12 -0000 1.31 +++ .cvsignore 17 Dec 2009 20:53:01 -0000 1.32 @@ -1,2 +1,3 @@ -cairo-dock-2.1.1-2.tar.gz -cairo-dock-plugins-2.1.1-2.tar.gz +cairo-dock-2.1.2-4.tar.gz +cairo-dock-plugins-2.1.2-4.tar.gz +cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz Index: cairo-dock.spec =================================================================== RCS file: /cvs/free/rpms/cairo-dock/F-12/cairo-dock.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- cairo-dock.spec 5 Nov 2009 16:03:00 -0000 1.40 +++ cairo-dock.spec 17 Dec 2009 20:53:01 -0000 1.41 @@ -1,10 +1,15 @@ # NOTE! # Now for weblet plug-ins now cairo-dock uses WebKit, not Gecko. -# For svn -# svn checkout http://svn.berlios.de/svnroot/repos/cairo-dock/trunk -# cd trunk -# tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . +# Now upstream VCS uses bazaar +# To gain the source codes from upstream VCS, use +# $ bzr branch <URL> +# , where the current URL is: +# +# For core: +# http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-core/2.1.x/ +# For plug-ins: +# http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-plug-ins/2.1.x/ %global released 1 %undefine pre_release @@ -12,9 +17,9 @@ %global build_other 1 %global urlver 2.1 -%global mainver 2.1.1 +%global mainver 2.1.2 %undefine betaver -%global postver 2 +%global postver 4 %global build_webkit 1 %global build_xfce 1 @@ -43,15 +48,20 @@ Source0: http://launchpad.net/cairo-dock-core/%{urlver}/%{mainver}/+download/cairo... Source2: http://launchpad.net/cairo-dock-plug-ins/%{urlver}/%{mainver}/+download/c... %endif +# Temporarily +# pulled from plug-ins 2.1.x branch rev 1449 +Source10: cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # plug-ins specific patches Patch100: cairo-dock-rev1677-stacks.patch +Patch101: cairo-dock-plugins-2.1.2.4-showDesklets.patch -%if ! %{released} +# For patch101 +#%%if ! %{released} BuildRequires: automake BuildRequires: libtool -%endif +#%%endif BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool @@ -167,6 +177,13 @@ %endif ### +### +# Temporarily +cd plug-ins +gzip -dc %{SOURCE10} | tar xf - +cd .. +### + %if 0 find . -type d -name \.svn | sort -r | xargs %{__rm} -rf find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf @@ -212,6 +229,9 @@ # source code fix +# showDesklets +%patch101 -p0 -b .miss + # stacks: directory fix %if 0%{?released} < 1 %patch100 -p0 -b .compile @@ -224,7 +244,7 @@ # First deal with subdirs in configure.ac of topdir, then else -if [ -f Makefile.am ] ; then +if [[ -f Makefile.am && (0%{?released} -lt 1) ]] ; then Subdirs_1=$(%{__sed} -n -e &#39;\@SUBDIR@,\@^.*[^\\]$(a)p&#39; Makefile.am | sed -e 's|\\$||' | tail -n +2) %{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh @@ -241,6 +261,12 @@ %{__sed} -i.1 -e '\@po/@d' Subdirs.list fi +## Patch101 needs autotools +## Call here +autoreconf -fi +## +## + for dir in */ do skip=0 @@ -311,7 +337,9 @@ %configure \ --enable-gio-in-gmenu \ --enable-network-monitor \ + --enable-rssreader \ --enable-scooby-do \ + --enable-show-desklets # Workaround to avoid endless loop on po/ @@ -568,6 +596,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Fri Dec 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; - 2.1.2.4-1 +- 2.1.2-4 + * Sat Nov 6 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp&gt; - 2.1.1.2-1 - 2.1.1-2 Index: sources =================================================================== RCS file: /cvs/free/rpms/cairo-dock/F-12/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 5 Nov 2009 15:49:13 -0000 1.33 +++ sources 17 Dec 2009 20:53:01 -0000 1.34 @@ -1,2 +1,3 @@ -30cf9238ddfa502d1a0274a7bd6027fa cairo-dock-2.1.1-2.tar.gz -cf59f3b5afc11c78894317ba83c4f39d cairo-dock-plugins-2.1.1-2.tar.gz +23815db69c97e751244bbef4a9882233 cairo-dock-2.1.2-4.tar.gz +920d12c052a3c4a5be8a43a33c718d9b cairo-dock-plugins-2.1.2-4.tar.gz +04a3dcc316b37f8880625b0cb0b46784 cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz --- cairo-dock-2.0.0-dock-rendering-compile.patch DELETED --- --- cairo-dock-rev1816-dnd2share.patch DELETED --- --- cairo-dock-rev1821-cairodock.patch DELETED --- --- cairo-dock-rev1823-cairodock.patch DELETED ---