rpms/cairo-dock/F-9 .cvsignore, 1.14, 1.15 cairo-dock.spec, 1.21, 1.22 sources, 1.14, 1.15

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13975/F-9

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
1.6.3 rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	9 Sep 2008 03:15:52 -0000	1.14
+++ .cvsignore	27 Oct 2008 18:06:04 -0000	1.15
@@ -1,3 +1,3 @@
-cairo-dock-1.6.2.3.tar.bz2
-cairo-dock-plugins-1.6.2.3.tar.bz2
-cairo-dock-themes-1.6.2.3.tar.bz2
+cairo-dock-1.6.3-rc1.tar.bz2
+cairo-dock-plugins-1.6.3-rc1.tar.bz2
+cairo-dock-themes-1.6.3-rc1.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/cairo-dock.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cairo-dock.spec	24 Sep 2008 06:07:59 -0000	1.21
+++ cairo-dock.spec	27 Oct 2008 18:06:04 -0000	1.22
@@ -7,16 +7,16 @@
 # For now build only stable plugin
 %define		build_other	1
 
-%define		tarballver	svn1276_trunk
-%define		mainver		1.6.2.3
-%undefine		betaver
+%define		tarballver	svn1363_trunk
+%define		mainver		1.6.3
+%define		betaver		rc1
 %define		build_gecko	1
 
 
 %if 0%{?released} < 1
-%define		fedora_rel	0.4.%{tarballver}
+%define		fedora_rel	0.2.%{tarballver}
 %else
-%define		fedora_rel	1%{?betaver:.%betaver}
+%define		fedora_rel	0.3%{?betaver:.%betaver}
 %endif
 
 
@@ -33,12 +33,12 @@
 %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
 Version:	%{mainver}
-Release:	%{fedora_rel}%{?dist}.1
+Release:	%{fedora_rel}%{?dist}
 Summary:	Light eye-candy fully themable animated dock
 
 Group:		User Interface/Desktops
@@ -47,16 +47,10 @@
 %if 0%{?released} < 1
 Source0:	%{name}-sources-%{tarballver}.tar.bz2
 %else
-# Source tarball changed again !!
 Source0:	http://download.berlios.de/cairo-dock/%{name}-%{mainver}%{?betaver:-%betaver}.tar.bz2
 Source1:	http://download.berlios.de/cairo-dock/%{name}-themes-%{mainver}%{?betaver:-%betaver}.tar.bz2
 Source2:	http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betaver:-%betaver}.tar.bz2
 %endif
-#Patch0:		cairo-dock-rev1235-inf-loop.patch
-%if 0%{?released} < 1
-Patch1:		cairo-dock-plugin-rev1241.diff
-%endif
-#Patch2:		cairo-dock-svn1260-suppress-debug-message.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -77,6 +71,7 @@
 
 # For plug-ins
 BuildRequires:	alsa-lib-devel
+BuildRequires:	gnome-menus-devel
 BuildRequires:	gnome-vfs2-devel
 BuildRequires:	gnutls-devel
 BuildRequires:	libgnomeui-devel
@@ -178,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 */
@@ -223,49 +218,14 @@
 find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
 
 # source code fix
-%if 0%{?released} < 1
-%patch1 -p1 -b .misc
-#%%patch2 -p0 -b .debug
-%endif
 
 # mail: license conflict
 %{__rm} -rf mail/
 
-# musicplayer
-%if 0%{?released} < 1
-cd musicplayer/
-sed -i.po -e '\|po/Makefile|d' configure.ac
-sed -i -e '/ALL_LINGUAS/d' configure.ac
-sed -i -e '/GETTEXT/d' configure.ac
-sed -i -e '/INTLTOOL/d' configure.ac
-sed -i.lib \
-	-e '/AC_SUBST(pkgdatadir)/s|^\(.*\)$|\1\nlibdir=[`pkg-config cairo-dock --variable=pluginsdir`]\nAC_SUBST(libdir)|' \
-	configure.ac
-sed -i.po -e 's|po||' Makefile.am
-cd ..
-%endif
-
-# stack: not available on rev 1226
-# Available on 1.6.2 RC2
-%if 0%{?released} < 1
-rm -rf stack
-%endif
-
 # stacks: directory fix
 %if 0%{?released} < 1
 sed -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \
 	stacks/configure.ac
-sed -i.typo \
-	-e 's|stack/|stacks/|' \
-	-e 's|stackdata|stacksdata|' \
-	-e 's|stack\.conf|stacks\.conf|' \
-	-e 's|stack"|stacks"|' \
-	configure.ac
-sed -i.typo \
-	-e 's|stack\\|stacks\\|' \
-	Makefile.am
-%else
-# STACK vs STACKS typo fixed in 1.6.2.2
 %endif
 
 # template: upstream says this is not needed
@@ -321,7 +281,6 @@
 	if [ $skip == 2 ] ; then continue ; fi
 	cd $dir
 
-# typos in stack/ directory now fixed in 1.6.2.2
 	%{__sed} -i.error \
 		-e 's|-O3|-O2|' \
 		-e 's|-Werror\\|\\|' \
@@ -376,6 +335,8 @@
 %configure \
 %if 0%{?fedora} < 9
 	--disable-gnome-integration \
+%else
+	--enable-gio \
 %endif
 
 # Parallel make fails some times, but it is gerenally fast
@@ -645,8 +606,14 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* 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
+- 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/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	9 Sep 2008 03:15:52 -0000	1.14
+++ sources	27 Oct 2008 18:06:04 -0000	1.15
@@ -1,3 +1,3 @@
-15cfd709185dd9e3e94b981c51ae75a9  cairo-dock-1.6.2.3.tar.bz2
-afdab8b9778e25ead564b955caf57bdd  cairo-dock-plugins-1.6.2.3.tar.bz2
-09ff25bc173cbb50ae66b3ab4f1a52c5  cairo-dock-themes-1.6.2.3.tar.bz2
+1d67bb7c9e90f2ab3c810f5797663aa9  cairo-dock-1.6.3-rc1.tar.bz2
+444ad533a65901e2b2a86063991ea2aa  cairo-dock-plugins-1.6.3-rc1.tar.bz2
+955381a11b5542d9cef148ca351bb847  cairo-dock-themes-1.6.3-rc1.tar.bz2