oops...

- Modify rc script for new systemd

.gitignore

@@ -4,3 +4,11 @@ xtide-2.11.tar.bz2
 /xtide-2.12-dev-20101029.tar.bz2
 /harmonics-dwf-20100529-free.tar.bz2
 /harmonics-dwf-20101230-free.tar.bz2
+/harmonics-dwf-20110410-free.tar.bz2
+/xtide-2.12-dev-20110731.tar.bz2
+/xtide-2.12-dev-20110827.tar.bz2
+/xtide-2.12-RC1.tar.bz2
+/xtide-2.12.tar.bz2
+/xtide-2.12.1.tar.bz2
+/harmonics-dwf-20111230-free.tar.bz2
+/harmonics-dwf-20120302-free.tar.bz2

sources

@@ -1,3 +1,4 @@
-e2d437448f3a6cfcaedb713af6887bbc  xtide-2.12-dev-20101029.tar.bz2
-ac4be3f3d47565d95863db6f9670a8c1  harmonics-dwf-20100529-free.tar.bz2
-0837652bcff4a6b2610f1d39010a5225  harmonics-dwf-20101230-free.tar.bz2
+0e037130db5d2f4a2f73438b960bb911  xtide-2.12.1.tar.bz2
+985c2f69eea343782142fa459fc34128  harmonics-dwf-20110410-free.tar.bz2
+6291bc5015dbc57672a6950ac77c89a6  harmonics-dwf-20111230-free.tar.bz2
+6bbd2ea64667eb8720a8761223696617  harmonics-dwf-20120302-free.tar.bz2

xtide-2.12.1-rcscript-pidfile.patch

@@ -0,0 +1,44 @@
+--- xtide-2.12.1/scripts/Fedora/rc.xttpd.pid	2006-11-25 07:03:03.000000000 +0900
++++ xtide-2.12.1/scripts/Fedora/rc.xttpd	2012-03-05 10:41:04.283973613 +0900
+@@ -13,6 +13,7 @@
+ CONFIG=/etc/sysconfig/xttpd
+ 
+ LOCK=/var/lock/subsys/xttpd
++PIDFILE=/var/run/xttpd.pid
+ 
+ # Source function library.
+ . /etc/rc.d/init.d/functions
+@@ -39,15 +40,23 @@
+ 	RETVAL=1
+ 	return $RETVAL
+     fi
++	if pgrep -U xttpd -f $PROG ; then
++	echo -n $"daemon already running."
++	failure
++	echo
++	RETVAL=1
++	return $RETVAL
++	fi
+ 
+     if test "$XTTPD_FEEDBACK"; then
+-	daemon $DAEMON $PORT XTTPD_FEEDBACK=$XTTPD_FEEDBACK HOME=$HOME
++	$DAEMON $PORT XTTPD_FEEDBACK=$XTTPD_FEEDBACK HOME=$HOME
+ 	RETVAL=$?
+     else
+-	daemon $DAEMON $PORT HOME=$HOME
++	$DAEMON $PORT HOME=$HOME
+ 	RETVAL=$?
+     fi
+     [ $RETVAL -eq 0 ] && touch $LOCK
++	[ $RETVAL -eq 0 ] && pgrep -U xttpd -f $PROG > $PIDFILE
+     echo
+     return $RETVAL
+ }
+@@ -57,6 +66,7 @@
+     killproc $DAEMON
+     RETVAL=$?
+     [ $RETVAL -eq 0 ] && rm -f $LOCK
++	[ $RETVAL -eq 0 ] && rm -f $PIDFILE
+     echo
+     return $RETVAL
+ }

xtide.spec

@@ -1,9 +1,9 @@
-%define          mainver   2.12
-%define          betatag   dev-20101029
-%define          dwfdate   20101230
+%define          mainver   2.12.1
+%undefine          betatag   
+%define          dwfdate   20120302
 
 
-%define          fedorarel  2
+%define          fedorarel  4
 
 
 %define          rel        %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')}
@@ -30,10 +30,11 @@ Source30:        xtide-README.fedora
 #Source40:        Harminics-USpart-recreate-sh.tar.bz2
 #Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
 Source42:        ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tar.bz2
