rpms/cairo-dock/F-9 .cvsignore, 1.12, 1.13 cairo-dock.spec, 1.18, 1.19 sources, 1.12, 1.13

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Thu Sep  4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.2-1
- 1.6.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Aug 2008 07:11:54 -0000	1.12
+++ .cvsignore	4 Sep 2008 13:54:17 -0000	1.13
@@ -1,3 +1,3 @@
-cairo-dock-1.6.2.1.tar.bz2
-cairo-dock-plugins-1.6.2.1.tar.bz2
-cairo-dock-themes-1.6.2.1.tar.bz2
+cairo-dock-1.6.2.2.tar.bz2
+cairo-dock-plugins-1.6.2.2.tar.bz2
+cairo-dock-themes-1.6.2.2.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/cairo-dock.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cairo-dock.spec	30 Aug 2008 07:11:54 -0000	1.18
+++ cairo-dock.spec	4 Sep 2008 13:54:17 -0000	1.19
@@ -8,7 +8,7 @@
 %define		build_other	1
 
 %define		tarballver	svn1276_trunk
-%define		mainver		1.6.2.1
+%define		mainver		1.6.2.2
 %undefine		betaver
 %define		build_gecko	1
 
@@ -265,9 +265,7 @@
 	-e 's|stack\\|stacks\\|' \
 	Makefile.am
 %else
-# Still some typos in 1.6.2.1....
-grep -rl STACKS stack/ | \
-	xargs sed -i.typo -e 's|STACKS|STACK|g'
+# STACK vs STACKS typo fixed in 1.6.2.2
 %endif
 
 # template: upstream says this is not needed
@@ -323,13 +321,13 @@
 	if [ $skip == 2 ] ; then continue ; fi
 	cd $dir
 
-# For 1.6.2 RC4 sed for Makefile.am is needed because of stack directory
+# typos in stack/ directory now fixed in 1.6.2.2
 	%{__sed} -i.error \
 		-e 's|-O3|-O2|' \
 		-e 's|-Werror\\|\\|' \
 		-e 's|-Werror$||' \
 %if 0%{?released} > 0
-		src/Makefile.am
+		src/Makefile.in
 %else
 		src/Makefile.am
 %endif
@@ -343,9 +341,7 @@
 	cd ..
 done
 
-# Makefile.am in Subdirs are modified, autoreconf must be called here
-# For 1.6.2 RC4 autoreconf call is needed because of stack
-%if %{released} < 1 || 1
+%if %{released} < 1
 autoreconf -f -i
 %endif
 
@@ -649,6 +645,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Sep  4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.2-1
+- 1.6.2.2
+
 * Sat Aug 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.1-1
 - 1.6.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Aug 2008 07:11:54 -0000	1.12
+++ sources	4 Sep 2008 13:54:17 -0000	1.13
@@ -1,3 +1,3 @@
-5a78c34999ec43ad236bd81ece3a2123  cairo-dock-1.6.2.1.tar.bz2
-0334d9aa217194ec46fdbec4a4c54087  cairo-dock-plugins-1.6.2.1.tar.bz2
-e165b25b70eb5d1bc460a80ee04ad1a6  cairo-dock-themes-1.6.2.1.tar.bz2
+53e5736f145fe936837bf7709af4713b  cairo-dock-1.6.2.2.tar.bz2
+81e899f6a4d0b2e9539392d8b5fec10f  cairo-dock-plugins-1.6.2.2.tar.bz2
+9d44ad771c71c5a7c6bc709aa5244370  cairo-dock-themes-1.6.2.2.tar.bz2