From 6f7de87d04e3be71cc93862e7ca61f0262a4c024 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 13 Apr 2011 00:30:32 +0900 Subject: [PATCH 01/13] Update dwf data to 20110410 --- .gitignore | 1 + sources | 2 +- xtide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 67ff3f3..db59d31 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ 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 diff --git a/sources b/sources index c89b438..ad58245 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ e2d437448f3a6cfcaedb713af6887bbc xtide-2.12-dev-20101029.tar.bz2 ac4be3f3d47565d95863db6f9670a8c1 harmonics-dwf-20100529-free.tar.bz2 -0837652bcff4a6b2610f1d39010a5225 harmonics-dwf-20101230-free.tar.bz2 +985c2f69eea343782142fa459fc34128 harmonics-dwf-20110410-free.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 1025936..19a647c 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ %define mainver 2.12 %define betatag dev-20101029 -%define dwfdate 20101230 +%define dwfdate 20110410 -%define fedorarel 2 +%define fedorarel 3 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -286,6 +286,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Apr 12 2011 Mamoru Tasaka - 2.12-0.3.dev20101029 +- Update dwf data to 20110410 + * Sat Jan 1 2011 Mamoru Tasaka - 2.12-0.2.dev20101029 - A Happy New Year - Update dwf data to 20101230 From a73a4946c5628ef715452c8ff73a61bf283d86fb Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 2 Aug 2011 00:42:06 +0900 Subject: [PATCH 02/13] Update to 2.12 dev 20110731 --- .gitignore | 1 + sources | 1 + xtide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index db59d31..9fa20c2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xtide-2.11.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 diff --git a/sources b/sources index ad58245..42e158d 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ e2d437448f3a6cfcaedb713af6887bbc xtide-2.12-dev-20101029.tar.bz2 ac4be3f3d47565d95863db6f9670a8c1 harmonics-dwf-20100529-free.tar.bz2 985c2f69eea343782142fa459fc34128 harmonics-dwf-20110410-free.tar.bz2 +9a65647066c2bf22ade595f91f56d696 xtide-2.12-dev-20110731.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 19a647c..0086b9b 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ %define mainver 2.12 -%define betatag dev-20101029 +%define betatag dev-20110731 %define dwfdate 20110410 -%define fedorarel 3 +%define fedorarel 4 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -286,6 +286,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Aug 2 2011 Mamoru Tasaka - 2.12-0.4.dev20110731 +- Update to 2.12 dev 20110731 + * Tue Apr 12 2011 Mamoru Tasaka - 2.12-0.3.dev20101029 - Update dwf data to 20110410 From 00399b26055feccd8eca7468ccbb48e567da011f Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 28 Aug 2011 16:24:35 +0900 Subject: [PATCH 03/13] Update to 2.12 dev 20110827 --- .gitignore | 1 + sources | 3 +-- xtide.spec | 17 ++++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 9fa20c2..d02e7ee 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ xtide-2.11.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 diff --git a/sources b/sources index 42e158d..5285f37 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -e2d437448f3a6cfcaedb713af6887bbc xtide-2.12-dev-20101029.tar.bz2 ac4be3f3d47565d95863db6f9670a8c1 harmonics-dwf-20100529-free.tar.bz2 985c2f69eea343782142fa459fc34128 harmonics-dwf-20110410-free.tar.bz2 -9a65647066c2bf22ade595f91f56d696 xtide-2.12-dev-20110731.tar.bz2 +549cf54ad2fb19ca5ef22504c335e9f7 xtide-2.12-dev-20110827.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 0086b9b..2bd8cc6 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ %define mainver 2.12 -%define betatag dev-20110731 +%define betatag dev-20110827 %define dwfdate 20110410 -%define fedorarel 4 +%define fedorarel 5 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -33,7 +33,6 @@ Source42: ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tar. License: GPLv3+ Group: Applications/Engineering -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXaw-devel BuildRequires: libXext-devel @@ -128,9 +127,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 \ @@ -206,9 +202,6 @@ 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 - %post touch --no-create %{_datadir}/icons/hicolor || : @@ -286,6 +279,12 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Aug 28 2011 Mamoru Tasaka - 2.12-0.5.dev20110827 +- Update to 2.12 dev 20110827 + +* Wed Aug 24 2011 Mamoru Tasaka +- F-17: rebuild against new gpsd + * Tue Aug 2 2011 Mamoru Tasaka - 2.12-0.4.dev20110731 - Update to 2.12 dev 20110731 From 89cc4620aaa62986b6e21c7eb3133be79842630e Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 30 Aug 2011 00:37:02 +0900 Subject: [PATCH 04/13] Update to 2.12 RC1 Kill gpsd support on <= F-16, xtide now uses gpsd 3.0 --- .gitignore | 1 + sources | 4 +--- xtide.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d02e7ee..861f44c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ xtide-2.11.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 diff --git a/sources b/sources index 5285f37..e1bd8c9 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -ac4be3f3d47565d95863db6f9670a8c1 harmonics-dwf-20100529-free.tar.bz2 -985c2f69eea343782142fa459fc34128 harmonics-dwf-20110410-free.tar.bz2 -549cf54ad2fb19ca5ef22504c335e9f7 xtide-2.12-dev-20110827.tar.bz2 +a7bd7fae1a91e716e1fd508c2e02ff7f xtide-2.12-RC1.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 2bd8cc6..e44a9dc 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ %define mainver 2.12 -%define betatag dev-20110827 +%define betatag RC1 %define dwfdate 20110410 -%define fedorarel 5 +%define fedorarel 6 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -41,8 +41,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 @@ -279,6 +279,10 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Aug 30 2011 Mamoru Tasaka - 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 - 2.12-0.5.dev20110827 - Update to 2.12 dev 20110827 From 23c04f1db749cf772772e1c4c64dbc5d9b0281b2 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 30 Aug 2011 01:21:44 +0900 Subject: [PATCH 05/13] Reupload unexpectedly deleted file... --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index e1bd8c9..89ae7fd 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ a7bd7fae1a91e716e1fd508c2e02ff7f xtide-2.12-RC1.tar.bz2 +985c2f69eea343782142fa459fc34128 harmonics-dwf-20110410-free.tar.bz2 From bb41140e390f0f9cb6a1714e94f2d944a11caec4 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 6 Nov 2011 22:56:44 +0900 Subject: [PATCH 06/13] Update to 2.12 --- .gitignore | 1 + sources | 3 +-- xtide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 861f44c..0fadd38 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ xtide-2.11.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 diff --git a/sources b/sources index 89ae7fd..60bee7d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a7bd7fae1a91e716e1fd508c2e02ff7f xtide-2.12-RC1.tar.bz2 -985c2f69eea343782142fa459fc34128 harmonics-dwf-20110410-free.tar.bz2 +e7f3dd0b7eb63338b4d23a1719803714 xtide-2.12.tar.bz2 diff --git a/xtide.spec b/xtide.spec index e44a9dc..cff85f1 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ %define mainver 2.12 -%define betatag RC1 +%undefine betatag %define dwfdate 20110410 -%define fedorarel 6 +%define fedorarel 0.99 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -279,6 +279,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Nov 6 2011 Mamoru Tasaka - 2.12-1 +- Update to 2.12 + * Tue Aug 30 2011 Mamoru Tasaka - 2.12-0.6.RC1 - Update to 2.12 RC1 - Kill gpsd support on <= F-16, xtide now uses gpsd 3.0 From f97560b35cdf72b46b401f5ec257b52122a1465f Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 6 Nov 2011 23:03:33 +0900 Subject: [PATCH 07/13] fix release number --- xtide.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index cff85f1..c53a5d0 100644 --- a/xtide.spec +++ b/xtide.spec @@ -3,7 +3,7 @@ %define dwfdate 20110410 -%define fedorarel 0.99 +%define fedorarel 1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} From ea88f05e3638ac8858e793ae6272ace21d988a30 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 6 Nov 2011 23:25:51 +0900 Subject: [PATCH 08/13] reupload missing source --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 60bee7d..e7a3828 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ e7f3dd0b7eb63338b4d23a1719803714 xtide-2.12.tar.bz2 +985c2f69eea343782142fa459fc34128 harmonics-dwf-20110410-free.tar.bz2 From f6bb5135b2d330647f468cccb184304ee0b341dd Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Wed, 30 Nov 2011 13:09:03 +0900 Subject: [PATCH 09/13] Update to 2.12.1 --- .gitignore | 1 + sources | 2 +- xtide.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0fadd38..07b7cf7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ xtide-2.11.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 diff --git a/sources b/sources index e7a3828..67f666a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e7f3dd0b7eb63338b4d23a1719803714 xtide-2.12.tar.bz2 +0e037130db5d2f4a2f73438b960bb911 xtide-2.12.1.tar.bz2 985c2f69eea343782142fa459fc34128 harmonics-dwf-20110410-free.tar.bz2 diff --git a/xtide.spec b/xtide.spec index c53a5d0..4a8916b 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,4 +1,4 @@ -%define mainver 2.12 +%define mainver 2.12.1 %undefine betatag %define dwfdate 20110410 @@ -279,6 +279,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Wed Nov 30 2011 Mamoru Tasaka - 2.12.1-1 +- Update to 2.12.1 + * Sun Nov 6 2011 Mamoru Tasaka - 2.12-1 - Update to 2.12 From 6c8c660b8db9d0a6c11ee96e313190f408a7b62d Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sat, 31 Dec 2011 12:27:27 +0900 Subject: [PATCH 10/13] Update harmonics data to 20111230 --- .gitignore | 1 + sources | 1 + xtide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 07b7cf7..11900a4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ xtide-2.11.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 diff --git a/sources b/sources index 67f666a..2476ca5 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 0e037130db5d2f4a2f73438b960bb911 xtide-2.12.1.tar.bz2 985c2f69eea343782142fa459fc34128 harmonics-dwf-20110410-free.tar.bz2 +6291bc5015dbc57672a6950ac77c89a6 harmonics-dwf-20111230-free.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 4a8916b..1fd2ab0 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ %define mainver 2.12.1 %undefine betatag -%define dwfdate 20110410 +%define dwfdate 20111230 -%define fedorarel 1 +%define fedorarel 2 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -279,6 +279,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sat Dec 31 2011 Mamoru Tasaka - 2.12.1-2 +- Update harmonics data to 20111230 + * Wed Nov 30 2011 Mamoru Tasaka - 2.12.1-1 - Update to 2.12.1 From b1e55b91b1df89d4f339caecc21438133734f89b Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Mon, 5 Mar 2012 11:08:47 +0900 Subject: [PATCH 11/13] 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(-) create mode 100644 xtide-2.12.1-rcscript-pidfile.patch 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.*' . | while read f ; do sed -i.name -e 's|\(include.*\)|\1|' $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 - 2.12.1-4 +- Update harmonics data to 20120302 +- Modify rc script for new systemd + +* Thu Jan 5 2012 Mamoru Tasaka - 2.12.1-3 +- F-17: rebuild against gcc47 + * Sat Dec 31 2011 Mamoru Tasaka - 2.12.1-2 - Update harmonics data to 20111230 From 8fc9f9903bd6ef3d21c7c716d3608347db214d29 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Mon, 5 Mar 2012 11:13:36 +0900 Subject: [PATCH 12/13] Update harmonics data to 20120302 - Modify rc script for new systemd --- .gitignore | 1 + xtide.spec | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 11900a4..54d176c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ xtide-2.11.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 diff --git a/xtide.spec b/xtide.spec index a6a008a..a639683 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ -%define mainver 2.12.1 -%undefine betatag +%define mainver 2.13 +%define betatag RC2 %define dwfdate 20120302 -%define fedorarel 4 +%define fedorarel 0.1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} From 91b8a3f2378f9e5bfecdb9968f61f6721daba221 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Mon, 5 Mar 2012 11:20:00 +0900 Subject: [PATCH 13/13] oops... --- xtide.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xtide.spec b/xtide.spec index a639683..a6a008a 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ -%define mainver 2.13 -%define betatag RC2 +%define mainver 2.12.1 +%undefine betatag %define dwfdate 20120302 -%define fedorarel 0.1 +%define fedorarel 4 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')}