rpms/cairo-dock/devel cairo-dock.spec,1.61,1.62

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30953/devel

Modified Files:
	cairo-dock.spec 
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: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- cairo-dock.spec	14 Jul 2008 16:53:21 -0000	1.61
+++ cairo-dock.spec	15 Jul 2008 04:08:50 -0000	1.62
@@ -4,11 +4,19 @@
 # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
 
 %define		tarballver	svn1203_trunk
-%define		mainver		1.6.1
+%define		mainver		1.6.1.1
 %define		build_gecko	1
 
 
-%define		fedora_rel	0.1.%{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
@@ -26,7 +34,8 @@
 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-%{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
@@ -82,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
@@ -126,6 +135,18 @@
 
 %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
 
@@ -164,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
@@ -197,6 +220,7 @@
 # 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
@@ -207,9 +231,10 @@
 	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
@@ -326,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 \
@@ -337,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
@@ -417,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
@@ -508,8 +560,11 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Tue Jul 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev. 1203
+* 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
 
 * Sat Jun 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0.2-1.date20080621
 - 1.6.0.2