rpms/cairo-dock/devel .cvsignore, 1.29, 1.30 cairo-dock.spec, 1.39, 1.40 sources, 1.29, 1.30 cairo-dock-1.6.0.1-rootwin-destroying.patch, 1.1, NONE cairo-dock-fix-insecure-tmpfile.patch, 1.3, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	.cvsignore cairo-dock.spec sources 
Removed Files:
	cairo-dock-1.6.0.1-rootwin-destroying.patch 
	cairo-dock-fix-insecure-tmpfile.patch 
Log Message:
* Thu Jun 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev. 1142



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	21 Jun 2008 06:22:31 -0000	1.29
+++ .cvsignore	26 Jun 2008 02:37:55 -0000	1.30
@@ -1 +1 @@
-cairo-dock-sources-20080621.tar.bz2
+cairo-dock-sources-svn1142_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cairo-dock.spec	21 Jun 2008 06:22:31 -0000	1.39
+++ cairo-dock.spec	26 Jun 2008 02:37:55 -0000	1.40
@@ -3,12 +3,12 @@
 # cd trunk
 # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
 
-%define		tarballver	20080621
-%define		mainver		1.6.0.2
+%define		tarballver	svn1142_trunk
+%define		mainver		1.6.1
 %define		build_gecko	1
 
 
-%define		fedora_rel	1.date%{tarballver}
+%define		fedora_rel	0.1.%{tarballver}
 
 
 %if 0%{?fedora} >= 9
@@ -27,9 +27,6 @@
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -133,9 +130,6 @@
 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
@@ -494,6 +488,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Jun 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev. 1142
+
 * Sat Jun 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0.2-1.date20080621
 - 1.6.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	21 Jun 2008 06:22:31 -0000	1.29
+++ sources	26 Jun 2008 02:37:55 -0000	1.30
@@ -1 +1 @@
-5b0affd64320a2903e63f901df4716ef  cairo-dock-sources-20080621.tar.bz2
+5c84fd588e889d69464d403726d7d847  cairo-dock-sources-svn1142_trunk.tar.bz2


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


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