rpms/cairo-dock/devel .cvsignore, 1.53, 1.54 cairo-dock.spec, 1.68, 1.69 sources, 1.53, 1.54 cairo-dock-rev1241-plugin-base.diff, 1.1, NONE cairo-dock-svn1248-suppress-debug-message.patch, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13096

Modified Files:
	.cvsignore cairo-dock.spec sources 
Removed Files:
	cairo-dock-rev1241-plugin-base.diff 
	cairo-dock-svn1248-suppress-debug-message.patch 
Log Message:
Test


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	15 Aug 2008 14:52:44 -0000	1.53
+++ .cvsignore	20 Aug 2008 16:14:10 -0000	1.54
@@ -1 +0,0 @@
-cairo-dock-sources-svn1254_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- cairo-dock.spec	15 Aug 2008 14:52:44 -0000	1.68
+++ cairo-dock.spec	20 Aug 2008 16:14:10 -0000	1.69
@@ -7,7 +7,7 @@
 # For now build only stable plugin
 %define		build_other	1
 
-%define		tarballver	svn1254_trunk
+%define		tarballver	svn1268_trunk
 %define		mainver		1.6.2
 %define		build_gecko	1
 
@@ -50,7 +50,7 @@
 %endif
 #Patch0:		cairo-dock-rev1235-inf-loop.patch
 Patch1:		cairo-dock-plugin-rev1241.diff
-#Patch2:		cairo-dock-svn1248-suppress-debug-message.patch
+#Patch2:		cairo-dock-svn1260-suppress-debug-message.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -210,6 +210,7 @@
 
 # source code fix
 %patch1 -p1 -b .misc
+#%%patch2 -p0 -b .debug
 
 # mail: license conflict
 %{__rm} -rf mail/
@@ -234,6 +235,15 @@
 # stacks: directory fix
 sed -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \
 	stacks/configure.ac
+sed -i.typo \
+	-e 's|stack/|stacks/|' \
+	-e 's|stackdata|stacksdata|' \
+	-e 's|stack\.conf|stacks\.conf|' \
+	-e 's|stack"|stacks"|' \
+	configure.ac
+sed -i.typo \
+	-e 's|stack\\|stacks\\|' \
+	Makefile.am
 
 # template: upstream says this is not needed
 %{__rm} -rf template/
@@ -535,7 +545,7 @@
 done
 
 set +x
-for f in .%{_libdir}/%{name}/*/*
+for f in .%{_datadir}/%{name}/plug-ins/*/*
 	do
 	if head -n 1 $f 2>/dev/null | grep -q /bin/ ; then 
 		set -x
@@ -604,8 +614,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Fri Aug 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev. 1254
+* Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev. 1268
 
 * Sun Aug 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2-0.2.svn1235_trunk
 - Enable unstable plugins again


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	15 Aug 2008 14:52:44 -0000	1.53
+++ sources	20 Aug 2008 16:14:10 -0000	1.54
@@ -1 +0,0 @@
-a5ef803d10756560d5a56fb8360a67f6  cairo-dock-sources-svn1254_trunk.tar.bz2


--- cairo-dock-rev1241-plugin-base.diff DELETED ---


--- cairo-dock-svn1248-suppress-debug-message.patch DELETED ---