rpms/xtide/devel .cvsignore, 1.35, 1.36 sources, 1.35, 1.36 xtide.spec, 1.52, 1.53

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13757/devel

Modified Files:
	.cvsignore sources xtide.spec 
Log Message:
* Fri Jul  2 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.7.dev20100406
- Update to 2.11 dev 20100406



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	31 May 2010 17:06:32 -0000	1.35
+++ .cvsignore	1 Jul 2010 16:27:35 -0000	1.36
@@ -1,2 +1,2 @@
-xtide-2.11-dev-20100406.tar.bz2
+xtide-2.11-dev-20100625.tar.bz2
 harmonics-dwf-20100529-free.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	31 May 2010 17:06:32 -0000	1.35
+++ sources	1 Jul 2010 16:27:35 -0000	1.36
@@ -1,2 +1,2 @@
-7aad2581d52b0a9e871b838e2f6db1a6  xtide-2.11-dev-20100406.tar.bz2
+c2e603661060f8bb95db54b008611969  xtide-2.11-dev-20100625.tar.bz2
 ac4be3f3d47565d95863db6f9670a8c1  harmonics-dwf-20100529-free.tar.bz2


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- xtide.spec	31 May 2010 17:06:32 -0000	1.52
+++ xtide.spec	1 Jul 2010 16:27:35 -0000	1.53
@@ -1,9 +1,9 @@
 %define          mainver   2.11
-%define          betatag   dev-20100406
+%define          betatag   dev-20100625
 %define          dwfdate   20100529
 
 
-%define          fedorarel  6
+%define          fedorarel  7
 
 
 %define          rel        %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')}
@@ -99,17 +99,16 @@ Please read README.fedora for Fedora spe
 %setup -q -D -n %{name}-%{version}%{?betatag:-DEVELOPMENT}
 
 # Dstr -> Dstr.h
-set +x
-echo
-echo "Changing Dstr -> Dstr"
-grep -rl Dstr . | while read f ; do
-	if grep -q 'include.*<Dstr>' $f ; then
-		sed -i.name -e 's|\(include.*\)<Dstr>|\1<Dstr.h>|' $f
-		echo -n -e "\t$f\tModified\n"
-	fi
+grep -rl 'include.*<Dstr>' . | while read f ; do
+	sed -i.name -e 's|\(include.*\)<Dstr>|\1<Dstr.h>|' $f
 done
-echo
-set -x
+
+# Embed version
+sed -i.ver \
+	-e "\@^PACKAGE_VERSION=@s|'.*'$|'%{version}-%{release}'|" \
+	-e "\@^PACKAGE_STRING=@s|'\(XTide \).*'$|'\1%{version}-%{release}'|" \
+	-e "\@^[ \t]*VERSION=@s|'.*'$|'%{version}-%{release}'|" \
+	configure
 
 %build
 %configure \
@@ -280,6 +279,9 @@ exit 0
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Fri Jul  2 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.7.dev20100406
+- Update to 2.11 dev 20100406
+
 * Tue Jun  1 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.6.dev20100406
 - Update dwf data to 20100529