rpms/xtide/F-7 .cvsignore, 1.25, 1.26 sources, 1.25, 1.26 xtide.spec, 1.34, 1.35

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xtide/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10553/F-7

Modified Files:
	.cvsignore sources xtide.spec 
Log Message:
* Sat Jan 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-0.1.RC1
- Try 2.10 RC1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Dec 2007 01:57:07 -0000	1.25
+++ .cvsignore	19 Jan 2008 14:05:33 -0000	1.26
@@ -1,3 +1,3 @@
 Harminics-USpart-recreate-sh.tar.bz2
 harmonics-dwf-20071228-free.tcd.bz2
-xtide-2.9.5.tar.bz2
+xtide-2.10-RC1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Dec 2007 01:57:07 -0000	1.25
+++ sources	19 Jan 2008 14:05:33 -0000	1.26
@@ -1,3 +1,3 @@
 83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
 1f9802af5a1b17491b31b6c827b56bf3  harmonics-dwf-20071228-free.tcd.bz2
-e78f229522bdaff0dbef132874b9d9f5  xtide-2.9.5.tar.bz2
+9def95b185521bbe37d0f8cab9f3af9c  xtide-2.10-RC1.tar.bz2


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/xtide.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xtide.spec	30 Dec 2007 01:57:07 -0000	1.34
+++ xtide.spec	19 Jan 2008 14:05:33 -0000	1.35
@@ -1,13 +1,21 @@
-%define          betatag   %{nil}
+%define          mainver   2.10
+%define          betatag   RC1
 %define          dwfdate   20071228
 
+
+%define          fedorarel  1
+
+
+%define          rel        %{?betatag:0.}%{fedorarel}%{?betatag:.%betatag}
+
+
 Summary:         Calculate tide all over the world
 Name:            xtide
-Version:         2.9.5
-Release:         2%{?dist}
+Version:         %{mainver}
+Release:         %{rel}%{?dist}
 
 URL:             http://www.flaterco.com/xtide/
-Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
+Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.bz2
 
 Source14:        xtide-get_harmonics-data.sh
 Source20:        %{name}.desktop
@@ -27,17 +35,12 @@
 Group:           Applications/Engineering
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{?fedora} == 5
-BuildRequires:   libXpm-devel
-BuildRequires:   libXt-devel
-%endif
 BuildRequires:   libXaw-devel
 BuildRequires:   libXext-devel
 BuildRequires:   libpng-devel
 BuildRequires:   zlib-devel
 Buildrequires:   desktop-file-utils
 BuildRequires:   libtcd-devel
-#BuildRequires:   tcd-utils
 
 Requires:        wvs-data
 Requires:        xorg-x11-fonts-base
@@ -87,14 +90,13 @@
 Please read README.fedora for Fedora specific issue.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?betatag:-%betatag}
 
 %{__mkdir} TMPDIR
-%if 0
 pushd TMPDIR
-%{__bzip2} -dc %{SOURCE41} | %{__tar} -xf -
+%{__cp} -p %{SOURCE42} .
+%{__bzip2} -d *.bz2
 popd
-%endif
 
 %build
 %configure \
@@ -111,9 +113,6 @@
 %if 0
 build_tide_db harmonics-dwf-%{dwfdate}-Fedora.tcd \
    *txt *xml
-%else
-%{__cp} -p %{SOURCE42} .
-%{__bzip2} -d *.bz2
 %endif
 popd
 
@@ -136,9 +135,11 @@
    > xtide-get_harmonics-data.sh
 %{__install} -c -p -m 755 xtide-get_harmonics-data.sh \
    $RPM_BUILD_ROOT%{_sbindir}
+
 %{__mv} $RPM_BUILD_ROOT%{_sbindir}/xttpd $RPM_BUILD_ROOT%{_libexecdir}
 %{__install} -c -p -m 755 scripts/Fedora/xttpd-wrapper.sh \
    $RPM_BUILD_ROOT%{_sbindir}/xttpd
+
 # ensure xttpd binary installation directory (original
 # wrapper script is hardcorded)
 %{__sed} -i -e 's|/usr/libexec|%{_libexecdir}|' \
@@ -172,12 +173,12 @@
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 # 1E install xttpd conf file
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+%{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/xtide
 
 %{__install} -c -p -m 755 scripts/Fedora/rc.xttpd \
-   $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/xttpd
+   $RPM_BUILD_ROOT%{_initrddir}/xttpd
 %{__install} -c -p -m 644 scripts/Fedora/xttpd.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/xttpd
 
@@ -258,13 +259,16 @@
 
 # xttpd
 %config(noreplace) %{_sysconfdir}/sysconfig/xttpd
-%{_sysconfdir}/rc.d/init.d/xttpd
+%{_initrddir}/xttpd
 
 %{_sbindir}/xttpd
 %{_libexecdir}/xttpd
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Sat Jan 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-0.1.RC1
+- Try 2.10 RC1
+
 * Sun Dec 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.5-2
 - Update harmonics data to 20071228