rpms/cairo-dock/F-8 .cvsignore, 1.6, 1.7 cairo-dock.spec, 1.12, 1.13 sources, 1.6, 1.7
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Tue Jul 15 04:09:06 UTC 2008
Author: mtasaka
Update of /cvs/extras/rpms/cairo-dock/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30953/F-8
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Tue Jul 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.1.1-1
- 1.6.1.1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 21 Jun 2008 06:21:58 -0000 1.6
+++ .cvsignore 15 Jul 2008 04:08:15 -0000 1.7
@@ -1 +1 @@
-cairo-dock-sources-20080621.tar.bz2
+cairo-dock-sources-1.6.1.1.tar
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/cairo-dock.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cairo-dock.spec 3 Jul 2008 04:31:06 -0000 1.12
+++ cairo-dock.spec 15 Jul 2008 04:08:15 -0000 1.13
@@ -3,12 +3,20 @@
# 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
@@ -20,16 +28,14 @@
Name: cairo-dock
Version: %{mainver}
-Release: %{fedora_rel}%{?dist}.1
+Release: %{fedora_rel}%{?dist}
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 @@
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 @@
%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 @@
#
# 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 @@
# 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 @@
%{__chmod} 0755 $RPM_BUILD_ROOT%{_bindir}/*.sh
# desktop files
+if [ ! -f data/%{name}.desktop ] ; then
+ cat > data/%{name}.desktop <<EOF
+[Desktop Entry]
+Type=Application
+Exec=cairo-dock
+Icon=cairo-dock
+Terminal=false
+
+Name=Cairo-Dock
+Name[fr]=Cairo-Dock
+
+GenericName=Multi-purpose Dock
+GenericName[fr]=Dock multi-usage
+Categories=System;
+EOF
+fi
+
desktop-file-install \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--vendor fedora \
@@ -323,11 +379,19 @@
# documents
%{__rm} -rf $TOPDIR/documents/main
%{__mkdir} -p $TOPDIR/documents/main
+
+## ???????
+## NEEDFIX
for f in \
+%if 0%{?released} < 1
LICENSE \
+%endif
data/ChangeLog.txt \
+%if 0%{?released} < 1
doc/HOW-TO__applets.txt \
- doc/dox.config
+ doc/dox.config \
+%endif
+
do
%{__cp} -pr $f $TOPDIR/documents/main/
done
@@ -403,7 +467,9 @@
done
# documents
+%if 0%{?released} < 1
%{__cp} -p Applets.stable $TOPDIR/documents/main/
+%endif
# lang files
cat $TOPDIR/lang-plug-ins/*.lang > $TOPDIR/lang-plug-ins.lang
@@ -494,6 +560,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Tue Jul 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.1.1-1
+- 1.6.1.1
+
* Thu Jul 3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- F-8: rebuild against new gecko
@@ -502,7 +571,7 @@
* Fri Jun 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 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 <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0.1-1.date20080619
- 1.6.0.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 21 Jun 2008 06:21:58 -0000 1.6
+++ sources 15 Jul 2008 04:08:15 -0000 1.7
@@ -1 +1 @@
-5b0affd64320a2903e63f901df4716ef cairo-dock-sources-20080621.tar.bz2
+88dd8c9e8c9ca99b5493ba60e6dd37f8 cairo-dock-sources-1.6.1.1.tar
More information about the scm-commits
mailing list