+# new systemd ( >= 37.4? ) needs pidfile
+Patch0:          xtide-2.12.1-rcscript-pidfile.patch
 
 License:         GPLv3+
 Group:           Applications/Engineering
-BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:   libXaw-devel
 BuildRequires:   libXext-devel
@@ -42,8 +43,8 @@ BuildRequires:   zlib-devel
 BuildRequires:   desktop-file-utils
 BuildRequires:   libdstr-devel
 BuildRequires:   libtcd-devel
-%if 0%{?fedora} >= 14
-BuildRequires:   gpsd-devel >= 2.92
+%if 0%{?fedora} >= 17
+BuildRequires:   gpsd-devel >= 3
 %endif
 
 Requires:        wvs-data
@@ -94,15 +95,15 @@ tideEditor.
 Please read README.fedora for Fedora specific issue.
 
 %prep
-%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}}
+%setup -q -n %{name}-%{version}%{?betatag:-%{betatag}} -a 42
 
 # Dstr -> Dstr.h
 grep -rl 'include.*<Dstr>' . | while read f ; do
 	sed -i.name -e 's|\(include.*\)<Dstr>|\1<Dstr.h>|' $f
 done
 
+%patch0 -p1
+
 # Embed version
 sed -i.ver \
 	-e "\@^PACKAGE_VERSION=@s|'.*'$|'%{version}-%{release}'|" \
@@ -128,9 +129,6 @@ echo "%{_datadir}/xtide-harmonics/" > %{name}.conf
 echo "%{_datadir}/wvs-data/" >> %{name}.conf
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__mkdir_p} $RPM_BUILD_ROOT
- 
 # 1. install xtide
 %{__make} \
    DESTDIR=$RPM_BUILD_ROOT \
@@ -197,7 +195,7 @@ done
 %{__install} -c -p -m 644 %{SOURCE30} README.fedora
 
 # 1G tcd data
-%{__install} -c -p -m 644 TMPDIR/*tcd \
+%{__install} -c -p -m 644 harmonics-dwf-%{dwfdate}/*tcd \
    $RPM_BUILD_ROOT%{_datadir}/xtide-harmonics/
 
 # 2 Documentation
@@ -206,8 +204,9 @@ for f in AUTHORS ChangeLog NEWS README ; do
       ( touch -r $f $f.tmp ; mv -f $f.tmp $f ) || rm -f $f.tmp
 done
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+mkdir harmonics-dwf
+cp -a harmonics-dwf-%{dwfdate}/[A-Z]* \
+	harmonics-dwf/
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -252,7 +251,7 @@ exit 0
 
 %files common
 %doc README.fedora
-%doc TMPDIR/harmonics_boilerplate.txt
+%doc harmonics-dwf/
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 
 %dir %{_datadir}/%{name}
@@ -286,6 +285,38 @@ exit 0
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Mon Mar  5 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.12.1-4
+- Update harmonics data to 20120302
+- Modify rc script for new systemd
+
+* Thu Jan  5 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.12.1-3
+- F-17: rebuild against gcc47
+
+* Sat Dec 31 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.12.1-2
+- Update harmonics data to 20111230
+
+* Wed Nov 30 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.12.1-1
+- Update to 2.12.1
+
+* Sun Nov  6 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.12-1
+- Update to 2.12
+
+* Tue Aug 30 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.12-0.6.RC1
+- Update to 2.12 RC1
+- Kill gpsd support on <= F-16, xtide now uses gpsd 3.0
+
+* Sun Aug 28 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.12-0.5.dev20110827
+- Update to 2.12 dev 20110827
+
+* Wed Aug 24 2011 Mamoru Tasaka <mtasaka@fedoraproject.org>
+- F-17: rebuild against new gpsd
+
+* Tue Aug  2 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.12-0.4.dev20110731
+- Update to 2.12 dev 20110731
+
+* Tue Apr 12 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.12-0.3.dev20101029
+- Update dwf data to 20110410
+
 * Sat Jan  1 2011 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 2.12-0.2.dev20101029
 - A Happy New Year
 - Update dwf data to 20101230