5:42 p.m.
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2315/devel
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Sat Oct 10 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.0-1
- 2.1.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 29 Sep 2009 16:33:50 -0000 1.29
+++ .cvsignore 9 Oct 2009 17:42:21 -0000 1.30
@@ -1,2 +1,2 @@
-cairo-dock-2.0.8.2.tar.bz2
-cairo-dock-plugins-2.0.8.2.tar.bz2
+cairo-dock-2.1.0.tar.gz
+cairo-dock-plugins-2.1.0.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cairo-dock.spec 29 Sep 2009 16:45:08 -0000 1.37
+++ cairo-dock.spec 9 Oct 2009 17:42:21 -0000 1.38
@@ -11,11 +11,9 @@
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global mainver 2.0.8.2
+%global mainver 2.1.0
%undefine betaver
-%global build_themes 0
-
%global build_webkit 1
%global build_xfce 1
@@ -27,10 +25,6 @@
%if 0%{?released} >= 1
%global build_other 0
%endif
-# Now WebKit plug-in is (will be) included in released tarball
-%if %{build_other} < 1
-%global build_webkit 1
-%endif
Name: cairo-dock
@@ -44,11 +38,8 @@
%if 0%{?released} < 1
Source0: %{name}-sources-%{betaver}.tar.bz2
%else
-Source0: http://download.berlios.de/cairo-dock/%{name}-%{mainver}%{?betaver:-%beta...
-%if %{build_themes}
-Source1: http://download.berlios.de/cairo-dock/%{name}-themes-%{mainver}%{?betaver...
-%endif
-Source2: http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betave...
+Source0: http://launchpad.net/cairo-dock-core/2.1/2.1.0/+download/cairo-dock-%{mai...
+Source2: http://launchpad.net/cairo-dock-plug-ins/2.1/2.1.0/+download/cairo-dock-p...
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -83,11 +74,6 @@
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
@@ -117,26 +103,13 @@
Obsoletes: %{name}-plug-ins-xfce < %{version}-%{release}
%endif
# cairo-dock-themes is obsoleted
-%if ! %{build_themes}
Obsoletes: %{name}-themes < %{version}-%{release}
-%endif
%description
An light eye-candy fully themable animated dock for any
Linux desktop. It has a family-likeness with OSX dock,
but with more options.
-%package themes
-# Kill AutoProv to remove unwilling desktop prov
-AutoProv: No
-BuildArch: noarch
-Summary: Additional themes for %{name}
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
-
-%description themes
-This package contains a set of additional themes for %{name}.
-
%package plug-ins
Summary: Plug-ins files for %{name}
Group: User Interface/Desktops
@@ -186,15 +159,8 @@
%else
###
-%if %{build_themes}
-%setup -q -c -a 1 -a 2
-%else
%setup -q -c -a 2
-%endif
%{__ln_s} -f cairo-dock-%{mainver}%{?betaver:-%betaver} cairo-dock
-%if %{build_themes}
-%{__ln_s} -f cairo-dock-themes-%{mainver}%{?betaver:-%betaver} themes
-%endif
%{__ln_s} -f cairo-dock-plugins-%{mainver}%{?betaver:-%betaver} plug-ins
%endif
###
@@ -233,15 +199,6 @@
-e 's|Icon=\*|Icon=cairo-dock|' \
data/cairo-dock*.desktop
-# B. themes
-%if %{build_themes}
-cd ../themes
-
-%if 0%{?released} < 1
-autoreconf -i -f
-%endif
-%endif
-
# C. plug-ins
cd ../plug-ins
@@ -253,10 +210,7 @@
# source code fix
-# dialog-rendering
-find dialog-rendering -type f \
- \( -not -path '*/.svn/*' -and -not -name \*.png \) \
- | xargs %{__sed} -i -e 's|\r||'
+# Scooby-Do: see below
# stacks: directory fix
%if 0%{?released} < 1
@@ -350,26 +304,26 @@
export CPPFLAGS="%optflags -I$(pwd) -I$(pwd)/cairo-dock"
export PKG_CONFIG_PATH=$(pwd):${PKG_CONFIG_PATH}
-# B themes
-%if %{build_themes}
-cd ../themes
-
-%configure
-%{__make} %{?_smp_mflags} || status=$((status+1))
-%endif
-
# C plug-ins
cd ../plug-ins
# First deal with subdirs in topdir configure.ac, then else
-
%configure \
--enable-gio-in-gmenu \
+ --enable-mail \
+ --enable-network-monitor \
+ --enable-scooby-do \
# Workaround to avoid endless loop on po/
touch po/stamp-it
+# Scooby-Do: workaround
+cd Scooby-Do
+touch config.status
+ln -sf ../libtool
+cd ..
+
# Parallel make fails some times, but it is gerenally fast
# so do parallel make anyway first
retry=0
@@ -416,10 +370,6 @@
DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -p"
-%{__chmod} 0755 $RPM_BUILD_ROOT%{_bindir}/*.sh
-# debian file, not useful
-%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/cairo-dock-update.sh
-
for f in $RPM_BUILD_ROOT%{_datadir}/applications/*desktop
do
desktop-file-validate $f
@@ -434,6 +384,7 @@
for f in \
LICENSE \
+ copyright \
data/ChangeLog.txt \
%if 0%{?released} < 1
doc/HOW-TO__applets.txt \
@@ -447,19 +398,6 @@
%find_lang %{name}
%{__mv} -f %{name}.lang $TOPDIR
-# B. themes
-%if %{build_themes}
-cd ../themes
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- INSTALL="%{__install} -p"
-
-# clean up
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
-# no...
-%{__rm} -rf ./_Ubuntu_/
-popd # from $RPM_BUILD_ROOT
-%endif
# C plug-ins
%{__rm} -rf $TOPDIR/{lang-plug-ins,lang-webkit}
@@ -471,6 +409,9 @@
DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -p"
+%find_lang %{name}-plugins
+cp -p %{name}-plugins.lang $TOPDIR/lang-plug-ins/
+
Subdirs=$(cat Subdirs.list)
for dir in */
do
@@ -519,10 +460,6 @@
cd ..
done
-# Temporary hack
-find $RPM_BUILD_ROOT%{_libdir}/cairo-dock/ -name \*.so | xargs %{__chmod} 0755
-find $RPM_BUILD_ROOT%{_libdir}/cairo-dock -name \*.so.* | xargs %{__rm} -f
-
# documents
%if 0%{?released} < 1
%{__cp} -p Applets.stable $TOPDIR/documents/main/
@@ -595,12 +532,6 @@
# only directory
%dir %{_libdir}/%{name}/
-%if %{build_themes}
-%files themes
-%defattr(-,root,root,-)
-%{_datadir}/%{name}/themes/_[A-Z]*/
-%endif
-
%files plug-ins -f lang-plug-ins.lang
%defattr(-,root,root,-)
%{_libdir}/%{name}/*
@@ -634,6 +565,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Sat Oct 10 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.0-1
+- 2.1.0
+
* Wed Sep 30 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.8.2-1
- 2.0.8.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 29 Sep 2009 16:33:50 -0000 1.31
+++ sources 9 Oct 2009 17:42:21 -0000 1.32
@@ -1,2 +1,2 @@
-a1340928f0297eee820453d8760c9011 cairo-dock-2.0.8.2.tar.bz2
-2f64f54b7c782bc8478e2ee4d0193803 cairo-dock-plugins-2.0.8.2.tar.bz2
+baa9ce9368abb685c99a76e69900b70c cairo-dock-2.1.0.tar.gz
+b461e39da5c34099310ea86b74bbc1b9 cairo-dock-plugins-2.1.0.tar.gz