rpms/cairo-dock/devel .cvsignore, 1.75, 1.76 cairo-dock.spec, 1.94, 1.95 sources, 1.75, 1.76

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Sun Dec  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Try 2.0.0 development branch
- Build weblet plugin with WebKit, switching from Gecko,
  rename weblet related plugin



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	12 Nov 2008 11:01:09 -0000	1.75
+++ .cvsignore	6 Dec 2008 17:38:17 -0000	1.76
@@ -1,3 +1 @@
-cairo-dock-1.6.3.1.tar.bz2
-cairo-dock-plugins-1.6.3.1.tar.bz2
-cairo-dock-themes-1.6.3.1.tar.bz2
+cairo-dock-sources-svn1428_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- cairo-dock.spec	12 Nov 2008 11:01:09 -0000	1.94
+++ cairo-dock.spec	6 Dec 2008 17:38:17 -0000	1.95
@@ -3,20 +3,22 @@
 # 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	svn1363_trunk
-%define		mainver		1.6.3.1
+%define		mainver		2.0.0
 %undefine		betaver		
-%define		build_gecko	1
+%define		build_webkit	1
+%define		tarballver	svn1428_trunk
+
+%define		fedora_main_rel	1
 
 
 %if 0%{?released} < 1
-%define		fedora_rel	0.2.%{tarballver}
+%define		fedora_rel	0.%{fedora_main_rel}.%{tarballver}
 %else
-%define		fedora_rel	1%{?betaver:.%betaver}
+%define		fedora_rel	%{fedora_main_rel}%{?betaver:.%betaver}
 %endif
 
 
@@ -25,17 +27,10 @@
 %define		build_other	0
 %endif
 %if %{build_other} < 1
-%define		build_gecko	0
+%define		build_webkit	1
 %endif
 
 
-%if 0%{?fedora} >= 9
-%define		gecko_ver	>= 1.9
-%endif
-%if 0%{?fedora} == 8
-%define		gecko_ver	= 1.8.1.17
-%endif
-
 Name:		cairo-dock
 Version:	%{mainver}
 Release:	%{fedora_rel}%{?dist}
@@ -77,16 +72,16 @@
 BuildRequires:	libgnomeui-devel
 BuildRequires:	libXxf86vm-devel
 BuildRequires:	vte-devel
-
 # For plug-ins-xfce
 BuildRequires:	Thunar-devel
+# For plug-ins-webkit
+BuildRequires:	WebKit-gtk-devel
 
-# For plug-ins-gecko
-%if %{build_gecko} > 0
-BuildRequires:	gecko-devel %{?gecko_ver: %{gecko_ver}}
-%if 0%{?fedora} >= 9
-BuildRequires:	gecko-devel-unstable
-%endif
+# Obsoletes moved to main package
+# Switch to Webkit, always obsolete gecko (and _not_ provide it)
+Obsoletes:	%{name}-plug-ins-gecko < %{version}-%{release}
+%if %{build_webkit} == 0
+Obsoletes:	%{name}-plug-ins-webkit < %{version}-%{release}
 %endif
 
 %description
@@ -106,9 +101,6 @@
 Summary:	Plug-ins files for %{name}
 Group:		User Interface/Desktops
 Requires:	%{name} = %{version}-%{release}
-%if %{build_gecko} == 0
-Obsoletes:	%{name}-plug-ins-gecko < %{version}-%{release}
-%endif
 
 %description	plug-ins
 This package contains plug-ins files for %{name}.
@@ -122,15 +114,14 @@
 This package contains plug-ins files for %{name} related
 to Xfce.
 
-%package	plug-ins-gecko
+%package	plug-ins-webkit
 Summary:	Plug-ins files for %{name} related to Gecko
 Group:		User Interface/Desktops
 Requires:	%{name} = %{version}-%{release}
-Requires:	gecko-libs %{?gecko_ver: %{gecko_ver}}
 
-%description	plug-ins-gecko
+%description	plug-ins-webkit
 This package contains plug-ins files for %{name} related
-to Gecko.
+to webkit.
 
 %package	devel
 Summary:	Development files for %{name}
@@ -177,7 +168,7 @@
 
 # permission
 for dir in */
-	do
+do
 	find $dir -type f | xargs %{__chmod} 0644
 done
 %{__chmod} 0644 [A-Z]*
@@ -221,6 +212,14 @@
 
 # mail: license conflict
 %{__rm} -rf mail/
+%if 0%{?released} < 1
+%{__sed} -i.mail \
+	-e '\@mail/@d' \
+	configure.ac
+%{__sed} -i.mail \
+	-e '/mail_dir/d' \
+	Makefile.am
+%endif
 
 # stacks: directory fix
 %if 0%{?released} < 1
@@ -232,8 +231,14 @@
 %{__rm} -rf template/
 
 # weblets
-%if %{build_gecko} > 0
+%if 1
 cd weblets/
