10:57 p.m.
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19448
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Fri Mar 4 2011 Mamoru Tasaka <mtasaka(a)fedoraproject.org> - 2.3.0-0.1.0rc1
- 2.3.0 0rc1
- Dbus interface: enable python, disable python, disable vala for now
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore 8 Dec 2010 22:36:15 -0000 1.40
+++ .cvsignore 3 Mar 2011 22:57:34 -0000 1.41
@@ -1,2 +1,2 @@
-cairo-dock-2.2.0-4.tar.gz
-cairo-dock-plugins-2.2.0-4.tar.gz
+cairo-dock-2.3.0~0rc1.tar.gz
+cairo-dock-plugins-2.3.0~0rc1.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- cairo-dock.spec 8 Dec 2010 22:36:15 -0000 1.55
+++ cairo-dock.spec 3 Mar 2011 22:57:34 -0000 1.56
@@ -12,14 +12,14 @@
# http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-plug-ins/2.1.x/
%global released 1
-%undefine pre_release
+%define pre_release 1
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global urlver 2.2
-%global mainver 2.2.0
-%undefine betaver
-%global postver 4
+%global urlver 2.3
+%global mainver 2.3.0
+%define betaver 0rc1
+%undefine postver
%global build_webkit 1
%global build_xfce 1
@@ -33,6 +33,19 @@
%global build_other 0
%endif
+# Bindings
+%global build_python 1
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+
+%global build_ruby 0
+%global rubyabi 1.8
+%global ruby_sitearch %(ruby -rrbconfig -e "puts
Config::CONFIG['sitearchdir']")
+# FIXME
+# I don't know well about vala !!
+%global build_vala 0
+
+# For debugging
+%global skip_main_build 0
Name: cairo-dock
Version: %{mainver}%{?postver:.%postver}
@@ -45,8 +58,8 @@
%if 0%{?released} < 1
Source0: %{name}-sources-%{betaver}.tar.bz2
%else
-Source0: http://launchpad.net/cairo-dock-core/%{urlver}/%{mainver}/+download/cairo...
-Source2: http://launchpad.net/cairo-dock-plug-ins/%{urlver}/%{mainver}/+download/c...
+Source0: http://launchpad.net/cairo-dock-core/%{urlver}/%{mainver}%{?betaver:-%bet...
+Source2: http://launchpad.net/cairo-dock-plug-ins/%{urlver}/%{mainver}%{?betaver:-...
%endif
BuildRequires: cmake
@@ -93,6 +106,20 @@
BuildRequires: WebKit-gtk-devel
%endif
+# Bindings
+%if %{build_python}
+BuildRequires: python2-devel
+%endif
+%if %{build_ruby}
+BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby
+BuildRequires: ruby-devel
+%endif
+%if %{build_vala}
+#?????
+# BuildRequires: vala
+%endif
+
# This is a meta package to install cairo-dock-core and
# cairo-dock-plug-ins
Requires: %{name}-core = %{version}-%{release}
@@ -165,6 +192,38 @@
This package contains plug-ins files for %{name} related
to webkit.
+%package python
+Summary: Python binding for %{name}
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: pygobject2
+Requires: dbus-python
+
+%description python
+This package contains Python binding files for %{name}
+
+%package ruby
+Summary: Ruby binding for %{name}
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: ruby(abi) = %{rubyabi}
+Requires: rubygems
+# The following is not in Fedora yet
+Requires: rubygem(dbus)
+
+%description ruby
+This package contains Ruby binding files for %{name}
+
+%package vala
+Summary: Vala binding for %{name}
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+# ???
+Requires: vala
+
+%description vala
+This package contains Vala binding files for %{name}
+
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
@@ -177,14 +236,15 @@
%prep
%setup -q -c -a 2
-ln -s -f cairo-dock-%{mainver}%{?postver:-%postver}%{?betaver:-%betaver} cairo-dock
-ln -s -f cairo-dock-plugins-%{mainver}%{?postver:-%postver}%{?betaver:-%betaver}
plug-ins
+ln -s -f cairo-dock-%{mainver}* cairo-dock
+ln -s -f cairo-dock-plugins-%{mainver}* plug-ins
%if 0
find . -type d -name \.svn | sort -r | xargs rm -rf
find . -type d -name \*CVS\* | sort -r | xargs rm -rf
%endif
+TOPDIR=$(pwd)
pushd .
# A. main
@@ -235,9 +295,22 @@
po/CMakeLists.txt
## source code fix
-
-# template: upstream says this is not needed
-#rm -rf template/
+## Bindings
+# Ruby
+sed -i.site \
+ -e "s|CONFIG\['rubylibdir'\]|CONFIG['sitearchdir']|" \
+ CMakeLists.txt
+# Python
+## FIXME
+sed -i.buildroot \
+ -e
"s|--prefix=\\\${CMAKE_INSTALL_PREFIX}|--prefix=$TOPDIR/TMPINSTDIR/\\\${CMAKE_INSTALL_PREFIX}|"
\
+ Dbus/interfaces/python/PythonInstall.cmake.in \
+ Dbus/interfaces/bash/BashInstall.cmake.in
+# Vala
+## FIXME
+sed -i.vala \
+ -e '/with_vala /s|yes|no|' \
+ CMakeLists.txt
popd # from opt/cairo-dock/trunk/cairo-dock
@@ -251,6 +324,8 @@
# A. main
pushd cairo-dock
+%if %{skip_main_build} < 1
+
## rpath issue needs investigating
%cmake -DCMAKE_SKIP_RPATH:BOOL=ON .
%{__make} %{?_smp_mflags} || status=$((status+1))
@@ -262,6 +337,8 @@
INSTALL="install -p" \
|| status=$((status+1))
+%endif
+
export CFLAGS="%optflags -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock"
export CFLAGS="$CFLAGS
-I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/cairo-dock"
export CFLAGS="$CFLAGS
-I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/icon-factory"
@@ -276,7 +353,20 @@
# C plug-ins
cd ../plug-ins
-%cmake .
+# Create pseudo executable files
+test -d TMPBINDIR || mkdir TMPBINDIR
+export PATH=$(pwd)/TMPBINDIR:$PATH
+
+cd TMPBINDIR
+# Ruby: not ready
+%if %{build_ruby} < 1
+ln -sf /bin/false ruby
+%endif
+cd ..
+
+rm -f CMakeCache.txt
+%cmake \
+ .
## Parallel make fails some times, but it is gerenally fast
## so do parallel make anyway first
@@ -408,6 +498,7 @@
#%%{_datadir}/%{name}/emblems/
%{_datadir}/%{name}/explosion/
%{_datadir}/%{name}/gauges/
+%{_datadir}/%{name}/icons/
%dir %{_datadir}/%{name}/themes/
%dir %{_datadir}/%{name}/plug-ins/
%{_datadir}/%{name}/themes/_default_/
@@ -452,6 +543,20 @@
%{_datadir}/%{name}/plug-ins/*weblet*
%endif
+%if %{build_python} > 0
+%files python
+%defattr(-,root,root,-)
+%{python_sitelib}/CDApplet.py*
+%{python_sitelib}/CDBashApplet.py*
+%{python_sitelib}/*.egg-info
+%endif
+
+%if %{build_ruby} > 0
+%files ruby
+%defattr(-,root,root,-)
+%{ruby_sitearch}/CDApplet.rb
+%endif
+
%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
@@ -459,6 +564,10 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Mar 4 2011 Mamoru Tasaka <mtasaka(a)fedoraproject.org> - 2.3.0-0.1.0rc1
+- 2.3.0 0rc1
+- Dbus interface: enable python, disable python, disable vala for now
+
* Thu Dec 9 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.2.0.4-1
- 2.2.0-4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources 8 Dec 2010 22:36:15 -0000 1.42
+++ sources 3 Mar 2011 22:57:34 -0000 1.43
@@ -1,2 +1,2 @@
-5905fed8aaee9b6056a8e2f83a8c4f3f cairo-dock-2.2.0-4.tar.gz
-7585bf608773f3b8cc633c835ca2704f cairo-dock-plugins-2.2.0-4.tar.gz
+b5bf351e7087990a0df9c926f8a9b750 cairo-dock-2.3.0~0rc1.tar.gz
+1e56165ce19852c977f13fe95d26c32c cairo-dock-plugins-2.3.0~0rc1.tar.gz