diff --git a/.cvsignore b/.cvsignore index 170c7f9..fa35904 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cairo-dock-sources-1.6.1.2.tar +cairo-dock-sources-svn1235_trunk.tar.bz2 diff --git a/cairo-dock-rev1235-inf-loop.patch b/cairo-dock-rev1235-inf-loop.patch new file mode 100644 index 0000000..72f576d --- /dev/null +++ b/cairo-dock-rev1235-inf-loop.patch @@ -0,0 +1,18 @@ +Index: cairo-dock/src/cairo-dock-callbacks.c +=================================================================== +--- cairo-dock/src/cairo-dock-callbacks.c (revision 1235) ++++ cairo-dock/src/cairo-dock-callbacks.c (working copy) +@@ -495,11 +495,11 @@ + } + gboolean cairo_dock_emit_leave_signal (CairoDock *pDock) + { +- cairo_dock_emit_signal_on_dock (pDock, "leave-notify-event"); ++ return cairo_dock_emit_signal_on_dock (pDock, "leave-notify-event"); + } + gboolean cairo_dock_emit_enter_signal (CairoDock *pDock) + { +- cairo_dock_emit_signal_on_dock (pDock, "enter-notify-event"); ++ return cairo_dock_emit_signal_on_dock (pDock, "enter-notify-event"); + } + + void cairo_dock_leave_from_main_dock (CairoDock *pDock) diff --git a/cairo-dock.spec b/cairo-dock.spec index 545df49..5a526f5 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -3,27 +3,36 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver svn1203_trunk -%define mainver 1.6.1.2 +%define released 0 +# For now build only stable plugin +%define build_other 0 + +%define tarballver svn1235_trunk +%define mainver 1.6.2 %define build_gecko 1 -#%%define fedora_rel 1.%{tarballver} +%if 0%{?released} < 1 +%define fedora_rel 0.1.%{tarballver} +%else %define fedora_rel 1 +%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,8 +43,12 @@ Summary: Light eye-candy fully themable animated dock Group: User Interface/Desktops License: GPLv3+ URL: http://www.cairo-dock.org/ -#Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{tarballver}.tar.bz2 +%if 0%{?released} < 1 +Source0: %{name}-sources-%{tarballver}.tar.bz2 +%else Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{version}.tar +%endif +Patch0: cairo-dock-rev1235-inf-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake @@ -67,7 +80,7 @@ BuildRequires: Thunar-devel # 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 @@ -110,7 +123,7 @@ to Xfce. 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 @@ -146,6 +159,7 @@ for f in *bz2 ; do tar xjf $f ; done %endif ### ### +%patch0 -p0 -b .infloop find . -type d -name \.svn | sort -r | xargs %{__rm} -rf find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf @@ -170,6 +184,9 @@ autoreconf -i -f # B. themes cd ../themes + +# workaround +touch _Neon2_/task-indicator.png autoreconf -i -f # C. plug-ins @@ -177,7 +194,7 @@ 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", @@ -190,9 +207,31 @@ cd ../plug-ins %endif find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644 + # 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 +sed -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \ + stacks/configure.ac + # template: upstream says this is not needed %{__rm} -rf template/ @@ -217,22 +256,6 @@ cd .. %{__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 @@ -253,7 +276,7 @@ for dir in */ 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 @@ -270,7 +293,9 @@ for dir in */ cd .. continue fi +%if %{build_other} > 0 autoreconf -i -f +%endif cd .. done @@ -291,7 +316,7 @@ pushd cairo-dock # 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 PKG_CONFIG_PATH=$(pwd):${PKG_CONFIG_PATH} # B themes @@ -314,6 +339,7 @@ cd ../plug-ins %{__make} %{?_smp_mflags} -k || : %{__make} -k || status=$((status+1)) +%if %{build_other} > 1 Subdirs=$(cat Subdirs.list) for dir in */ do @@ -333,6 +359,7 @@ for dir in */ cd .. done +%endif popd # from opt/cairo-dock/trunk/cairo-dock if [ $status -gt 0 ] ; then exit 1 ; fi @@ -439,10 +466,13 @@ for dir in */ 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 @@ -466,6 +496,10 @@ for dir in */ 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/ @@ -528,6 +562,7 @@ popd # from $RPM_BUILD_ROOT %{_datadir}/%{name}/emblems/ %{_datadir}/%{name}/gauges/ %dir %{_datadir}/%{name}/themes/ +%dir %{_datadir}/%{name}/plug-ins/ %{_datadir}/%{name}/themes/_default_/ # only directory %dir %{_libdir}/%{name}/ @@ -539,19 +574,24 @@ popd # from $RPM_BUILD_ROOT %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 @@ -560,6 +600,16 @@ popd # from $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Sun Aug 10 2008 Mamoru Tasaka +- rev. 1235 + +* Sun Aug 10 2008 Mamoru Tasaka +- Patch to fix infinite loop of function call (this patch is needed + for rev. 1235 and the released 1.6.1.2) + +* Sat Aug 9 2008 Mamoru Tasaka +- Build only stable plug-ins for now + * Thu Jul 17 2008 Mamoru Tasaka - 1.6.1.2-1 - 1.6.1.2 diff --git a/sources b/sources index 6d2e98e..b4ccc96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76f71d7e86ac737e27762f23b13bfdb0 cairo-dock-sources-1.6.1.2.tar +86a9a40519e12c486fd1003aebfc21b3 cairo-dock-sources-svn1235_trunk.tar.bz2