rpms/cairo-dock/devel .cvsignore, 1.63, 1.64 cairo-dock.spec, 1.79, 1.80 sources, 1.63, 1.64 cairo-dock-plugin-rev1235.diff, 1.1, NONE cairo-dock-plugin-rev1241.diff, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	.cvsignore cairo-dock.spec sources 
Removed Files:
	cairo-dock-plugin-rev1235.diff cairo-dock-plugin-rev1241.diff 
Log Message:
* Sun Sep 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1315



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	9 Sep 2008 03:15:52 -0000	1.63
+++ .cvsignore	21 Sep 2008 11:05:53 -0000	1.64
@@ -1,3 +1 @@
-cairo-dock-1.6.2.3.tar.bz2
-cairo-dock-plugins-1.6.2.3.tar.bz2
-cairo-dock-themes-1.6.2.3.tar.bz2
+cairo-dock-sources-svn1315_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- cairo-dock.spec	9 Sep 2008 03:15:52 -0000	1.79
+++ cairo-dock.spec	21 Sep 2008 11:05:54 -0000	1.80
@@ -3,18 +3,18 @@
 # cd trunk
 # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
 
-%define		released	1
+%define		released	0
 # For now build only stable plugin
 %define		build_other	1
 
-%define		tarballver	svn1276_trunk
-%define		mainver		1.6.2.3
+%define		tarballver	svn1315_trunk
+%define		mainver		1.6.3
 %undefine		betaver
 %define		build_gecko	1
 
 
 %if 0%{?released} < 1
-%define		fedora_rel	0.4.%{tarballver}
+%define		fedora_rel	0.1.%{tarballver}
 %else
 %define		fedora_rel	1%{?betaver:.%betaver}
 %endif
@@ -47,16 +47,13 @@
 %if 0%{?released} < 1
 Source0:	%{name}-sources-%{tarballver}.tar.bz2
 %else
-# Source tarball changed again !!
 Source0:	http://download.berlios.de/cairo-dock/%{name}-%{mainver}%{?betaver:-%betaver}.tar.bz2
 Source1:	http://download.berlios.de/cairo-dock/%{name}-themes-%{mainver}%{?betaver:-%betaver}.tar.bz2
 Source2:	http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betaver:-%betaver}.tar.bz2
 %endif
-#Patch0:		cairo-dock-rev1235-inf-loop.patch
 %if 0%{?released} < 1
 Patch1:		cairo-dock-plugin-rev1241.diff
 %endif
-#Patch2:		cairo-dock-svn1260-suppress-debug-message.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -223,49 +220,19 @@
 find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
 
 # source code fix
-%if 0%{?released} < 1
-%patch1 -p1 -b .misc
-#%%patch2 -p0 -b .debug
-%endif
 
 # mail: license conflict
 %{__rm} -rf mail/
 
-# 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
-
-# stack: not available on rev 1226
-# Available on 1.6.2 RC2
-%if 0%{?released} < 1
-rm -rf stack
-%endif
+# Clipper
+sed -i.typo \
+	-e 's|@GETTEXT_PACKAGE@|@GETTEXT_CLIPPER@|' \
+	Clipper/po/Makefile.in.in
 
 # stacks: directory fix
 %if 0%{?released} < 1
 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
-%else
-# STACK vs STACKS typo fixed in 1.6.2.2
 %endif
 
 # template: upstream says this is not needed
@@ -321,7 +288,6 @@
 	if [ $skip == 2 ] ; then continue ; fi
 	cd $dir
 
-# typos in stack/ directory now fixed in 1.6.2.2
 	%{__sed} -i.error \
 		-e 's|-O3|-O2|' \
 		-e 's|-Werror\\|\\|' \
@@ -645,6 +611,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Sep 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1315
+
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
 - 1.6.2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	9 Sep 2008 03:15:52 -0000	1.63
+++ sources	21 Sep 2008 11:05:54 -0000	1.64
@@ -1,3 +1 @@
-15cfd709185dd9e3e94b981c51ae75a9  cairo-dock-1.6.2.3.tar.bz2
-afdab8b9778e25ead564b955caf57bdd  cairo-dock-plugins-1.6.2.3.tar.bz2
-09ff25bc173cbb50ae66b3ab4f1a52c5  cairo-dock-themes-1.6.2.3.tar.bz2
+706508783a1e04116df01948c1b62998  cairo-dock-sources-svn1315_trunk.tar.bz2


--- cairo-dock-plugin-rev1235.diff DELETED ---


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