rpms/cairo-dock/devel cairo-dock-1.6.0.1-plug_ins-configure_ac-must-revert.patch, NONE, 1.1 cairo-dock.spec, 1.33, 1.34

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	cairo-dock.spec 
Added Files:
	cairo-dock-1.6.0.1-plug_ins-configure_ac-must-revert.patch 
Log Message:
* Thu Jun 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0.1-1.date20080619
- 1.6.0.1


cairo-dock-1.6.0.1-plug_ins-configure_ac-must-revert.patch:

--- NEW FILE cairo-dock-1.6.0.1-plug_ins-configure_ac-must-revert.patch ---
Index: plug-ins/configure.ac
===================================================================
--- plug-ins/configure.ac	(revision 1112)
+++ plug-ins/configure.ac	(revision 1114)
@@ -418,6 +418,7 @@
 	dustbin/data/themes/Silver/Makefile
 	dustbin/data/themes/I_Dustbin/Makefile
 	dustbin/data/themes/Neon/Makefile
+	dustbin/data/themes/Clear/Makefile
 	
 	gnome-integration/Makefile
 	gnome-integration/src/Makefile


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cairo-dock.spec	18 Jun 2008 18:11:08 -0000	1.33
+++ cairo-dock.spec	19 Jun 2008 03:54:16 -0000	1.34
@@ -4,12 +4,12 @@
 # mv trunk opt/cairo-dock
 # tar cjf cairo-dock-sources-%%{tag}.tar.bz2 opt/
 
-%define		tarballver	svn1112_trunk
-%define		mainver		1.6.0
+%define		tarballver	20080619
+%define		mainver		1.6.0.1
 %define		build_gecko	1
 
 
-%define		fedora_rel	0.2.%{tarballver}
+%define		fedora_rel	1.date%{tarballver}
 
 
 %if 0%{?fedora} >= 9
@@ -30,6 +30,7 @@
 Source0:	http://download.berlios.de/cairo-dock/%{name}-sources-%{tarballver}.tar.bz2
 Patch0:		cairo-dock-fix-insecure-tmpfile.patch
 Patch1:		cairo-dock-svn1105-configure-missing.patch
+Patch2:		cairo-dock-1.6.0.1-plug_ins-configure_ac-must-revert.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -131,9 +132,11 @@
 find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
 find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
 
-pushd opt/cairo-dock/trunk/
+#pushd opt/cairo-dock/trunk/cairo-dock
+pushd .
 %patch0 -p1 -b .tmpuse
 %patch1 -p2 -b .miss
+%patch2 -p0 -b .wrong -R
 
 # A. main
 cd cairo-dock
@@ -223,7 +226,7 @@
 		do
 		if [ $dir == ${ddir}/ ] ; then skip=1 ; fi
 	done
-	for ddir in autom* po
+	for ddir in autom* po translations
 		do
 		if [ $dir == ${ddir}/ ] ; then skip=2 ; fi
 	done
@@ -251,7 +254,8 @@
 status=0
 
 # A. main
-pushd opt/cairo-dock/trunk/cairo-dock
+#pushd opt/cairo-dock/trunk/cairo-dock
+pushd cairo-dock
 
 %configure
 %{__make} %{?_smp_mflags} -k || status=$((status+1))
@@ -286,7 +290,7 @@
 for dir in */
 	do
 	skip=0
-	for ddir in $Subdirs autom* po
+	for ddir in $Subdirs autom* po translations
 		do
 		if [ $dir == ${ddir}/ ] ; then skip=1 ; fi
 	done
@@ -310,7 +314,8 @@
 TOPDIR=$(pwd)
 
 # A. main
-pushd opt/cairo-dock/trunk/cairo-dock
+#pushd opt/cairo-dock/trunk/cairo-dock
+pushd cairo-dock
 export PKG_CONFIG_PATH=$(pwd):${PKG_CONFIG_PATH}
 
 %{__make} install \
@@ -375,7 +380,7 @@
 	# don't skip here
 	# if [ $skip == 1 ] ; then continue ; fi
 
-	for ddir in autom* po
+	for ddir in autom* po translations
 		do
 		if [ $dir == ${ddir}/ ] ; then skip=2 ; fi
 	done
@@ -501,8 +506,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Thu Jun 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- svn 1112
+* Thu Jun 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0.1-1.date20080619
+- 1.6.0.1
 
 * Wed Jun 11 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0-0.2.svn1089_trunk
 - Fix possibly unsafe tmpfile creation