rpms/cairo-dock/F-8 .cvsignore, 1.8, 1.9 cairo-dock.spec, 1.16, 1.17 sources, 1.8, 1.9 cairo-dock-1.6.0.1-rootwin-destroying.patch, 1.1, NONE cairo-dock-fix-insecure-tmpfile.patch, 1.2, NONE cairo-dock-rev1235-inf-loop.patch, 1.1, NONE

Sat Aug 23 16:02:02 UTC 2008

Author: mtasaka

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

Modified Files:
	.cvsignore cairo-dock.spec sources 
Removed Files:
	cairo-dock-1.6.0.1-rootwin-destroying.patch 
	cairo-dock-fix-insecure-tmpfile.patch 
	cairo-dock-rev1235-inf-loop.patch 
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/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9

--- .cvsignore	17 Jul 2008 02:34:15 -0000	1.8
+++ .cvsignore	23 Aug 2008 16:01:31 -0000	1.9
@@ -1 +1,3 @@
-cairo-dock-sources-1.6.1.2.tar
+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/F-8/cairo-dock.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cairo-dock.spec	10 Aug 2008 10:11:30 -0000	1.16
+++ cairo-dock.spec	23 Aug 2008 16:01:31 -0000	1.17
@@ -3,27 +3,37 @@
 # cd trunk
 # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
 
-%define		tarballver	svn1203_trunk
-%define		mainver		1.6.1.2
+%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
 
 
-#%%define		fedora_rel	1.%{tarballver}
-%define		fedora_rel	2
+%if 0%{?released} < 1
+%define		fedora_rel	0.2.%{tarballver}
+%else
+%define		fedora_rel	0.3%{?betaver:.%betaver}
+%endif
 
 
-%define		released	1
 # released tarball does not ship weblets
 %if 0%{?released} >= 1
+%define		build_other	0
+%endif
+%if %{build_other} < 1
 %define		build_gecko	0
 %endif
 
 
 %if 0%{?fedora} >= 9
-%define		gecko_ver	1.9
+%define		gecko_ver	>= 1.9
 %endif
 %if 0%{?fedora} == 8
-%define		gecko_ver	1.8.1.16
+%define		gecko_ver	= 1.8.1.16
 %endif
 
 Name:		cairo-dock
@@ -34,9 +44,19 @@
 Group:		User Interface/Desktops
 License:	GPLv3+
 URL:		http://www.cairo-dock.org/
-#Source0:	http://download.berlios.de/cairo-dock/%{name}-sources-%{tarballver}.tar.bz2
-Source0:	http://download.berlios.de/cairo-dock/%{name}-sources-%{version}.tar
-Patch0:		cairo-dock-rev1235-inf-loop.patch
+%if 0%{?released} < 1
+Source0:	%{name}-sources-%{tarballver}.tar.bz2
+%else
+# 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)
 
 BuildRequires:	automake
@@ -68,7 +88,7 @@
 
 # For plug-ins-gecko
 %if %{build_gecko} > 0
-BuildRequires:	gecko-devel %{?gecko_ver:= %{gecko_ver}}
+BuildRequires:	gecko-devel %{?gecko_ver: %{gecko_ver}}
 %if 0%{?fedora} >= 9
 BuildRequires:	gecko-devel-unstable
 %endif
@@ -111,7 +131,7 @@
 Summary:	Plug-ins files for %{name} related to Gecko
 Group:		User Interface/Desktops
 Requires:	%{name} = %{version}-%{release}
-Requires:	gecko-libs %{?gecko_ver:= %{gecko_ver}}
+Requires:	gecko-libs %{?gecko_ver: %{gecko_ver}}
 
 %description	plug-ins-gecko
 This package contains plug-ins files for %{name} related
@@ -135,22 +155,24 @@
 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
 ###
 ###
-%patch0 -p0 -b .infloop
 
+%if 0
 find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
 find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
+%endif
 
 pushd .
 # A. main
