rpms/xtide/F-12 .cvsignore, 1.28, 1.29 sources, 1.28, 1.29 xtide.spec, 1.45, 1.46
Mamoru Tasaka
mtasaka at fedoraproject.org
Sat Jul 3 16:49:46 UTC 2010
Author: mtasaka
Update of /cvs/extras/rpms/xtide/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12541/F-12
Modified Files:
.cvsignore sources xtide.spec
Log Message:
* Sun Jul 4 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.8.RC1
- 2.11 RC1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-12/.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 3 Jul 2010 16:49:45 -0000 1.29
@@ -1,2 +1,2 @@
-xtide-2.10.tar.bz2
-harmonics-dwf-20081228-free.tar.bz2
+xtide-2.11-RC1.tar.bz2
+harmonics-dwf-20100529-free.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-12/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 3 Jul 2010 16:49:45 -0000 1.29
@@ -1,2 +1,2 @@
-a14d9db748a86bed37769f38c4320ddd xtide-2.10.tar.bz2
-2e1ee564394a7b6f034f7f9be1ce5394 harmonics-dwf-20081228-free.tar.bz2
+58088315ea4c0f4fed31b1a8e3bb40e3 xtide-2.11-RC1.tar.bz2
+ac4be3f3d47565d95863db6f9670a8c1 harmonics-dwf-20100529-free.tar.bz2
Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-12/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 3 Jul 2010 16:49:45 -0000 1.46
@@ -1,12 +1,12 @@
-%define mainver 2.10
-%undefine betatag
-%define dwfdate 20081228
+%define mainver 2.11
+%define betatag RC1
+%define dwfdate 20100529
-%define fedorarel 5
+%define fedorarel 8
-%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
@@ -42,6 +42,9 @@ BuildRequires: zlib-devel
BuildRequires: desktop-file-utils
BuildRequires: libdstr-devel
BuildRequires: libtcd-devel
+%if 0%{?fedora} >= 14
+BuildRequires: gpsd-devel >= 2.92
+%endif
Requires: wvs-data
Requires: xorg-x11-fonts-base
@@ -91,40 +94,32 @@ 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:-%{betatag}}
+%setup -q -T -c -n %{name}-%{version}%{?betatag:-%{betatag}}/TMPDIR -a 42
+%setup -q -D -n %{name}-%{version}%{?betatag:-%{betatag}}
# Dstr -> Dstr.h
-set +x
-echo
-echo "Changing Dstr -> Dstr"
-find . -type f | 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 \
--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 +279,31 @@ exit 0
%{_datadir}/man/man8/xttpd.8*
%changelog
+* Sun Jul 4 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.8.RC1
+- 2.11 RC1
+
+* Fri Jul 2 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.7.dev20100625
+- Update to 2.11 dev 20100625
+
+* Tue Jun 1 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.6.dev20100406
+- Update dwf data to 20100529
+
+* Thu May 27 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.5.dev20100406
+- Update dwf data to 20100522
+
+* Fri May 7 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.4.dev20100406
+- F-14+: enable gpsd support
+
+* Thu Apr 8 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.3.dev20100406
+- Update to 2.11 dev20100406
+
+* Sat Jan 2 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11-0.2.dev20091227
+- Update to 2.11 dev20091227
+- Update to dwf data 20091227
+
+* 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
More information about the scm-commits
mailing list