rpms/xtide/FC-6 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xtide.desktop, 1.3, 1.4 xtide.spec, 1.12, 1.13 xtide-2.9dev-rcinit.diff, 1.1, NONE xttpd-wrapper.sh, 1.1, NONE xttpd.conf, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8552

Modified Files:
	.cvsignore sources xtide.desktop xtide.spec 
Removed Files:
	xtide-2.9dev-rcinit.diff xttpd-wrapper.sh xttpd.conf 
Log Message:
* Tue Dec  4 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9-0.2.date20061203
- 2.9 dev 20061203
- Update desktop files
- Use scripts in source tarball
- Drop harmonics data description



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Nov 2006 23:34:58 -0000	1.5
+++ .cvsignore	4 Dec 2006 15:57:30 -0000	1.6
@@ -1 +1 @@
-xtide-2.9dev-20061122.tar.bz2
+xtide-2.9dev-20061203.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Nov 2006 13:47:22 -0000	1.5
+++ sources	4 Dec 2006 15:57:30 -0000	1.6
@@ -1 +1 @@
-efc6b3eb603e5b51c13c5dbb7bd29548  xtide-2.9dev-20061122.tar.bz2
+370e6f4d43ad8d0550763d1fba05525a  xtide-2.9dev-20061203.tar.bz2


Index: xtide.desktop
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-6/xtide.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xtide.desktop	26 Nov 2006 13:47:22 -0000	1.3
+++ xtide.desktop	4 Dec 2006 15:57:30 -0000	1.4
@@ -7,5 +7,5 @@
 Icon=xtide
 Terminal=false
 Type=Application
-Categories=Application;Science;Education;
+Categories=Science;Education;
 


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-6/xtide.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xtide.spec	26 Nov 2006 13:47:22 -0000	1.12
+++ xtide.spec	4 Dec 2006 15:57:30 -0000	1.13
@@ -1,5 +1,4 @@
-%{!?with_harmonics: %define   with_harmonics 0}
-%define          src_date   20061122    
+%define          src_date   20061203  
 
 Summary:         Calculate tide all over the world
 Name:            xtide
@@ -8,15 +7,8 @@
 
 URL:             http://www.flaterco.com/xtide/
 Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}dev-%{src_date}.tar.bz2
-%if %{with_harmonics}
-Source1:         http://harmonics.unh.edu/xtide/harmonics.txt.gz
-%endif
-
-Patch18:         xtide-2.9dev-rcinit.diff
 
-Source11:        xttpd.conf
 Source14:        xtide-get_harmonics-data.sh
-Source15:        xttpd-wrapper.sh
 Source20:        %{name}.desktop
 Source30:        xtide-README.fedora
 
@@ -26,15 +18,16 @@
 
 BuildRequires:   autoconf
 
+%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
-%if %{with_harmonics}
-BuildRequires:   tcd-utils
-%endif
 Requires:        wvs-data
 Requires:        xtide-common
 
@@ -94,29 +87,12 @@
 %prep
 %setup -q -n %{name}-2.9dev
 
-pushd scripts/Fedora
-%patch18 -p0 -b .fedora
-popd
-
 %build
 export xttpd_user=xttpd
 export xttpd_group=xttpd
 %configure
-
 %{__make} %{?_smp_mflags}
 
-# harmonics file
-%if %{with_harmonics}
-%{__install} -c -p -m 644 %{SOURCE1} .
-%{__gzip} -d harmoni*
-
-for f in harmonics*.txt ; do
-   TCD=${f%.txt}.tcd
-done
-
-build_tide_db $TCD harmonics-*.txt &> harmonics.out
-%endif
-
 echo "%{_datadir}/xtide-harmonics/" > %{name}.conf
 echo "%{_datadir}/wvs-data/" >> %{name}.conf
 
@@ -135,7 +111,8 @@
 %{__install} -c -p -m 755 %{SOURCE14} \
    $RPM_BUILD_ROOT%{_sbindir}
 %{__mv} $RPM_BUILD_ROOT%{_sbindir}/xttpd $RPM_BUILD_ROOT%{_libexecdir}
-%{__install} -c -p -m 755 %{SOURCE15} $RPM_BUILD_ROOT%{_sbindir}/xttpd
+%{__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}|' \
@@ -145,10 +122,6 @@
 # 1A Install harmonics file
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/%{name}
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-harmonics
-%if %{with_harmonics}
-%{__install} -c -p -m 644 harmonics*.tcd \
-   ${RPM_BUILD_ROOT}%{_datadir}/%{name}-harmonics/
-%endif
 
 # 1B Add configuration file
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_sysconfdir}
@@ -159,7 +132,6 @@
 desktop-file-install \
    --vendor fedora \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   --remove-category Application \
    %{SOURCE20}
 
 # 1D Install icon
@@ -177,9 +149,10 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 %{__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
-%{__install} -c -p -m 644 %{SOURCE11} \
+%{__install} -c -p -m 644 scripts/Fedora/xttpd.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/xttpd
 
 # 1F and others
@@ -223,9 +196,6 @@
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}-harmonics
 %dir %{_sysconfdir}/%{name}
-%if %{with_harmonics}
-%{_datadir}/%{name}-harmonics/harmonics*.tcd
-%endif
 
 %{_sbindir}/xtide-get*.sh
 
@@ -251,6 +221,15 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Tue Dec  4 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9-0.2.date20061203
+- 2.9 dev 20061203
+- Update desktop files
+- Use scripts in source tarball
+- Drop harmonics data description
+
+* Wed Nov 29 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Add more BuildRequires only for FC-5.
+
 * Sun Nov 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9-0.2.date20061122
 - Ensure the hardcorded directories in some scripts can be 
   appropriately changed.


--- xtide-2.9dev-rcinit.diff DELETED ---


--- xttpd-wrapper.sh DELETED ---


--- xttpd.conf DELETED ---