rpms/cairo-dock/devel cairo-dock.spec,1.114,1.115

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	cairo-dock.spec 
Log Message:
Just clean up spec file


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- cairo-dock.spec	21 Dec 2008 04:09:58 -0000	1.114
+++ cairo-dock.spec	21 Dec 2008 12:18:55 -0000	1.115
@@ -259,33 +259,12 @@
 %{__rm} -rf template/
 
 # weblets
-%if 1
 cd weblets/
-%{__sed} -i.po \
+%{__sed} -i.gettext \
 	-e '/^GETTEXT_PACKAGE/s|@GETTEXT_PACKAGE@|@GETTEXT_WEBLETS@|' \
 	po/Makefile.in.in
-
-%if 0
-# Gecko related (no longer build)
-%{__sed} -i.gecko \
-%if 0%{?fedora} < 9
-	-e 's|xulrunner-gtkmozembed|firefox-gtkmozembed|' \
-%else
-	-e 's|xulrunner-gtkmozembed|mozilla-gtkmozembed|' \
-%endif
-	configure.ac
-
-## NEED INVESTIGATING
-sed -i.dir \
-	-e 's|docshell/nsIScrollable.h|nsIScrollable.h|' \
-	src/applet-widget-itf.cpp
-
-%endif
 cd ..
 
-%else
-%{__rm} -rf weblets/
-%endif
 
 # First deal with subdirs in configure.ac of topdir, then else
 Subdirs_1=$(%{__sed} -n -e '\@SUBDIR@,\@^.*[^\\]$@p' Makefile.am | sed -e 's|\\$||' | tail -n +2)
@@ -343,11 +322,14 @@
 
 %build
 status=0
-%define	__make		%{_bindir}/make MSGFMT="%{_bindir}/msgfmt --statistics"
+%define	__make	\
+	%{_bindir}/make GMSGFMT="%{_bindir}/msgfmt --statistics"
 
 # A. main
 pushd cairo-dock
 
+# --enable-glitz cannot be set because cairo-glitz.h is missing
+# (Fedora cairo does not support glitz)
 %configure
 %{__make} %{?_smp_mflags} -k || status=$((status+1))
 
@@ -378,8 +360,11 @@
 
 # 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))
+retry=0
+%{__make} %{?_smp_mflags} -k || retry=1
+if [ $retry == 1 ] ; then
+	%{__make} -k || status=$((status+1))
+fi
 
 %if %{build_other} >= 1
 Subdirs=$(cat Subdirs.list)
@@ -418,7 +403,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	INSTALL="%{__install} -p"
+
 %{__chmod} 0755 $RPM_BUILD_ROOT%{_bindir}/*.sh
+# debian file, not useful
+%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/cairo-dock-update.sh
 
 # desktop files
 if [ ! -f data/%{name}.desktop ] ; then