rpms/cairo-dock/devel cairo-dock.spec,1.73,1.74

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	cairo-dock.spec 
Log Message:
Temporary fix for stack/ plugin


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- cairo-dock.spec	26 Aug 2008 05:08:40 -0000	1.73
+++ cairo-dock.spec	26 Aug 2008 14:52:25 -0000	1.74
@@ -16,7 +16,7 @@
 %if 0%{?released} < 1
 %define		fedora_rel	0.4.%{tarballver}
 %else
-%define		fedora_rel	0.5%{?betaver:.%betaver}
+%define		fedora_rel	0.6%{?betaver:.%betaver}
 %endif
 
 
@@ -264,6 +264,12 @@
 sed -i.typo \
 	-e 's|stack\\|stacks\\|' \
 	Makefile.am
+%else
+grep -rl STACKS stack/ | \
+	xargs sed -i.typo -e 's|STACKS|STACK|'
+sed -i.typo -e '/STACK_PACKAGE/s|GETTEXT_SWITCHER|GETTEXT_STACK|' \
+	configure.ac
+sed -i -e '/cd-stack/s|SWITCHER_PACKAGE|STACK_PACKAGE|' configure.ac
 %endif
 
 # template: upstream says this is not needed
@@ -319,12 +325,13 @@
 	if [ $skip == 2 ] ; then continue ; fi
 	cd $dir
 
+# For 1.6.2 RC4 sed for Makefile.am is needed because of stack directory
 	%{__sed} -i.error \
 		-e 's|-O3|-O2|' \
 		-e 's|-Werror\\|\\|' \
 		-e 's|-Werror$||' \
 %if 0%{?released} > 0
-		src/Makefile.in
+		src/Makefile.am
 %else
 		src/Makefile.am
 %endif
@@ -339,7 +346,8 @@
 done
 
 # Makefile.am in Subdirs are modified, autoreconf must be called here
-%if %{released} < 1
+# For 1.6.2 RC4 autoreconf call is needed because of stack
+%if %{released} < 1 || 1
 autoreconf -f -i
 %endif
 
@@ -643,8 +651,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Tue Aug 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2-0.5.RC4
+* Tue Aug 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2-0.6.RC4
 - 1.6.2 RC4
+- Temporary fix for stack/ plugin
 
 * Sat Aug 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2-0.3.RC2
 - 1.6.2 RC2