11:23 a.m.
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2476
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Wed Apr 29 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.0-0.7.rc5
- 2.0.0 rc5
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 28 Apr 2009 06:55:48 -0000 1.5
+++ .cvsignore 29 Apr 2009 11:23:24 -0000 1.6
@@ -1 +1,3 @@
-cairo-dock-sources-svn1691_trunk.tar.bz2
+cairo-dock-2.0.0-rc5.tar.bz2
+cairo-dock-plugins-2.0.0-rc5.tar.bz2
+cairo-dock-2.0.0-rc5-missing-files.tar.bz2
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cairo-dock.spec 28 Apr 2009 08:19:32 -0000 1.9
+++ cairo-dock.spec 29 Apr 2009 11:23:24 -0000 1.10
@@ -6,18 +6,20 @@
# cd trunk
# tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
-%global released 0
+%global released 1
# Set the below to 1 when building unstable plug-ins
%global build_other 1
%global mainver 2.0.0
-%global betaver rc4
-%global tarballver svn1691_trunk
+%global betaver rc5
+%global tarballver svn1692_trunk
+
+%global build_themes 0
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 6
+%global fedora_main_rel 7
%if 0%{?released} < 1
@@ -33,7 +35,6 @@
%if %{build_other} < 1
%global build_webkit 1
%endif
-%global build_themes 1
Name: cairo-dock
@@ -53,6 +54,8 @@
%endif
Source2: http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betave...
%endif
+## Again..
+Source10: cairo-dock-2.0.0-rc5-missing-files.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# plug-ins specific patches
@@ -182,13 +185,16 @@
%if %{build_themes}
%setup -q -c -a 1 -a 2
%else
-%setup -q -c -a 2
+%setup -q -c -a 2 -a 10
%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
+
+cp -a Missing-files/plug-ins/* plug-ins/
+
%endif
###
@@ -250,9 +256,22 @@
# mail: license conflict now resolved
+# quick-browse
+# Not imported into released tarball yet
+%if 0%{?released}
+for plugs in \
+ quick-browser
+do
+ %{__sed} -i.p2 \
+ -e "/ac_config_files/s|${plugs}/[^ ][^ ]*| |g" \
+ -e "\@CONFIG_FILES=.*${plugs}(a)d" \
+ configure
+done
+%endif
+
# stacks: directory fix
-%patch100 -p0 -b .compile
%if 0%{?released} < 1
+%patch100 -p0 -b .compile
%{__sed} -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \
stacks/configure.ac
%endif
@@ -615,8 +634,8 @@
%{_libdir}/pkgconfig/*.pc
%changelog
-* Tue Apr 28 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
-- rev 1691
+* Wed Apr 29 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.0-0.7.rc5
+- 2.0.0 rc5
* Mon Apr 27 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> -
2.0.0-0.6.svn1689_trunk
- Kill AutoProv on -themes subpackage to avoid unneeded desktop prov
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 28 Apr 2009 06:55:48 -0000 1.6
+++ sources 29 Apr 2009 11:23:24 -0000 1.7
@@ -1 +1,3 @@
-2a830538e961d542648eec716a84b41d cairo-dock-sources-svn1691_trunk.tar.bz2
+2d68c3f0d4d96f147fea66e58779922d cairo-dock-2.0.0-rc5.tar.bz2
+e92015cdc616f6d4f6f7ecccf8668e41 cairo-dock-plugins-2.0.0-rc5.tar.bz2
+dd7c0ef87d2e6581d2d9420f99fd1f94 cairo-dock-2.0.0-rc5-missing-files.tar.bz2