From be996df1e5e353f9d83ac19f933db6b9584c54db Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Jul 15 2008 04:08:36 +0000 Subject: - 1.6.1.1 --- diff --git a/cairo-dock.spec b/cairo-dock.spec index 75e8aaf..c64b807 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -3,19 +3,27 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver 20080621 -%define mainver 1.6.0.2 +%define tarballver svn1203_trunk +%define mainver 1.6.1.1 %define build_gecko 1 -%define fedora_rel 1.date%{tarballver} +#%%define fedora_rel 1.%{tarballver} +%define fedora_rel 1 + + +%define released 1 +# released tarball does not ship weblets +%if 0%{?released} >= 1 +%define build_gecko 0 +%endif %if 0%{?fedora} >= 9 %define gecko_ver 1.9 %endif %if 0%{?fedora} == 8 -%define gecko_ver 1.8.1.14 +%define gecko_ver 1.8.1.15 %endif Name: cairo-dock @@ -26,10 +34,8 @@ 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 -Patch0: cairo-dock-fix-insecure-tmpfile.patch -# Revert this part because this seems to be breaking rootwin -Patch1: cairo-dock-1.6.0.1-rootwin-destroying.patch +#Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{tarballver}.tar.bz2 +Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{version}.tar BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake @@ -85,7 +91,7 @@ Summary: Plug-ins files for %{name} Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} %if %{build_gecko} == 0 -Obsoletes: %{name}-plug-ins-gecko < 1.5.5.4-4 +Obsoletes: %{name}-plug-ins-gecko < %{version}-%{release} %endif %description plug-ins @@ -129,13 +135,22 @@ files for developing applications that use %{name}. %prep %setup -q -c + +### +### ???? +%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 +%endif +### +### + find . -type d -name \.svn | sort -r | xargs %{__rm} -rf find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf pushd . -%patch0 -p1 -b .tmpuse -%patch1 -p0 -b .rootwin -R - # A. main cd cairo-dock # temporary fix @@ -170,7 +185,9 @@ cd ../plug-ins # # permission +%if 0%{?released} < 1 %{__chmod} 0644 Applets.stable +%endif find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644 # mail: license conflict @@ -181,21 +198,43 @@ find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644 # weblets %if %{build_gecko} > 0 -%if 0%{?fedora} < 9 cd weblets/ %{__sed} -i.gecko \ - -e 's|mozilla-gtkmozembed|firefox-gtkmozembed|' \ +%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 + cd .. -%endif %else %{__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 '\@SUBDIR@,\@^.*[^\\]$@s|\\$||p' Makefile.am | tail -n +2) +Subdirs_1=$(%{__sed} -n -e '\@SUBDIR@,\@^.*[^\\]$@p' Makefile.am | sed -e 's|\\$||' | tail -n +2) %{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh . eval.sh @@ -312,6 +351,23 @@ export PKG_CONFIG_PATH=$(pwd):${PKG_CONFIG_PATH} %{__chmod} 0755 $RPM_BUILD_ROOT%{_bindir}/*.sh # desktop files +if [ ! -f data/%{name}.desktop ] ; then + cat > data/%{name}.desktop < $TOPDIR/lang-plug-ins.lang @@ -494,12 +560,18 @@ popd # from $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jul 15 2008 Mamoru Tasaka - 1.6.1.1-1 +- 1.6.1.1 + +* Thu Jul 3 2008 Mamoru Tasaka +- F-8: rebuild against new gecko + * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 * Fri Jun 20 2008 Mamoru Tasaka - 1.6.0.1-2.date20080619 - Revert XCompositeRedirectSubwindows() part in - cairo-dock-X-utilities.c + cairo-dock-X-utilities.c - fixed in rev. 1142 * Thu Jun 19 2008 Mamoru Tasaka - 1.6.0.1-1.date20080619 - 1.6.0.1