rpms/cairo-dock/devel .cvsignore, 1.15, 1.16 cairo-dock.spec, 1.22, 1.23 sources, 1.17, 1.18
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31677
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Mon Jun 8 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- rev 1809
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 23 May 2009 15:55:41 -0000 1.15
+++ .cvsignore 8 Jun 2009 22:23:44 -0000 1.16
@@ -1,2 +1 @@
-cairo-dock-2.0.3.tar.bz2
-cairo-dock-plugins-2.0.3.tar.bz2
+cairo-dock-sources-svn1809_trunk.tar.bz2
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cairo-dock.spec 25 May 2009 11:06:15 -0000 1.22
+++ cairo-dock.spec 8 Jun 2009 22:23:44 -0000 1.23
@@ -6,20 +6,20 @@
# cd trunk
# tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
-%global released 1
-%undefine pre_release
+%global released 0
+%define pre_release 1
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global mainver 2.0.3
-%undefine betaver
+%global mainver 2.0.4
+%define betaver svn1809_trunk
%global build_themes 0
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 2
+%global fedora_main_rel 1
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -54,7 +54,6 @@
# plug-ins specific patches
Patch100: cairo-dock-rev1677-stacks.patch
-#Patch101: cairo-dock-2.0.0-dock-rendering-compile.patch
%if ! %{released}
BuildRequires: automake
@@ -251,11 +250,6 @@
\( -not -path '*/.svn/*' -and -not -name \*.png \) \
| xargs %{__sed} -i -e 's|\r||'
-# dock-rendering
-#%%patch101 -p1 -b .compile
-
-# mail: license conflict now resolved
-
# stacks: directory fix
%if 0%{?released} < 1
%patch100 -p0 -b .compile
@@ -263,6 +257,11 @@
stacks/configure.ac
%endif
+# System-Monitor
+%{__sed} -i.typo \
+ -e 's|CPUSAGE|SYSTEM_MONITOR|' \
+ System-Monitor/po/Makefile.in.in
+
# template: upstream says this is not needed
%{__rm} -rf template/
@@ -629,6 +628,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Jun 8 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
+- rev 1809
+
* Mon May 25 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.3-2
- Workaround to avoid endless loop on po/ directory
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 23 May 2009 15:55:41 -0000 1.17
+++ sources 8 Jun 2009 22:23:44 -0000 1.18
@@ -1,2 +1 @@
-e9ff5878bd97ffbd9871c701f81876c0 cairo-dock-2.0.3.tar.bz2
-b76f8c9915750fbb7b53a3a0098368d3 cairo-dock-plugins-2.0.3.tar.bz2
+24d42b7aae03657f3f4be18bfb454d84 cairo-dock-sources-svn1809_trunk.tar.bz2