rpms/cairo-dock/devel .cvsignore, 1.72, 1.73 cairo-dock.spec, 1.91, 1.92 sources, 1.72, 1.73

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11003/devel

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Wed Oct 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.3-0.3.rc2
- 1.6.3 rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	5 Oct 2008 04:22:52 -0000	1.72
+++ .cvsignore	29 Oct 2008 06:50:11 -0000	1.73
@@ -1 +1,3 @@
-cairo-dock-sources-svn1337_trunk.tar.bz2
+cairo-dock-1.6.3-rc2.tar.bz2
+cairo-dock-plugins-1.6.3-rc2.tar.bz2
+cairo-dock-themes-1.6.3-rc2.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- cairo-dock.spec	5 Oct 2008 04:22:52 -0000	1.91
+++ cairo-dock.spec	29 Oct 2008 06:50:11 -0000	1.92
@@ -3,20 +3,20 @@
 # cd trunk
 # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
 
-%define		released	0
+%define		released	1
 # For now build only stable plugin
 %define		build_other	1
 
-%define		tarballver	svn1337_trunk
+%define		tarballver	svn1363_trunk
 %define		mainver		1.6.3
-%undefine		betaver
+%define		betaver		rc2
 %define		build_gecko	1
 
 
 %if 0%{?released} < 1
-%define		fedora_rel	0.1.%{tarballver}
+%define		fedora_rel	0.2.%{tarballver}
 %else
-%define		fedora_rel	1%{?betaver:.%betaver}
+%define		fedora_rel	0.3%{?betaver:.%betaver}
 %endif
 
 
@@ -33,7 +33,7 @@
 %define		gecko_ver	>= 1.9
 %endif
 %if 0%{?fedora} == 8
-%define		gecko_ver	= 1.8.1.16
+%define		gecko_ver	= 1.8.1.17
 %endif
 
 Name:		cairo-dock
@@ -71,6 +71,7 @@
 
 # For plug-ins
 BuildRequires:	alsa-lib-devel
+BuildRequires:	gnome-menus-devel
 BuildRequires:	gnome-vfs2-devel
 BuildRequires:	gnutls-devel
 BuildRequires:	libgnomeui-devel
@@ -172,7 +173,7 @@
 # A. main
 cd cairo-dock
 # temporary fix
-%{__sed} -i.inline -e 's|^inline ||' src/cairo-dock-icons.*
+#%%{__sed} -i.inline -e 's|^inline ||' src/cairo-dock-icons.*
 
 # permission
 for dir in */
@@ -221,11 +222,6 @@
 # mail: license conflict
 %{__rm} -rf mail/
 
-# Clipper
-sed -i.typo \
-	-e 's|@GETTEXT_PACKAGE@|@GETTEXT_CLIPPER@|' \
-	Clipper/po/Makefile.in.in
-
 # stacks: directory fix
 %if 0%{?released} < 1
 sed -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \
@@ -338,8 +334,9 @@
 # First deal with subdirs in topdir configure.ac, then else
 %configure \
 %if 0%{?fedora} < 9
-	--disable-gmenu \
 	--disable-gnome-integration \
+%else
+	--enable-gio \
 %endif
 
 # Parallel make fails some times, but it is gerenally fast
@@ -609,8 +606,17 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Sun Oct  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1337
+* Wed Oct 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.3-0.3.rc2
+- 1.6.3 rc2
+
+* Tue Oct 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.3-0.3.rc1
+- 1.6.3 rc1
+
+* Thu Oct 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.3-0.2.svn1353_trunk
+- GMenu plugin needs gnome-menus-devel
+
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.6.2.3-1.1
+- Rebuild against newer gecko (F-9/8)
 
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
 - 1.6.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	5 Oct 2008 04:22:52 -0000	1.72
+++ sources	29 Oct 2008 06:50:11 -0000	1.73
@@ -1 +1,3 @@
-1239ecf537bd71f25375f6df14224d82  cairo-dock-sources-svn1337_trunk.tar.bz2
+dce4ef3d96802d00bcb74d825cbcf7b4  cairo-dock-1.6.3-rc2.tar.bz2
+bdcdd4d429dfb9df591a1e3af4374b00  cairo-dock-plugins-1.6.3-rc2.tar.bz2
+41d5bc62d0be962a7932c32972b293da  cairo-dock-themes-1.6.3-rc2.tar.bz2