rpms/xtide/devel .cvsignore, 1.28, 1.29 sources, 1.28, 1.29 xtide.spec, 1.45, 1.46

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31568

Modified Files:
	.cvsignore sources xtide.spec 
Log Message:
* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.1.dev20090913
- Update to 2.11 development branch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	7 Jan 2009 17:41:08 -0000	1.28
+++ .cvsignore	14 Sep 2009 08:56:47 -0000	1.29
@@ -1,2 +1 @@
-xtide-2.10.tar.bz2
-harmonics-dwf-20081228-free.tar.bz2
+xtide-2.11-dev-20090913.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	7 Jan 2009 17:41:08 -0000	1.28
+++ sources	14 Sep 2009 08:56:47 -0000	1.29
@@ -1,2 +1 @@
-a14d9db748a86bed37769f38c4320ddd  xtide-2.10.tar.bz2
-2e1ee564394a7b6f034f7f9be1ce5394  harmonics-dwf-20081228-free.tar.bz2
+718f6fcc35b81b3638c66b088989a7f9  xtide-2.11-dev-20090913.tar.bz2


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- xtide.spec	24 Jul 2009 20:20:01 -0000	1.45
+++ xtide.spec	14 Sep 2009 08:56:47 -0000	1.46
@@ -1,12 +1,12 @@
-%define          mainver   2.10
-%undefine          betatag
+%define          mainver   2.11
+%define          betatag   dev-20090913
 %define          dwfdate   20081228
 
 
-%define          fedorarel  5
+%define          fedorarel  1
 
 
-%define          rel        %{?betatag:0.}%{fedorarel}%{?betatag:.%betatag}
+%define          rel        %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')}
 
 
 Summary:         Calculate tide all over the world
@@ -91,14 +91,15 @@ tideEditor.
 Please read README.fedora for Fedora specific issue.
 
 %prep
-%setup -q -T -c -n %{name}-%{version}%{?betatag:-%betatag}/TMPDIR -a 42
-%setup -q -D -n %{name}-%{version}%{?betatag:-%betatag}
+%setup -q -T -c -n %{name}-%{version}%{?betatag:-DEVELOPMENT}
+%setup -q -T -c -n %{name}-%{version}%{?betatag:-DEVELOPMENT}/TMPDIR -a 42
+%setup -q -D -n %{name}-%{version}%{?betatag:-DEVELOPMENT}
 
 # Dstr -> Dstr.h
 set +x
 echo
 echo "Changing Dstr -> Dstr"
-find . -type f | while read f ; do
+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"
@@ -112,19 +113,11 @@ set -x
    --with-xttpd-user=xttpd \
    --with-xttpd-group=xttpd
 
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} -k
 
 echo "%{_datadir}/xtide-harmonics/" > %{name}.conf
 echo "%{_datadir}/wvs-data/" >> %{name}.conf
 
-# create US part tcd data
-pushd TMPDIR
-%if 0
-build_tide_db harmonics-dwf-%{dwfdate}-Fedora.tcd \
-   *txt *xml
-%endif
-popd
-
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__mkdir_p} $RPM_BUILD_ROOT
@@ -284,6 +277,9 @@ exit 0
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.1.dev20090913
+- Update to 2.11 development branch
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-5
 - Use %%_initddir instead of %%_initrddir