rpms/cairo-dock/devel .cvsignore, 1.56, 1.57 cairo-dock.spec, 1.70, 1.71 sources, 1.56, 1.57

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* 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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	22 Aug 2008 15:47:25 -0000	1.56
+++ .cvsignore	23 Aug 2008 16:01:32 -0000	1.57
@@ -1 +1,3 @@
-cairo-dock-sources-svn1272_trunk.tar.bz2
+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


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- cairo-dock.spec	22 Aug 2008 15:47:25 -0000	1.70
+++ cairo-dock.spec	23 Aug 2008 16:01:32 -0000	1.71
@@ -3,19 +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	svn1272_trunk
 %define		mainver		1.6.2
+%define		betaver		RC2
 %define		build_gecko	1
 
 
 %if 0%{?released} < 1
 %define		fedora_rel	0.2.%{tarballver}
 %else
-%define		fedora_rel	1
+%define		fedora_rel	0.3%{?betaver:.%betaver}
 %endif
 
 
@@ -46,10 +47,15 @@
 %if 0%{?released} < 1
 Source0:	%{name}-sources-%{tarballver}.tar.bz2
 %else
-Source0:	http://download.berlios.de/cairo-dock/%{name}-sources-%{version}.tar
+# 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)
 
@@ -149,15 +155,16 @@
 files for developing applications that use %{name}.
 
 %prep
+%if 0%{released} < 1
 %setup -q -c
+%else
 
 ###
-### ????
-%if 0%{released} > 0
-for f in *bz2 ; do tar xjf $f ; done
-%{__ln_s} -f cairo-dock-%{version} cairo-dock
-%{__ln_s} -f cairo-dock-plugins-%{version} plug-ins
-%{__ln_s} -f cairo-dock-themes-%{version} themes
+### This changed again....
+%setup -q -c -a 1 -a 2
+%{__ln_s} -f cairo-dock-%{mainver}%{?betaver:-%betaver} cairo-dock
+%{__ln_s} -f cairo-dock-plugins-%{mainver}%{?betaver:-%betaver} plug-ins
+%{__ln_s} -f cairo-dock-themes-%{mainver}%{?betaver:-%betaver} themes
 %endif
 ###
 ###
@@ -181,14 +188,21 @@
 %{__chmod} 0644 [A-Z]*
 
 # Makefile issue
-%{__sed} -i.debuglevel -e '/-O3/d' src/Makefile.am
+%{__sed} -i.debuglevel -e '/-O3/d' \
+%if 0%{?released} > 0
+	src/Makefile.in
+%else
+	src/Makefile.am
 
 autoreconf -i -f
+%endif
 
 # B. themes
 cd ../themes
 
+%if 0%{?released} < 1
 autoreconf -i -f
+%endif
 
 # C. plug-ins
 cd ../plug-ins
@@ -209,8 +223,10 @@
 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/
@@ -233,6 +249,7 @@
 rm -rf stack
 
 # stacks: directory fix
+%if 0%{?released} < 1
 sed -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \
 	stacks/configure.ac
 sed -i.typo \
@@ -244,6 +261,12 @@
 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
 %{__rm} -rf template/
@@ -297,11 +320,18 @@
 	done
 	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$||' \
-		src/Makefile.am 
+%if 0%{?released} > 0
+		src/Makefile.am
+%else
+		src/Makefile.am
+%endif
 	if [ $skip == 1 ] ; then 
 		cd ..
 		continue
@@ -313,7 +343,9 @@
 done
 
 # Makefile.am in Subdirs are modified, autoreconf must be called here
+#%%if %{build_other} < 0
 autoreconf -f -i
+#%%endif
 
 popd # from opt/cairo-dock/trunk/cairo-dock
 
@@ -614,8 +646,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Fri Aug 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev. 1272
+* Sat Aug 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2-0.3.RC2
+- 1.6.2 RC2
 
 * Sun Aug 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2-0.2.svn1235_trunk
 - Enable unstable plugins again


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	22 Aug 2008 15:47:25 -0000	1.56
+++ sources	23 Aug 2008 16:01:32 -0000	1.57
@@ -1 +1,3 @@
-585baa0e1ab202644cfb61daed6eefbf  cairo-dock-sources-svn1272_trunk.tar.bz2
+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