rpms/cairo-dock/devel .cvsignore, 1.16, 1.17 cairo-dock.spec, 1.21, 1.22 sources, 1.16, 1.17

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21062

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Sun Jun  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- svn 1085



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	5 Jun 2008 07:58:11 -0000	1.16
+++ .cvsignore	7 Jun 2008 16:31:17 -0000	1.17
@@ -1 +1 @@
-cairo-dock-sources-svn1080_trunk.tar.bz2
+cairo-dock-sources-svn1085_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cairo-dock.spec	5 Jun 2008 08:34:04 -0000	1.21
+++ cairo-dock.spec	7 Jun 2008 16:31:17 -0000	1.22
@@ -4,7 +4,7 @@
 # mv trunk opt/cairo-dock
 # tar cjf cairo-dock-sources-%%{tag}.tar.bz2 opt/
 
-%define		tarballver	svn1080_trunk
+%define		tarballver	svn1085_trunk
 %define		mainver		1.6.0
 %define		build_gecko	1
 
@@ -148,9 +148,6 @@
 
 # B. themes
 cd ../themes
-
-# temporary fix
-touch _Azur_/dialog-ok.svg
 autoreconf -i -f
 
 # C. plug-ins
@@ -169,11 +166,6 @@
 %{__chmod} 0644 Applets.stable
 find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
 
-# gnome-integration: needs F-9+
-%if 0%{?fedora} < 9
-%{__rm} -rf gnome-integration/
-%endif
-
 # mail: license conflict
 %{__rm} -rf mail/
 
@@ -193,12 +185,43 @@
 %{__rm} -rf weblets/
 %endif
 
-# First deal with subdirs in topdir configure.ac, then else
-Subdirs=$(%{__sed} -n -e '/SUBDIR/s|^.*SUBDIR.*=||p' Makefile.am | sed -e 's|\.||' -e 's|po||')
 # temporary fix
-sed -i.acdebug \
-	-e "s|AC_SUBST[ \t]*(\(.*\),[ \t]*\"*\([^\"][^\"]*\)\"*)$|\1=\"\2\"\nAC_SUBST(\1)\n|" \
+## AC_SUBST fix
+%{__sed} -i.acdebug \
+	-e "s|AC_SUBST[ \t]*(\([^ \t,][^ \t,]*\)[ ,][ \t]*\"*\([^\"][^\"]*\)\"*)$|\1=\"\2\"\nAC_SUBST(\1)\n|" \
 	configure.ac
+## Linguas
+echo "fr" > cpusage/po/LINGUAS
+echo "fr" > netspeed/po/LINGUAS
+echo "fr" > rame/po/LINGUAS
+echo "fr" > switcher/po/LINGUAS
+## pkgdatadir change
+%{__sed} -i.dirchange \
+	-e 's|$(pkgdatadir)/themes|$(weatherdatadir)/themes|' \
+	weather/data/themes/*/Makefile.am
+%{__sed} -i.dirchange \
+	-e 's|moduledir = $(pkgdatadir)|moduledir = $(ramedatadir)|' \
+	rame/data/Makefile.am
+
+# First deal with subdirs in topdir configure.ac, then else
+%{__sed} -i.typo \
+	-e 's|^xfce_dir=.*$|xfce_dir=xfce-integration|' \
+	Makefile.am
+
+Subdirs_1=$(%{__sed} -n '\@SUBDIR@,\@^.*[^\\]$@s|\\$||p' Makefile.am | tail -n +2)
+%{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh
+
+. eval.sh
+Subdirs=$(eval echo ${Subdirs_1})
+
+# gnome-integration: needs F-9+
+%if 0%{?fedora} < 9
+Subdirs="${Subdirs_2} gnome-integration"
+%endif
+
+# Register Subdirs
+echo $Subdirs > Subdirs.list
+
 autoreconf -f -i
 
 for dir in */
@@ -217,6 +240,7 @@
 	%{__sed} -i.error \
 		-e 's|-O3|-O2|' \
 		-e 's|-Werror\\|\\|' \
+		-e 's|-Werror$||' \
 		src/Makefile.am 
 	if [ $skip == 1 ] ; then 
 		cd ..
@@ -251,14 +275,17 @@
 cd ../plug-ins
 
 # First deal with subdirs in topdir configure.ac, then else
-Subdirs=$(%{__sed} -n -e '/SUBDIR/s|^.*SUBDIR.*=||p' Makefile.am | sed -e 's|\.||' -e 's|po||')
+%configure \
+%if 0%{?fedora} < 9
+	--disable-gnome-integration \
+%endif
 
-%configure
 # Parallel make fails some times, but it is gerenally fast
 # so do parallel make anyway first
 %{__make} %{?_smp_mflags} -k || :
 %{__make} -k || status=$((status+1))
 
+Subdirs=$(cat Subdirs.list)
 for dir in */
 	do
 	skip=0
@@ -336,15 +363,15 @@
 
 cd ../plug-ins
 # First deal with subdirs in topdir configure.ac, then else
-Subdirs=$(%{__sed} -n -e '/SUBDIR/s|^.*SUBDIR.*=||p' Makefile.am | sed -e 's|\.||' -e 's|po||')
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	INSTALL="%{__install} -p"
 
+Subdirs=$(cat Subdirs.list)
 for dir in */
 	do
 	skip=0
-	for ddir in $Subdirs autom* po
+	for ddir in $Subdirs
 		do
 		if [ $dir == ${ddir}/ ] ; then skip=1 ; fi
 	done
@@ -369,7 +396,7 @@
 		continue
 	fi
 
-	GETTEXT_MO_PACKAGES=`sed -n -e 's|^GETTEXT_PACKAGE = ||p' po/Makefile.in`
+	GETTEXT_MO_PACKAGES=`sed -n -e 's|^GETTEXT_PACKAGE *= *||p' po/Makefile.in`
 	case $GETTEXT_MO_PACKAGES in
 		*weblet* )
 			%find_lang $GETTEXT_MO_PACKAGES && \
@@ -476,8 +503,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Thu Jun  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- svn 1080
+* Sun Jun  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- svn 1085
 
 * Thu Jun  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0-0.1.svn1080_trunk
 - Prepare for using unified configure script on plug-ins directory


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	5 Jun 2008 07:58:11 -0000	1.16
+++ sources	7 Jun 2008 16:31:17 -0000	1.17
@@ -1 +1 @@
-a2991af849e7495cbd72c025fa8013f1  cairo-dock-sources-svn1080_trunk.tar.bz2
+7a61a2194bdf7c42a3372ecf5eed464b  cairo-dock-sources-svn1085_trunk.tar.bz2