@@ -166,20 +188,28 @@
 %{__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
 
 #
 # Note:
-# * gnome-integration requires gio-2.0.pc, which are in F-9+ glib2-devel
+# * gnome-integration requires gio-2.0.pc, which is in F-9+ glib2-devel
 # * weblets is gecko related, needs investigating
 # * mail plug-ins is GPLv2 only, 
 #   however source codes include "cairo-dock.h", which includes "cairo-dock-log.h",
@@ -192,9 +222,52 @@
 %endif
 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/
 
+# musicplayer
+%if 0%{?released} < 1
+cd musicplayer/
+sed -i.po -e '\|po/Makefile|d' configure.ac
+sed -i -e '/ALL_LINGUAS/d' configure.ac
+sed -i -e '/GETTEXT/d' configure.ac
+sed -i -e '/INTLTOOL/d' configure.ac
+sed -i.lib \
+	-e '/AC_SUBST(pkgdatadir)/s|^\(.*\)$|\1\nlibdir=[`pkg-config cairo-dock --variable=pluginsdir`]\nAC_SUBST(libdir)|' \
+	configure.ac
+sed -i.po -e 's|po||' Makefile.am
+cd ..
+%endif
+
+# stack: not available on rev 1226
+rm -rf stack
+
+# stacks: directory fix
+%if 0%{?released} < 1
+sed -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \
+	stacks/configure.ac
+sed -i.typo \
+	-e 's|stack/|stacks/|' \
+	-e 's|stackdata|stacksdata|' \
+	-e 's|stack\.conf|stacks\.conf|' \
+	-e 's|stack"|stacks"|' \
+	configure.ac
+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/
 
@@ -219,22 +292,6 @@
 %{__rm} -rf weblets/
 %endif
 
-# temporary fix
-
-# musicplayer
-%if 0%{?released} < 1
-cd musicplayer/
-sed -i.po -e '\|po/Makefile|d' configure.ac
-sed -i -e '/ALL_LINGUAS/d' configure.ac
-sed -i -e '/GETTEXT/d' configure.ac
-sed -i -e '/INTLTOOL/d' configure.ac
-sed -i.lib \
-	-e '/AC_SUBST(pkgdatadir)/s|^\(.*\)$|\1\nlibdir=[`pkg-config cairo-dock --variable=pluginsdir`]\nAC_SUBST(libdir)|' \
-	configure.ac
-sed -i.po -e 's|po||' Makefile.am
-cd ..
-%endif
-
 # First deal with subdirs in topdir configure.ac, 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
@@ -255,7 +312,7 @@
 	skip=0
 	for ddir in $Subdirs
 		do
-		if [ $dir == ${ddir}/ ] ; then skip=1 ; fi
+		if [ $dir == ${ddir}/ ] ; then skip=1; fi
 	done
 	for ddir in autom* po translations
 		do
@@ -263,21 +320,32 @@
 	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
 	fi
+%if %{build_other} > 0
 	autoreconf -i -f
+%endif
 	cd ..
 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
 
@@ -293,7 +361,8 @@
 # For plug-ins & themes
 unlink cairo-dock || :
 ln -sf src cairo-dock
-export CFLAGS="%optflags -I$(pwd)/src -I$(pwd)"
+export CFLAGS="%optflags -I$(pwd) -I$(pwd)/cairo-dock"
+export CPPFLAGS="%optflags -I$(pwd) -I$(pwd)/cairo-dock"
 export PKG_CONFIG_PATH=$(pwd):${PKG_CONFIG_PATH}
 
 # B themes
@@ -316,6 +385,7 @@
 %{__make} %{?_smp_mflags} -k || :
 %{__make} -k || status=$((status+1))
 
+%if %{build_other} >= 1
 Subdirs=$(cat Subdirs.list)
 for dir in */
 	do
@@ -335,6 +405,7 @@
 
 	cd ..
 done
+%endif
 
 popd # from opt/cairo-dock/trunk/cairo-dock
 if [ $status -gt 0 ] ; then exit 1 ; fi
@@ -441,10 +512,13 @@
 	if [ $skip == 2 ] ; then continue ; fi
 
 	cd $dir
+
+%if %{build_other} >= 1
 	[ $skip != 1 ] && \
 		%{__make} install \
 		DESTDIR=$RPM_BUILD_ROOT \
 		INSTALL="%{__install} -p"
+%endif
 
 	# read GETTEXT_PACKAGE
 	if [ ! -r po/Makefile.in ] ; then
@@ -468,6 +542,10 @@
 	cd ..
 done
 
+# Temporary hack
+find $RPM_BUILD_ROOT%{_libdir}/cairo-dock/ -name \*.so | xargs %{__chmod} 0755
+find $RPM_BUILD_ROOT%{_libdir}/cairo-dock -name \*.so.* | xargs %{__rm} -f
+
 # documents
 %if 0%{?released} < 1
 %{__cp} -p Applets.stable $TOPDIR/documents/main/
@@ -499,7 +577,7 @@
 done
 
 set +x
-for f in .%{_libdir}/%{name}/*/*
+for f in .%{_datadir}/%{name}/plug-ins/*/*
 	do
 	if head -n 1 $f 2>/dev/null | grep -q /bin/ ; then 
 		set -x
@@ -530,6 +608,7 @@
 %{_datadir}/%{name}/emblems/
 %{_datadir}/%{name}/gauges/
 %dir	%{_datadir}/%{name}/themes/
+%dir	%{_datadir}/%{name}/plug-ins/
 %{_datadir}/%{name}/themes/_default_/
 # only directory
 %dir	%{_libdir}/%{name}/
@@ -541,19 +620,24 @@
 %files	plug-ins -f lang-plug-ins.lang
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/*
+%{_datadir}/%{name}/plug-ins/*
 %if %{build_gecko}
 %exclude	%{_libdir}/%{name}/*weblet*
+%exclude	%{_datadir}/%{name}/plug-ins/*weblet*
 %endif
 %exclude	%{_libdir}/%{name}/*xfce*
+%exclude	%{_datadir}/%{name}/plug-ins/*xfce*
 
 %files	plug-ins-xfce
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/*xfce*
+%{_datadir}/%{name}/plug-ins/*xfce*
 
 %if %{build_gecko} > 0
 %files	plug-ins-gecko -f lang-gecko.lang
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/*weblet*
+%{_datadir}/%{name}/plug-ins/*weblet*
 %endif
 
 %files	devel
@@ -562,8 +646,19 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Sun Aug 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.1.2-2
-- Patch to fix infinite loop of function call
+* 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
+
+* Sun Aug 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2-0.1.svn1235_trunk
+- Patch to fix infinite loop of function call (this patch is needed
+  for rev. 1235 and the released 1.6.1.2)
+  (Fixed in svn 1241)
+
+* Sat Aug  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Build only stable plug-ins for now
 
 * Thu Jul 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.1.2-1
 - 1.6.1.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Jul 2008 02:34:15 -0000	1.8
+++ sources	23 Aug 2008 16:01:31 -0000	1.9
@@ -1 +1,3 @@
-76f71d7e86ac737e27762f23b13bfdb0  cairo-dock-sources-1.6.1.2.tar
+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


--- cairo-dock-1.6.0.1-rootwin-destroying.patch DELETED ---


--- cairo-dock-fix-insecure-tmpfile.patch DELETED ---


--- cairo-dock-rev1235-inf-loop.patch DELETED ---


