4:34 p.m.
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31577
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Sat Nov 6 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.1.2-1
- 2.1.1-2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 9 Oct 2009 17:42:21 -0000 1.22
+++ .cvsignore 5 Nov 2009 16:34:37 -0000 1.23
@@ -1,2 +1,2 @@
-cairo-dock-2.1.0.tar.gz
-cairo-dock-plugins-2.1.0.tar.gz
+cairo-dock-2.1.1-2.tar.gz
+cairo-dock-plugins-2.1.1-2.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/cairo-dock.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cairo-dock.spec 9 Oct 2009 17:42:21 -0000 1.30
+++ cairo-dock.spec 5 Nov 2009 16:34:37 -0000 1.31
@@ -11,8 +11,10 @@
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global mainver 2.1.0
-%undefine betaver
+%global urlver 2.1
+%global mainver 2.1.1
+%undefine betaver
+%global postver 2
%global build_webkit 1
%global build_xfce 1
@@ -28,7 +30,7 @@
Name: cairo-dock
-Version: %{mainver}
+Version: %{mainver}%{?postver:.%postver}
Release: %{fedora_rel}%{?dist}
Summary: Light eye-candy fully themable animated dock
@@ -38,8 +40,8 @@
%if 0%{?released} < 1
Source0: %{name}-sources-%{betaver}.tar.bz2
%else
-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...
+Source0: http://launchpad.net/cairo-dock-core/%{urlver}/%{mainver}/+download/cairo...
+Source2: http://launchpad.net/cairo-dock-plug-ins/%{urlver}/%{mainver}/+download/c...
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -160,8 +162,8 @@
###
%setup -q -c -a 2
-%{__ln_s} -f cairo-dock-%{mainver}%{?betaver:-%betaver} cairo-dock
-%{__ln_s} -f cairo-dock-plugins-%{mainver}%{?betaver:-%betaver} plug-ins
+%{__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
%endif
###
@@ -210,8 +212,6 @@
# source code fix
-# Scooby-Do: see below
-
# stacks: directory fix
%if 0%{?released} < 1
%patch100 -p0 -b .compile
@@ -310,7 +310,6 @@
# First deal with subdirs in topdir configure.ac, then else
%configure \
--enable-gio-in-gmenu \
- --enable-mail \
--enable-network-monitor \
--enable-scooby-do \
@@ -318,12 +317,6 @@
# 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
@@ -383,6 +376,7 @@
%{__mkdir} -p $TOPDIR/documents/main
for f in \
+ ChangeLog \
LICENSE \
copyright \
data/ChangeLog.txt \
@@ -461,9 +455,16 @@
done
# documents
+rm -rf $TOPDIR/documents/plug-ins/
+mkdir -p $TOPDIR/documents/plug-ins/
+
%if 0%{?released} < 1
-%{__cp} -p Applets.stable $TOPDIR/documents/main/
+%{__cp} -p Applets.stable $TOPDIR/documents/plug-ins/
%endif
+%{__install} -cpm 0644 \
+ LICENSE \
+ copyright \
+ $TOPDIR/documents/plug-ins/
# lang files
find $TOPDIR/lang-plug-ins/ -name '*.lang' | xargs cat >
$TOPDIR/lang-plug-ins.lang
@@ -534,6 +535,8 @@
%files plug-ins -f lang-plug-ins.lang
%defattr(-,root,root,-)
+%doc documents/plug-ins/*
+
%{_libdir}/%{name}/*
%{_datadir}/%{name}/plug-ins/*
%if %{build_webkit} > 0
@@ -565,6 +568,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Sat Nov 6 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.1.2-1
+- 2.1.1-2
+
* Sat Oct 10 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.0-1
- 2.1.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 9 Oct 2009 17:42:21 -0000 1.24
+++ sources 5 Nov 2009 16:34:37 -0000 1.25
@@ -1,2 +1,2 @@
-baa9ce9368abb685c99a76e69900b70c cairo-dock-2.1.0.tar.gz
-b461e39da5c34099310ea86b74bbc1b9 cairo-dock-plugins-2.1.0.tar.gz
+30cf9238ddfa502d1a0274a7bd6027fa cairo-dock-2.1.1-2.tar.gz
+cf59f3b5afc11c78894317ba83c4f39d cairo-dock-plugins-2.1.1-2.tar.gz