rpms/cairo-dock/devel .cvsignore, 1.57, 1.58 cairo-dock.spec, 1.71, 1.72 sources, 1.57, 1.58

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Tue Aug 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1276



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	23 Aug 2008 16:01:32 -0000	1.57
+++ .cvsignore	26 Aug 2008 02:33:22 -0000	1.58
@@ -1,3 +1 @@
-cairo-dock-1.6.2-RC2.tar.bz2
-cairo-dock-plugins-1.6.2-RC2.tar.bz2
-cairo-dock-themes-1.6.2-RC2.tar.bz2
+cairo-dock-sources-svn1276_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- cairo-dock.spec	23 Aug 2008 16:01:32 -0000	1.71
+++ cairo-dock.spec	26 Aug 2008 02:33:22 -0000	1.72
@@ -3,20 +3,20 @@
 # cd trunk
 # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
 
-%define		released	1
+%define		released	0
 # For now build only stable plugin
 %define		build_other	1
 
-%define		tarballver	svn1272_trunk
+%define		tarballver	svn1276_trunk
 %define		mainver		1.6.2
 %define		betaver		RC2
 %define		build_gecko	1
 
 
 %if 0%{?released} < 1
-%define		fedora_rel	0.2.%{tarballver}
+%define		fedora_rel	0.4.%{tarballver}
 %else
-%define		fedora_rel	0.3%{?betaver:.%betaver}
+%define		fedora_rel	0.4%{?betaver:.%betaver}
 %endif
 
 
@@ -246,7 +246,10 @@
 %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
@@ -261,11 +264,6 @@
 sed -i.typo \
 	-e 's|stack\\|stacks\\|' \
 	Makefile.am
-%else
-# On 1.6.2 RC2, stack cannot be rebult
-sed -i -e '\@stack/@d' configure.ac
-sed -i -e '/stack/d' Makefile.am
-rm -rf stack/
 %endif
 
 # template: upstream says this is not needed
@@ -321,14 +319,12 @@
 	if [ $skip == 2 ] ; then continue ; fi
 	cd $dir
 
-## Note:
-## stack can't be built on 1.6.2 RC 2, modifying Makefile.am, not Makefile.in
 	%{__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 +339,9 @@
 done
 
 # Makefile.am in Subdirs are modified, autoreconf must be called here
-#%%if %{build_other} < 0
+%if %{released} < 1
 autoreconf -f -i
-#%%endif
+%endif
 
 popd # from opt/cairo-dock/trunk/cairo-dock
 
@@ -606,6 +602,7 @@
 %{_datadir}/%{name}/*.svg
 %{_datadir}/%{name}/*view
 %{_datadir}/%{name}/emblems/
+%{_datadir}/%{name}/explosion/
 %{_datadir}/%{name}/gauges/
 %dir	%{_datadir}/%{name}/themes/
 %dir	%{_datadir}/%{name}/plug-ins/
@@ -646,6 +643,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Aug 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1276
+
 * Sat Aug 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2-0.3.RC2
 - 1.6.2 RC2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	23 Aug 2008 16:01:32 -0000	1.57
+++ sources	26 Aug 2008 02:33:22 -0000	1.58
@@ -1,3 +1 @@
-561d836b685ded87680f16949e75c62e  cairo-dock-1.6.2-RC2.tar.bz2
-306cd9a610ce39ad6ff00d08b97373ca  cairo-dock-plugins-1.6.2-RC2.tar.bz2
-7693ab9067e93523bea9275ae29635e3  cairo-dock-themes-1.6.2-RC2.tar.bz2
+da18786f14e7bffd40dffdb4d72cb592  cairo-dock-sources-svn1276_trunk.tar.bz2