+%{__sed} -i.po \
+	-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|' \
@@ -247,12 +252,14 @@
 	-e 's|docshell/nsIScrollable.h|nsIScrollable.h|' \
 	src/applet-widget-itf.cpp
 
+%endif
 cd ..
+
 %else
 %{__rm} -rf weblets/
 %endif
 
-# First deal with subdirs in topdir configure.ac, then else
+# 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)
 %{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh
 
@@ -268,7 +275,7 @@
 echo $Subdirs > Subdirs.list
 
 for dir in */
-	do
+do
 	skip=0
 	for ddir in $Subdirs
 		do
@@ -336,8 +343,9 @@
 %if 0%{?fedora} < 9
 	--disable-gnome-integration \
 %else
-	--enable-gio \
+	--enable-gio-in-gmenu \
 %endif
+	--enable-weblets \
 
 # Parallel make fails some times, but it is gerenally fast
 # so do parallel make anyway first
@@ -347,7 +355,8 @@
 %if %{build_other} >= 1
 Subdirs=$(cat Subdirs.list)
 for dir in */
-	do
+do
+	unset CONFIGURE_OPTS
 	skip=0
 	for ddir in $Subdirs autom* po translations
 		do
@@ -356,7 +365,7 @@
 	if [ $skip == 1 ] ; then continue ; fi
 	cd $dir
 
-	%configure
+	%configure $CONFIGURE_OPTS
 	# Parallel make fails some times, but it is gerenally fast
 	# so do parallel make anyway first
 	%{__make} %{?_smp_mflags} -k || :
@@ -444,8 +453,8 @@
 popd # from $RPM_BUILD_ROOT
 
 # C plug-ins
-%{__rm} -rf $TOPDIR/{lang-plug-ins,lang-gecko}
-%{__mkdir} -p $TOPDIR/{lang-plug-ins,lang-gecko}
+%{__rm} -rf $TOPDIR/{lang-plug-ins,lang-webkit}
+%{__mkdir} -p $TOPDIR/{lang-plug-ins,lang-webkit}
 
 cd ../plug-ins
 # First deal with subdirs in topdir configure.ac, then else
@@ -490,7 +499,7 @@
 		*weblet* )
 			%find_lang $GETTEXT_MO_PACKAGES && \
 				%{__mv} -f ${GETTEXT_MO_PACKAGES}.lang \
-				$TOPDIR/lang-gecko/
+				$TOPDIR/lang-webkit/
 				;;
 		* )
 			%find_lang $GETTEXT_MO_PACKAGES && \
@@ -511,9 +520,9 @@
 %endif
 
 # lang files
-cat $TOPDIR/lang-plug-ins/*.lang > $TOPDIR/lang-plug-ins.lang
-%if %{build_gecko} > 0
-cat $TOPDIR/lang-gecko/*.lang > $TOPDIR/lang-gecko.lang
+find $TOPDIR/lang-plug-ins/ -name '*.lang' | xargs cat > $TOPDIR/lang-plug-ins.lang
+%if %{build_webkit} > 0
+find $TOPDIR/lang-webkit/ -name '*.lang' | xargs cat > $TOPDIR/lang-webkit.lang
 %endif
 
 popd # from opt/cairo-dock/trunk/cairo-dock
@@ -581,7 +590,7 @@
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/*
 %{_datadir}/%{name}/plug-ins/*
-%if %{build_gecko}
+%if %{build_webkit}
 %exclude	%{_libdir}/%{name}/*weblet*
 %exclude	%{_datadir}/%{name}/plug-ins/*weblet*
 %endif
@@ -593,8 +602,8 @@
 %{_libdir}/%{name}/*xfce*
 %{_datadir}/%{name}/plug-ins/*xfce*
 
-%if %{build_gecko} > 0
-%files	plug-ins-gecko -f lang-gecko.lang
+%if %{build_webkit} > 0
+%files	plug-ins-webkit -f lang-webkit.lang
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/*weblet*
 %{_datadir}/%{name}/plug-ins/*weblet*
@@ -606,6 +615,11 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Dec  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Try 2.0.0 development branch
+- Build weblet plugin with WebKit, switching from Gecko,
+  rename weblet related plugin
+
 * Wed Nov 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.3.1-1
 - 1.6.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	12 Nov 2008 11:01:09 -0000	1.75
+++ sources	6 Dec 2008 17:38:17 -0000	1.76
@@ -1,3 +1 @@
-a55338949f46686c7742da746f66bd3e  cairo-dock-1.6.3.1.tar.bz2
-fa1c91d39bd9f0cc6ff243a6be085011  cairo-dock-plugins-1.6.3.1.tar.bz2
-ac73b44de2727a384d4c163b31321cca  cairo-dock-themes-1.6.3.1.tar.bz2
+4a13947400c336ef61927a52ecab41c9  cairo-dock-sources-svn1428_trunk.tar.bz2