rpms/cairo-dock/devel .cvsignore, 1.3, 1.4 cairo-dock.spec, 1.3, 1.4 sources, 1.3, 1.4
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7844
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Sun Apr 26 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- rev 1689
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 22 Apr 2009 20:00:39 -0000 1.3
+++ .cvsignore 25 Apr 2009 16:10:46 -0000 1.4
@@ -1 +1 @@
-cairo-dock-sources-svn1677_trunk.tar.bz2
+cairo-dock-sources-svn1689_trunk.tar.bz2
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cairo-dock.spec 22 Apr 2009 20:00:39 -0000 1.3
+++ cairo-dock.spec 25 Apr 2009 16:10:46 -0000 1.4
@@ -11,8 +11,8 @@
%global build_other 1
%global mainver 2.0.0
-%global betaver rc3
-%global tarballver svn1677_trunk
+%global betaver rc4
+%global tarballver svn1689_trunk
%global build_webkit 1
%global build_xfce 1
@@ -33,7 +33,7 @@
%if %{build_other} < 1
%global build_webkit 1
%endif
-%global build_themes 0
+%global build_themes 1
Name: cairo-dock
@@ -273,21 +273,16 @@
configure
%endif
+# Toons
+%{__sed} -i.tools \
+ -e 's|^\([ \t][ \t]*\)\(data/themes/\)|\1Toons/\2|' \
+ configure.ac
+
# dialog-rendering
find dialog-rendering -type f \
\( -not -path '*/.svn/*' -and -not -name \*.png \) \
| xargs %{__sed} -i -e 's|\r||'
-# dustbin
-%{__sed} -i.ppc64 \
- -e 's|g_atomic_pointer_get|g_atomic_int_get|' \
- dustbin/src/applet-trashes-manager.c
-
-# keyboard-indicator
-%{__sed} -i.po \
- -e 's|@GETTEXT_CD_PKG@|@GETTEXT_KEYBOARD_INDICATOR@|' \
- keyboard-indicator/po/Makefile.in.in
-
# mail: license conflict now resolved
# stacks: directory fix
@@ -297,32 +292,9 @@
stacks/configure.ac
%endif
-# quick-browser, Toons
-# Not imported into released tarball yet
-%if 0%{?released}
-for plugs in \
- quick-browser \
- Toons
-do
- %{__sed} -i.p2 \
- -e "/ac_config_files/s|${plugs}/[^ ][^ ]*| |g" \
- -e "\@CONFIG_FILES=.*${plugs}(a)d" \
- configure
-done
-%endif
-
# template: upstream says this is not needed
%{__rm} -rf template/
-# weblets
-# Now for weblet plugin, webkit is used on Fedora, not gecko
-cd weblets/
-%{__sed} -i.gettext \
- -e '/^GETTEXT_PACKAGE/s|@GETTEXT_PACKAGE@|@GETTEXT_WEBLETS@|' \
- po/Makefile.in.in
-
-cd ..
-
# First deal with subdirs in configure.ac of topdir, then else
if [ -f Makefile.am ] ; then
@@ -415,7 +387,7 @@
# First deal with subdirs in topdir configure.ac, then else
%configure \
- --enable-gio \
+ --enable-gio-in-gmenu \
# Parallel make fails some times, but it is gerenally fast
# so do parallel make anyway first
@@ -678,8 +650,8 @@
%{_libdir}/pkgconfig/*.pc
%changelog
-* Thu Apr 23 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
-- rev 1677
+* Sun Apr 26 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
+- rev 1689
* Sat Apr 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.0-0.4.rc3
- 2.0.0 rc3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 22 Apr 2009 20:00:39 -0000 1.3
+++ sources 25 Apr 2009 16:10:46 -0000 1.4
@@ -1 +1 @@
-144ac32234802a18ea7481d5369bd15e cairo-dock-sources-svn1677_trunk.tar.bz2
+c9d8a8aad69e1a64f712dc47ca38d0b1 cairo-dock-sources-svn1689_trunk.tar.bz2