[xtide/f16] Update harmonics data to 20120302
Mamoru Tasaka
mtasaka at fedoraproject.org
Mon Mar 5 02:08:45 UTC 2012
commit 05f48299f8284b66842f31a0a0e0780601dc44ee
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date: Mon Mar 5 11:08:09 2012 +0900
Update harmonics data to 20120302
- Modify rc script for new systemd
sources | 1 +
xtide-2.12.1-rcscript-pidfile.patch | 44 +++++++++++++++++++++++++++++++++++
xtide.spec | 27 ++++++++++++++++-----
3 files changed, 65 insertions(+), 7 deletions(-)
---
diff --git a/sources b/sources
index 2476ca5..bca6273 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
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
diff --git a/xtide-2.12.1-rcscript-pidfile.patch b/xtide-2.12.1-rcscript-pidfile.patch
new file mode 100644
index 0000000..8e9d508
--- /dev/null
+++ b/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
+ }
diff --git a/xtide.spec b/xtide.spec
index 1fd2ab0..a6a008a 100644
--- a/xtide.spec
+++ b/xtide.spec
@@ -1,9 +1,9 @@
%define mainver 2.12.1
%undefine betatag
-%define dwfdate 20111230
+%define dwfdate 20120302
-%define fedorarel 2
+%define fedorarel 4
%define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')}
@@ -30,6 +30,8 @@ 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
@@ -93,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}'|" \
@@ -193,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
@@ -202,6 +204,10 @@ for f in AUTHORS ChangeLog NEWS README ; do
( touch -r $f $f.tmp ; mv -f $f.tmp $f ) || rm -f $f.tmp
done
+mkdir harmonics-dwf
+cp -a harmonics-dwf-%{dwfdate}/[A-Z]* \
+ harmonics-dwf/
+
%post
touch --no-create %{_datadir}/icons/hicolor || :
@@ -245,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}
@@ -279,6 +285,13 @@ exit 0
%{_datadir}/man/man8/xttpd.8*
%changelog
+* Mon Mar 5 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 2.12.1-4
+- Update harmonics data to 20120302
+- Modify rc script for new systemd
+
+* Thu Jan 5 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 2.12.1-3
+- F-17: rebuild against gcc47
+
* Sat Dec 31 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 2.12.1-2
- Update harmonics data to 20111230
More information about the scm-commits
mailing list