From df605a97bbf6cdeb823c58c657034373f53ea29d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 28 Jan 2020 13:38:05 +0900 Subject: [PATCH 01/34] harmonics data update (20191229) --- .gitignore | 1 + sources | 2 +- xtide.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 673f69f..5be91d6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /harmonics-dwf-20180101-free.tar.bz2 /harmonics-dwf-20181227-free.tar.bz2 /xtide-2.15.2.tar.bz2 +/harmonics-dwf-20191229-free.tar.xz diff --git a/sources b/sources index b022f84..e2954ab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (xtide-2.15.2.tar.bz2) = adfcaeb0f87defb5918d80651b90de47f5afd5cf651fcf12fc1d02d970e8ac3fec613445b91464e72806037cfa9e576b880c8d361d3062f1bc3bc2df58da1ba6 -SHA512 (harmonics-dwf-20181227-free.tar.bz2) = 34d19d0b6fd08f40f3ad222b37378b54d619e079c4488e918dc8fdd5fd78e5705eca850554e256793b65b55a58256eede213274c0cd2e4d007fb50007f0c81cf +SHA512 (harmonics-dwf-20191229-free.tar.xz) = d0b1bb1ff848f04043e5890f591f0d471661e37b678402d2e84c6f830a8cbb589dcd8bd4b80cfda5b1756a25ee6253684fcedeeaf615e84995d8891c2df5d5bd diff --git a/xtide.spec b/xtide.spec index ad05dec..d0876f0 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,6 +1,6 @@ %define mainver 2.15.2 #%%define betatag dev-20160114 -%define dwfdate 20181227 +%define dwfdate 20191229 %global use_systemd_unit 1 %if 0%{?fedora} <= 23 @@ -8,7 +8,7 @@ %endif -%define fedorarel 1 +%define fedorarel 2 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -34,7 +34,7 @@ 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 +Source42: ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tar.xz # new systemd ( >= 37.4? ) needs pidfile Patch0: xtide-2.12.1-rcscript-pidfile.patch @@ -414,6 +414,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Jan 28 2020 Mamoru TASAKA - 2.15.2-2 +- harmonics data update (20191229) + * Tue Feb 26 2019 Mamoru TASAKA - 2.15.2-1 - 2.15.2 From 57539eb50eeb34f99e288b725a732bcd23218500 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 7 Aug 2020 20:03:52 +0900 Subject: [PATCH 02/34] F-33: mass rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index d0876f0..c57f345 100644 --- a/xtide.spec +++ b/xtide.spec @@ -17,7 +17,7 @@ Summary: Calculate tide all over the world Name: xtide Version: %{mainver} -Release: %{rel}%{?dist} +Release: %{rel}%{?dist}.1 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.bz2 @@ -414,6 +414,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Fri Aug 07 2020 Mamoru TASAKA - 2.15.2-2.1 +- F-33: mass rebuild + * Tue Jan 28 2020 Mamoru TASAKA - 2.15.2-2 - harmonics data update (20191229) From 43842406b1107cb910585ca64c83696f93309cbf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 9 Aug 2020 22:45:50 +0900 Subject: [PATCH 03/34] kill unsupported macro condition --- xtide.spec | 65 ------------------------------------------------------ 1 file changed, 65 deletions(-) diff --git a/xtide.spec b/xtide.spec index c57f345..73251f4 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,12 +2,6 @@ #%%define betatag dev-20160114 %define dwfdate 20191229 -%global use_systemd_unit 1 -%if 0%{?fedora} <= 23 -%global use_systemd_unit 0 -%endif - - %define fedorarel 2 @@ -49,10 +43,8 @@ BuildRequires: desktop-file-utils BuildRequires: libdstr-devel BuildRequires: libtcd-devel BuildRequires: gpsd-devel >= 3 -%if %{?use_systemd_unit} BuildRequires: systemd BuildRequires: systemd-devel -%endif # By SOURCE1 BuildRequires: automake BuildRequires: autoconf @@ -67,16 +59,9 @@ Requires: xtide-common = %{version}-%{release} Requires: libxtide%{?_isa} = %{version}-%{release} Requires(pre): shadow-utils -%if %{?use_systemd_unit} Requires(preun): systemd Requires(postun): systemd Requires(post): systemd -%else -Requires(preun): /sbin/service -Requires(preun): /sbin/chkconfig -Requires(postun): /sbin/service -Requires(post): /sbin/chkconfig -%endif %package -n libxtide Summary: XTide library @@ -185,11 +170,7 @@ export CFLAGS="%{optflags} -DJGFeatures" export CXXFLAGS="%{optflags} -DJGFeatures" %configure \ -%if %{use_systemd_unit} --enable-systemd \ -%else - --disable-systemd \ -%endif %if 0 --enable-moon-age \ %endif @@ -210,9 +191,6 @@ echo "%{_datadir}/wvs-data/" >> %{name}.conf install %{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir} -%if ! 0%{?use_systemd_unit} -%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir} -%endif # xttpd treatment # xttpd is wrapped @@ -221,19 +199,12 @@ echo "%{_datadir}/wvs-data/" >> %{name}.conf %{__install} -c -p -m 755 xtide-get_harmonics-data.sh \ $RPM_BUILD_ROOT%{_sbindir} -%if ! 0%{?use_systemd_unit} -%{__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 -%endif - # ensure xttpd binary installation directory (original # wrapper script is hardcorded) %{__sed} -i -e 's|/usr/libexec|%{_libexecdir}|' \ $RPM_BUILD_ROOT%{_sbindir}/xttpd # Install systemd unit file -%if 0%{?use_systemd_unit} %{__mkdir_p} ${RPM_BUILD_ROOT}%{_unitdir} %{__install} -c -p -m 644 \ scripts/systemd/xttpd.socket \ @@ -249,7 +220,6 @@ echo "%{_datadir}/wvs-data/" >> %{name}.conf %{__install} -c -p -m 644 \ scripts/systemd/xttpd.socket \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/xttpd.socket -%endif # 1A Install harmonics file %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/%{name} @@ -284,13 +254,6 @@ done %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/xtide -%if ! 0%{?use_systemd_unit} -%{__install} -c -p -m 755 scripts/Fedora/rc.xttpd \ - $RPM_BUILD_ROOT%{_initddir}/xttpd -%{__install} -c -p -m 644 scripts/Fedora/xttpd.conf \ - $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/xttpd -%endif - # 1F and others %{__install} -c -p -m 644 %{SOURCE30} README.fedora @@ -313,21 +276,11 @@ cp -a harmonics-dwf-%{dwfdate}/[A-Z]* \ rm -rf $RPM_BUILD_ROOT%{_libdir}/libxtide.{a,la} %post -%if 0%{?use_systemd_unit} %systemd_post xttpd.socket xttpd.service -%else -/sbin/chkconfig --add xttpd -%endif exit 0 %postun -%if 0%{?use_systemd_unit} %systemd_postun xttpd.socket xttpd.service -%else -if [ $1 -ge 1 ] ; then - /sbin/service xttpd condrestart &>/dev/null || : -fi -%endif exit 0 @@ -345,14 +298,7 @@ getent passwd xttpd &> /dev/null || \ exit 0 %preun -%if 0%{?use_systemd_unit} %systemd_preun xttpd.socket xttpd.service -%else -if [ $1 = 0 ] ; then - /sbin/service xttpd stop &>/dev/null - /sbin/chkconfig --del xttpd -fi -%endif exit 0 %ldconfig_scriptlets -n libxtide @@ -394,23 +340,12 @@ exit 0 %{_bindir}/*tide # xttpd -%if 0%{?use_systemd_unit} %config(noreplace) %{_sysconfdir}/sysconfig/xttpd.service.conf %config(noreplace) %{_sysconfdir}/sysconfig/xttpd.socket -%else -%config(noreplace) %{_sysconfdir}/sysconfig/xttpd -%endif -%if 0%{?use_systemd_unit} %{_unitdir}/xttpd.service %{_unitdir}/xttpd.socket -%else -%{_initddir}/xttpd -%endif %{_sbindir}/xttpd -%if ! 0%{?use_systemd_unit} -%{_libexecdir}/xttpd -%endif %{_datadir}/man/man8/xttpd.8* %changelog From 5a51873f2ce715ebb5228481cbb962ac901edaac Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 9 Aug 2020 23:25:11 +0900 Subject: [PATCH 04/34] more cleanup --- xtide-2.12.1-rcscript-pidfile.patch | 44 ----------------------------- xtide.spec | 4 --- 2 files changed, 48 deletions(-) delete mode 100644 xtide-2.12.1-rcscript-pidfile.patch diff --git a/xtide-2.12.1-rcscript-pidfile.patch b/xtide-2.12.1-rcscript-pidfile.patch deleted file mode 100644 index 8e9d508..0000000 --- a/xtide-2.12.1-rcscript-pidfile.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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 73251f4..e635da8 100644 --- a/xtide.spec +++ b/xtide.spec @@ -29,8 +29,6 @@ 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.xz -# new systemd ( >= 37.4? ) needs pidfile -Patch0: xtide-2.12.1-rcscript-pidfile.patch License: GPLv3+ @@ -143,8 +141,6 @@ grep -rl 'include.*' . | while read f ; do sed -i.name -e 's|\(include.*\)|\1|' $f done -%patch0 -p1 -b .pid - # Embed version sed -i.ver \ -e "\@^PACKAGE_VERSION=@s|'.*'$|'%{version}-%{release}'|" \ From 41379de14d218925d4639332df27b1ba4e5c9e16 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 9 Aug 2020 23:34:44 +0900 Subject: [PATCH 05/34] 2.15.3 --- .gitignore | 1 + sources | 2 +- xtide.spec | 12 +++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5be91d6..2eda20a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /harmonics-dwf-20181227-free.tar.bz2 /xtide-2.15.2.tar.bz2 /harmonics-dwf-20191229-free.tar.xz +/xtide-2.15.3.tar.xz diff --git a/sources b/sources index e2954ab..958fe02 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xtide-2.15.2.tar.bz2) = adfcaeb0f87defb5918d80651b90de47f5afd5cf651fcf12fc1d02d970e8ac3fec613445b91464e72806037cfa9e576b880c8d361d3062f1bc3bc2df58da1ba6 +SHA512 (xtide-2.15.3.tar.xz) = 635d9e0c83b2cf0f158a770d41f9f4df236207306bd4fba8168c3f3148978c80033e49a3a01478c9609f15c280cf790a67f18a0dfd097d197215261eec9b6269 SHA512 (harmonics-dwf-20191229-free.tar.xz) = d0b1bb1ff848f04043e5890f591f0d471661e37b678402d2e84c6f830a8cbb589dcd8bd4b80cfda5b1756a25ee6253684fcedeeaf615e84995d8891c2df5d5bd diff --git a/xtide.spec b/xtide.spec index e635da8..e1d0424 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,8 +1,8 @@ -%define mainver 2.15.2 +%define mainver 2.15.3 #%%define betatag dev-20160114 %define dwfdate 20191229 -%define fedorarel 2 +%define fedorarel 1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -11,10 +11,10 @@ Summary: Calculate tide all over the world Name: xtide Version: %{mainver} -Release: %{rel}%{?dist}.1 +Release: %{rel}%{?dist} URL: http://www.flaterco.com/xtide/ -Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.bz2 +Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.xz Source14: xtide-get_harmonics-data.sh Source20: %{name}.desktop @@ -324,7 +324,6 @@ exit 0 %defattr(-,root,root,-) %doc AUTHORS README README-QUICK -%doc scripts/DOS/.xtide.xml %license COPYING # xtide %{_mandir}/man1/*tide.1* @@ -345,6 +344,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Aug 9 2020 Mamoru TASAKA - 2.15.3-1 +- 2.15.3 + * Fri Aug 07 2020 Mamoru TASAKA - 2.15.2-2.1 - F-33: mass rebuild From adbff7b21226978a8b578c2debe29cb4955050ed Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:41:09 +0000 Subject: [PATCH 06/34] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xtide.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xtide.spec b/xtide.spec index e1d0424..b0400eb 100644 --- a/xtide.spec +++ b/xtide.spec @@ -32,6 +32,7 @@ Source42: ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tar. License: GPLv3+ +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libXaw-devel BuildRequires: libXext-devel From 55d4efc461554fdecf3faa4c7c9bbdbf2a41d5de Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 30 Jan 2021 23:02:03 +0900 Subject: [PATCH 07/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index b0400eb..26ed516 100644 --- a/xtide.spec +++ b/xtide.spec @@ -11,7 +11,7 @@ Summary: Calculate tide all over the world Name: xtide Version: %{mainver} -Release: %{rel}%{?dist} +Release: %{rel}%{?dist}.1 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.xz @@ -345,6 +345,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sat Jan 30 2021 Mamoru TASAKA - 2.15.3-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Aug 9 2020 Mamoru TASAKA - 2.15.3-1 - 2.15.3 From bd34a7e623378733a4ed47f4cc554a26f04203e6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 2 Mar 2021 08:33:54 +1000 Subject: [PATCH 08/34] Require xorg-x11-fonts-misc instead of -base. -base hasn't existed for over a decade. --- xtide.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xtide.spec b/xtide.spec index 26ed516..89a1385 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20191229 -%define fedorarel 1 +%define fedorarel 2 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -53,7 +53,7 @@ BuildRequires: byacc BuildRequires: flex Requires: wvs-data -Requires: xorg-x11-fonts-base +Requires: xorg-x11-fonts-misc Requires: xtide-common = %{version}-%{release} Requires: libxtide%{?_isa} = %{version}-%{release} @@ -345,6 +345,10 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Mar 02 2021 Peter Hutterer - 2.15.3-2.1 +- Require xorg-x11-fonts-misc instead of -base. -base hasn't existed for + over a decade. + * Sat Jan 30 2021 Mamoru TASAKA - 2.15.3-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From c4b81d49a1fb81a27f07ad95eae6c5a736428bb4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 25 Jul 2021 11:06:01 +0900 Subject: [PATCH 09/34] Rebuild for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 89a1385..efdbfaa 100644 --- a/xtide.spec +++ b/xtide.spec @@ -11,7 +11,7 @@ Summary: Calculate tide all over the world Name: xtide Version: %{mainver} -Release: %{rel}%{?dist}.1 +Release: %{rel}%{?dist}.2 URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.xz @@ -345,6 +345,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Jul 25 2021 Mamoru TASAKA - 2.15.3-2.2 +- Rebuild for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Peter Hutterer - 2.15.3-2.1 - Require xorg-x11-fonts-misc instead of -base. -base hasn't existed for over a decade. From 9bd7ea76b3c95955348e834fdcb0a384dbbe458d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 6 Feb 2022 15:04:09 +0900 Subject: [PATCH 10/34] harmonics data update (20220109) --- .gitignore | 21 ++------------------- sources | 2 +- xtide.spec | 15 +++++++++------ 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 2eda20a..7fe1255 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,2 @@ -/harmonics-dwf-20131228-free.tar.bz2 -/xtide-2.14-dev-20140504.tar.bz2 -/xtide-2.14-dev-20140622.tar.bz2 -/xtide-2.14-dev-20141014.tar.bz2 -/xtide-2.14.tar.bz2 -/harmonics-dwf-20141224-free.tar.bz2 -/harmonics-dwf-20151227-free.tar.bz2 -/systemd-patch.tar.gz -/configure.ac.temp.tar.gz -/xtide-2.15-dev-20160105.tar.bz2 -/xtide-2.15-dev-20160114.tar.bz2 -/xtide-2.15.tar.bz2 -/xtide-2.15.1.tar.bz2 -/harmonics-dwf-20161231-free.tar.bz2 -/harmonics-dwf-20180101-free.tar.bz2 -/harmonics-dwf-20181227-free.tar.bz2 -/xtide-2.15.2.tar.bz2 -/harmonics-dwf-20191229-free.tar.xz -/xtide-2.15.3.tar.xz +/xtide-*.tar.xz +/harmonics-dwf-*.tar.xz diff --git a/sources b/sources index 958fe02..1b97274 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (xtide-2.15.3.tar.xz) = 635d9e0c83b2cf0f158a770d41f9f4df236207306bd4fba8168c3f3148978c80033e49a3a01478c9609f15c280cf790a67f18a0dfd097d197215261eec9b6269 -SHA512 (harmonics-dwf-20191229-free.tar.xz) = d0b1bb1ff848f04043e5890f591f0d471661e37b678402d2e84c6f830a8cbb589dcd8bd4b80cfda5b1756a25ee6253684fcedeeaf615e84995d8891c2df5d5bd +SHA512 (harmonics-dwf-20220109-free.tar.xz) = 6f5747dfba06add4cdb7db7d20c113c44914aa7698c10f85050c4da7197b6fe7d11a774676e6301ec91641a7e2bb70587c7b857b436b3dac16dde8862d42e65a diff --git a/xtide.spec b/xtide.spec index efdbfaa..3d2c04f 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,8 +1,8 @@ %define mainver 2.15.3 #%%define betatag dev-20160114 -%define dwfdate 20191229 +%define dwfdate 20220109 -%define fedorarel 2 +%define fedorarel 3 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -11,10 +11,10 @@ Summary: Calculate tide all over the world Name: xtide Version: %{mainver} -Release: %{rel}%{?dist}.2 +Release: %{rel}%{?dist} URL: http://www.flaterco.com/xtide/ -Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.xz +Source0: https://flaterco.com/files/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.xz Source14: xtide-get_harmonics-data.sh Source20: %{name}.desktop @@ -28,11 +28,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.xz +Source42: https://flaterco.com/files/xtide/harmonics-dwf-%{dwfdate}-free.tar.xz License: GPLv3+ -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libXaw-devel BuildRequires: libXext-devel @@ -345,6 +345,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Feb 6 2022 Mamoru TASAKA - 2.15.3-3 +- harmonics data update (20220109) + * Sun Jul 25 2021 Mamoru TASAKA - 2.15.3-2.2 - Rebuild for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 966717edc5f5826ad30c369cb15ffd555474820e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 6 Feb 2022 16:32:53 +0900 Subject: [PATCH 11/34] Patch for libXaw 1.0.14 XawListChange API change --- xtide-2.15.3-XawListChange-api-change-1_0_14.patch | 11 +++++++++++ xtide.spec | 14 +++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 xtide-2.15.3-XawListChange-api-change-1_0_14.patch diff --git a/xtide-2.15.3-XawListChange-api-change-1_0_14.patch b/xtide-2.15.3-XawListChange-api-change-1_0_14.patch new file mode 100644 index 0000000..8614675 --- /dev/null +++ b/xtide-2.15.3-XawListChange-api-change-1_0_14.patch @@ -0,0 +1,11 @@ +--- xtide-2.15.3/xxLocationList.cc.fpermissive 2014-10-12 04:42:10.000000000 +0900 ++++ xtide-2.15.3/xxLocationList.cc 2022-02-06 16:12:05.382487553 +0900 +@@ -87,7 +87,7 @@ void xxLocationList::pickStation (const + + + void xxLocationList::listChanged() { +- XawListChange (list->widget(), stringList, 0, 0, 1); ++ XawListChange (list->widget(), (_Xconst char**)stringList, 0, 0, 1); + } + + diff --git a/xtide.spec b/xtide.spec index 3d2c04f..587ce5b 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20220109 -%define fedorarel 3 +%define fedorarel 4 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -29,6 +29,9 @@ Source30: xtide-README.fedora #Source40: Harminics-USpart-recreate-sh.tar.bz2 #Source41: harmonics-dwf-%{dwfdate}-dump-US.tar.bz2 Source42: https://flaterco.com/files/xtide/harmonics-dwf-%{dwfdate}-free.tar.xz +# libXaw 1.0.14 changes constness for XawListChange +# xxLocationList.cc:90:34: error: invalid conversion from 'char**' to 'const char**' [-fpermissive] +Patch1: xtide-2.15.3-XawListChange-api-change-1_0_14.patch License: GPLv3+ @@ -51,6 +54,8 @@ BuildRequires: libtool # By SOURCE3 BuildRequires: byacc BuildRequires: flex +# Explicit for %%PATCH1 +BuildRequires: %{_bindir}/pkg-config Requires: wvs-data Requires: xorg-x11-fonts-misc @@ -123,6 +128,10 @@ Please read README.fedora for Fedora specific issue. %setup -q -n %{name}-%{version}%{?betatag:-%{betatag}} -a 42 %endif +if pkg-config --atleast-version 1.0.14 xaw7 ; then +%patch1 -p1 -b .x_api +fi + # Systemd stuff sed -i scripts/systemd/xttpd.socket \ -e 's|ListenStream=80|ListenStream=8080|' @@ -345,6 +354,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Feb 6 2022 Mamoru TASAKA - 2.15.3-4 +- Patch for libXaw 1.0.14 XawListChange API change + * Sun Feb 6 2022 Mamoru TASAKA - 2.15.3-3 - harmonics data update (20220109) From 0bd675313ec67bfe51ce25473a57db66ec8b7771 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 6 Feb 2022 16:51:30 +0900 Subject: [PATCH 12/34] remove left-over noautobuild --- noautobuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 noautobuild diff --git a/noautobuild b/noautobuild deleted file mode 100644 index c6262a9..0000000 --- a/noautobuild +++ /dev/null @@ -1 +0,0 @@ -Will rebuild with small fix From 20a7b9c74b5f81d8f297bb1fffeea26c1c181f5b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 15 Feb 2022 16:17:03 +0900 Subject: [PATCH 13/34] 2.15.4 --- sources | 2 +- ...15.3-XawListChange-api-change-1_0_14.patch | 11 --------- xtide.spec | 24 +++++++------------ 3 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 xtide-2.15.3-XawListChange-api-change-1_0_14.patch diff --git a/sources b/sources index 1b97274..3dcec0b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xtide-2.15.3.tar.xz) = 635d9e0c83b2cf0f158a770d41f9f4df236207306bd4fba8168c3f3148978c80033e49a3a01478c9609f15c280cf790a67f18a0dfd097d197215261eec9b6269 +SHA512 (xtide-2.15.4.tar.xz) = bb308bccacd34ddc39735243d0b1075ceb43dfc2af3d729970cd9efee07af51f1ca08d959b8bee5c595daa96241e9a2b1e9555d2f240897c7d3ca2fc4f824129 SHA512 (harmonics-dwf-20220109-free.tar.xz) = 6f5747dfba06add4cdb7db7d20c113c44914aa7698c10f85050c4da7197b6fe7d11a774676e6301ec91641a7e2bb70587c7b857b436b3dac16dde8862d42e65a diff --git a/xtide-2.15.3-XawListChange-api-change-1_0_14.patch b/xtide-2.15.3-XawListChange-api-change-1_0_14.patch deleted file mode 100644 index 8614675..0000000 --- a/xtide-2.15.3-XawListChange-api-change-1_0_14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xtide-2.15.3/xxLocationList.cc.fpermissive 2014-10-12 04:42:10.000000000 +0900 -+++ xtide-2.15.3/xxLocationList.cc 2022-02-06 16:12:05.382487553 +0900 -@@ -87,7 +87,7 @@ void xxLocationList::pickStation (const - - - void xxLocationList::listChanged() { -- XawListChange (list->widget(), stringList, 0, 0, 1); -+ XawListChange (list->widget(), (_Xconst char**)stringList, 0, 0, 1); - } - - diff --git a/xtide.spec b/xtide.spec index 587ce5b..73d24f9 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,8 +1,8 @@ -%define mainver 2.15.3 +%define mainver 2.15.4 #%%define betatag dev-20160114 %define dwfdate 20220109 -%define fedorarel 4 +%define fedorarel 1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -27,11 +27,8 @@ Source30: xtide-README.fedora # Upstream now splitted free and non-free harmonics data # #Source40: Harminics-USpart-recreate-sh.tar.bz2 -#Source41: harmonics-dwf-%{dwfdate}-dump-US.tar.bz2 +#Source41: harmonics-dwf-%%{dwfdate}-dump-US.tar.bz2 Source42: https://flaterco.com/files/xtide/harmonics-dwf-%{dwfdate}-free.tar.xz -# libXaw 1.0.14 changes constness for XawListChange -# xxLocationList.cc:90:34: error: invalid conversion from 'char**' to 'const char**' [-fpermissive] -Patch1: xtide-2.15.3-XawListChange-api-change-1_0_14.patch License: GPLv3+ @@ -128,17 +125,13 @@ Please read README.fedora for Fedora specific issue. %setup -q -n %{name}-%{version}%{?betatag:-%{betatag}} -a 42 %endif -if pkg-config --atleast-version 1.0.14 xaw7 ; then -%patch1 -p1 -b .x_api -fi - # Systemd stuff sed -i scripts/systemd/xttpd.socket \ -e 's|ListenStream=80|ListenStream=8080|' cat > scripts/systemd/xttpd.service.conf < - 2.15.4-1 +- 2.15.4 + * Sun Feb 6 2022 Mamoru TASAKA - 2.15.3-4 - Patch for libXaw 1.0.14 XawListChange API change From cd9438ff94a0dc6035fb8b86b408217120335cfe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 6 May 2022 00:22:54 +0900 Subject: [PATCH 14/34] Modify configure.ac to detect gpsd API version >=7 (version 3.18) --- xtide-2.15.4-gpsd7.patch | 37 +++++++++++++++++++++++++++++++++++++ xtide.spec | 13 +++++++++---- 2 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 xtide-2.15.4-gpsd7.patch diff --git a/xtide-2.15.4-gpsd7.patch b/xtide-2.15.4-gpsd7.patch new file mode 100644 index 0000000..aee761a --- /dev/null +++ b/xtide-2.15.4-gpsd7.patch @@ -0,0 +1,37 @@ +--- xtide-2.15.4.oldgps/configure.ac 2022-02-12 05:45:25.000000000 +0900 ++++ xtide-2.15.4/configure.ac 2022-05-05 23:27:20.324043017 +0900 +@@ -471,19 +471,19 @@ AC_CHECK_HEADER([Dstr], [AC_CHECK_LIB([d + AM_CONDITIONAL(NO_LIBDSTR, test "$ac_cv_lib_dstr_DstrCompat20070215Check" != "yes") + + # libgps is optional; use it if you have a compatible version. +-AC_CHECK_HEADER([gps.h], [AC_CHECK_LIB([gps], [timestamp], [ +- AC_MSG_CHECKING([if libgps is 3.x or newer, compatible version]) ++AC_CHECK_HEADER([gps.h], [AC_CHECK_LIB([gps], [gps_open], [ ++ AC_MSG_CHECKING([if libgps is 3.18 or newer, compatible version]) + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[ + #include +-#if (GPSD_API_MAJOR_VERSION < 5) ++#if (GPSD_API_MAJOR_VERSION < 7) + #FAIL + #endif + int main (int argc, char **argv) { + struct gps_data_t gpsdata; + gps_open ("127.0.0.1", "2947", &gpsdata); + gps_stream (&gpsdata, WATCH_ENABLE|WATCH_NEWSTYLE, NULL); +- gps_read (&gpsdata); ++ gps_read (&gpsdata, NULL, 0); + return (gpsdata.fix.mode >= MODE_2D); + } + ]])], +--- xtide-2.15.4.oldgps/xxGlobal.cc 2014-10-12 04:42:10.000000000 +0900 ++++ xtide-2.15.4/xxGlobal.cc 2022-05-05 23:25:58.866053595 +0900 +@@ -66,7 +66,7 @@ void PositioningSystem (Coordinates &cur + // gps_clear_fix (&gpsdata->fix); + time_t before (time(NULL)); + while (time(NULL) < before+2) { +- if (gps_read (&gpsdata) < 0) { ++ if (gps_read (&gpsdata, nullptr, 0) < 0) { + fprintf (stderr, "Warning: gps_read failed; giving up on GPS\n"); + gps_close (&gpsdata); + gps_on = false; diff --git a/xtide.spec b/xtide.spec index 73d24f9..1b93dce 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20220109 -%define fedorarel 1 +%define fedorarel 2 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -29,6 +29,8 @@ Source30: xtide-README.fedora #Source40: Harminics-USpart-recreate-sh.tar.bz2 #Source41: harmonics-dwf-%%{dwfdate}-dump-US.tar.bz2 Source42: https://flaterco.com/files/xtide/harmonics-dwf-%{dwfdate}-free.tar.xz +# Handle gpsd API version 7 (version 3.18) +Patch0: xtide-2.15.4-gpsd7.patch License: GPLv3+ @@ -137,6 +139,9 @@ EOF sed -i scripts/systemd/xttpd.service.in \ -e 's|^EnvironmentFile=.*$|EnvironmentFile=-%{_sysconfdir}/sysconfig/xttpd.service.conf|' +# handle gpsd soversion 7 +%patch0 -p1 -b .gpsd7 + autoreconf -i # Dstr -> Dstr.h @@ -151,9 +156,6 @@ sed -i.ver \ -e "\@^[ \t]*VERSION=@s|'.*'$|'%{version}-%{release}'|" \ configure -# Check if GCC bug 43905 for 4.5.x branch is fixed -sed -i.ipa_sra -e '/ipa-sra/d' configure - # Kill rpath, ah! sed -i.rpath configure \ -e 's|hardcode_libdir_flag_spec=|kill_hardcode_libdir_flag_spec=|' \ @@ -343,6 +345,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Thu May 5 2022 Mamoru TASAKA - 2.15.4-2 +- Modify configure.ac to detect gpsd API version >=7 (version 3.18) + * Tue Feb 15 2022 Mamoru TASAKA - 2.15.4-1 - 2.15.4 From f4e085582e8e2ad5aaf5e35871921502b035a3a9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 12 May 2022 15:45:37 +0900 Subject: [PATCH 15/34] 2.15.5 --- sources | 2 +- xtide.spec | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sources b/sources index 3dcec0b..9ccbad2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xtide-2.15.4.tar.xz) = bb308bccacd34ddc39735243d0b1075ceb43dfc2af3d729970cd9efee07af51f1ca08d959b8bee5c595daa96241e9a2b1e9555d2f240897c7d3ca2fc4f824129 +SHA512 (xtide-2.15.5.tar.xz) = 314c3d256a873ae5862e83050937c72983e5ac0bc9dc2c1a9264d0285f73f681eae1451706c5c6c2829d980423044e83adff3fcf8975b33eb03eed8cb72f1f43 SHA512 (harmonics-dwf-20220109-free.tar.xz) = 6f5747dfba06add4cdb7db7d20c113c44914aa7698c10f85050c4da7197b6fe7d11a774676e6301ec91641a7e2bb70587c7b857b436b3dac16dde8862d42e65a diff --git a/xtide.spec b/xtide.spec index 1b93dce..2648ea9 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,8 +1,8 @@ -%define mainver 2.15.4 +%define mainver 2.15.5 #%%define betatag dev-20160114 %define dwfdate 20220109 -%define fedorarel 2 +%define fedorarel 1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -29,8 +29,6 @@ Source30: xtide-README.fedora #Source40: Harminics-USpart-recreate-sh.tar.bz2 #Source41: harmonics-dwf-%%{dwfdate}-dump-US.tar.bz2 Source42: https://flaterco.com/files/xtide/harmonics-dwf-%{dwfdate}-free.tar.xz -# Handle gpsd API version 7 (version 3.18) -Patch0: xtide-2.15.4-gpsd7.patch License: GPLv3+ @@ -139,9 +137,6 @@ EOF sed -i scripts/systemd/xttpd.service.in \ -e 's|^EnvironmentFile=.*$|EnvironmentFile=-%{_sysconfdir}/sysconfig/xttpd.service.conf|' -# handle gpsd soversion 7 -%patch0 -p1 -b .gpsd7 - autoreconf -i # Dstr -> Dstr.h @@ -345,6 +340,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Thu May 12 2022 Mamoru TASAKA - 2.15.5-1 +- 2.15.5 + * Thu May 5 2022 Mamoru TASAKA - 2.15.4-2 - Modify configure.ac to detect gpsd API version >=7 (version 3.18) From 9da3eb607f973a7fdfd2e124d8c70fbec79b07c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:36:35 +0000 Subject: [PATCH 16/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 2648ea9..2170b9e 100644 --- a/xtide.spec +++ b/xtide.spec @@ -11,7 +11,7 @@ Summary: Calculate tide all over the world Name: xtide Version: %{mainver} -Release: %{rel}%{?dist} +Release: %{rel}%{?dist}.1 URL: http://www.flaterco.com/xtide/ Source0: https://flaterco.com/files/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.xz @@ -340,6 +340,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.15.5-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu May 12 2022 Mamoru TASAKA - 2.15.5-1 - 2.15.5 From 359fc3fc0ae461b9374788b2e2eddd1a752b05e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:56:32 +0000 Subject: [PATCH 17/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 2170b9e..5f32d5d 100644 --- a/xtide.spec +++ b/xtide.spec @@ -11,7 +11,7 @@ Summary: Calculate tide all over the world Name: xtide Version: %{mainver} -Release: %{rel}%{?dist}.1 +Release: %{rel}%{?dist}.2 URL: http://www.flaterco.com/xtide/ Source0: https://flaterco.com/files/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.xz @@ -340,6 +340,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.15.5-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.15.5-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 985586b6ffaee569184b7038ad2a9df4faf618a8 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 23 Jan 2023 18:22:33 -0800 Subject: [PATCH 18/34] rebuild for new libgps --- xtide.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xtide.spec b/xtide.spec index 5f32d5d..9676bc4 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20220109 -%define fedorarel 1 +%define fedorarel 2 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -11,7 +11,7 @@ Summary: Calculate tide all over the world Name: xtide Version: %{mainver} -Release: %{rel}%{?dist}.2 +Release: %{rel}%{?dist} URL: http://www.flaterco.com/xtide/ Source0: https://flaterco.com/files/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.xz @@ -340,6 +340,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Jan 24 2023 Adam Williamson - 2.15.5-2 +- rebuild for new libgps + * Sat Jan 21 2023 Fedora Release Engineering - 2.15.5-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d298a77255643765bfa15a6e9e762f2009c54ac5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:46:36 +0900 Subject: [PATCH 19/34] rename release macro to make rpmdev-bumprelease work --- xtide.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xtide.spec b/xtide.spec index 9676bc4..5321327 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,10 +2,10 @@ #%%define betatag dev-20160114 %define dwfdate 20220109 -%define fedorarel 2 +%define baserelease 2 -%define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} +%define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} Summary: Calculate tide all over the world From d3b8b392abfdaad29872b0bdb513b28161b249dd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 23 Jul 2023 00:28:31 +0900 Subject: [PATCH 20/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 5321327..ad25de6 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20220109 -%define baserelease 2 +%define baserelease 3 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -340,6 +340,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sat Jul 22 2023 Mamoru TASAKA - 2.15.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jan 24 2023 Adam Williamson - 2.15.5-2 - rebuild for new libgps From 467df0b2e0600712849d940cc01366c9e452d2ec Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 Jan 2024 17:49:04 +0900 Subject: [PATCH 21/34] harmonics data update (20240104) --- sources | 2 +- xtide.spec | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 9ccbad2..2285c8a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (xtide-2.15.5.tar.xz) = 314c3d256a873ae5862e83050937c72983e5ac0bc9dc2c1a9264d0285f73f681eae1451706c5c6c2829d980423044e83adff3fcf8975b33eb03eed8cb72f1f43 -SHA512 (harmonics-dwf-20220109-free.tar.xz) = 6f5747dfba06add4cdb7db7d20c113c44914aa7698c10f85050c4da7197b6fe7d11a774676e6301ec91641a7e2bb70587c7b857b436b3dac16dde8862d42e65a +SHA512 (harmonics-dwf-20240104-free.tar.xz) = 85f0b2cd49ebea18e96523a9df3eac0025bbfea0546ab43ca36cc6535ab786d51cd2d4693a95145770fb72ad2a4f39a850d5455e0e6bfd21649eaba5868683c0 diff --git a/xtide.spec b/xtide.spec index ad25de6..4f27084 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,8 +1,8 @@ %define mainver 2.15.5 #%%define betatag dev-20160114 -%define dwfdate 20220109 +%define dwfdate 20240104 -%define baserelease 3 +%define baserelease 4 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -224,9 +224,6 @@ echo "%{_datadir}/wvs-data/" >> %{name}.conf # 1C Add desktop entry (xtide) %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install \ -%if 0%{?fedora} < 19 - --vendor fedora \ -%endif --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE20} @@ -340,6 +337,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sat Jan 6 2024 Mamoru TASAKA - 2.15.5-4 +- harmonics data update (20240104) + * Sat Jul 22 2023 Mamoru TASAKA - 2.15.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 5c21473a61af7121ebb6517ab7a96aa39334007d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:26:38 +0000 Subject: [PATCH 22/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 4f27084..d1cbaa6 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20240104 -%define baserelease 4 +%define baserelease 5 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -337,6 +337,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.15.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 6 2024 Mamoru TASAKA - 2.15.5-4 - harmonics data update (20240104) From 68455dc81c868b9c2ab4147fb3a42cc7f41f16c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:32:34 +0000 Subject: [PATCH 23/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index d1cbaa6..5fd50ed 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20240104 -%define baserelease 5 +%define baserelease 6 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -337,6 +337,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.15.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.15.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 601c59e710c7d6cef67eca57dd1956f1677c7193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 13:34:18 +0200 Subject: [PATCH 24/34] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xtide.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xtide.spec b/xtide.spec index 5fd50ed..ff2d37b 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20240104 -%define baserelease 6 +%define baserelease 7 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -30,7 +30,8 @@ Source30: xtide-README.fedora #Source41: harmonics-dwf-%%{dwfdate}-dump-US.tar.bz2 Source42: https://flaterco.com/files/xtide/harmonics-dwf-%{dwfdate}-free.tar.xz -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later BuildRequires: make BuildRequires: gcc-c++ @@ -66,11 +67,13 @@ Requires(post): systemd %package -n libxtide Summary: XTide library -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later %package -n libxtide-devel Summary: Development files for libxtide -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later Requires: libxtide%{?_isa} = %{version}-%{release} @@ -337,6 +340,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Thu Jul 25 2024 Miroslav Suchý - 2.15.5-7 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.15.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 272b32ab750d8d7db2e4038c111d864d250a4027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 19 Sep 2024 05:31:16 +0000 Subject: [PATCH 25/34] Migrate to SPDX license (temporary ids) This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 Note that this is an SPDX identifier, but it still needs to be migrated to the proper identifiers in the fedora-license-data set. Please follow https://docs.fedoraproject.org/en-US/legal/update-existing-packages/#_public_domain If there will be no comments in two weeks, I will merge this. --- xtide.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index ff2d37b..398b952 100644 --- a/xtide.spec +++ b/xtide.spec @@ -79,7 +79,8 @@ Requires: libxtide%{?_isa} = %{version}-%{release} %package common Summary: Xtide common files -License: Public Domain +# Automatically converted from old format: Public Domain - needs further work +License: LicenseRef-Callaway-Public-Domain Requires: bzip2 Requires: wget BuildArch: noarch From 57055bbdc7de3023da08056e40e03ae21faa2467 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Dec 2024 16:27:24 +0900 Subject: [PATCH 26/34] Update harmonics data to 20241229 --- sources | 2 +- xtide.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 2285c8a..87e6702 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (xtide-2.15.5.tar.xz) = 314c3d256a873ae5862e83050937c72983e5ac0bc9dc2c1a9264d0285f73f681eae1451706c5c6c2829d980423044e83adff3fcf8975b33eb03eed8cb72f1f43 -SHA512 (harmonics-dwf-20240104-free.tar.xz) = 85f0b2cd49ebea18e96523a9df3eac0025bbfea0546ab43ca36cc6535ab786d51cd2d4693a95145770fb72ad2a4f39a850d5455e0e6bfd21649eaba5868683c0 +SHA512 (harmonics-dwf-20241229-free.tar.xz) = f3e9a45a68faf3c56ef511b33625cf6022c9728809e6096449c93623ccd5c564a5705e836f16c227dd56b2671f39f124f027b031902ce2e688ee71639e93f5a9 diff --git a/xtide.spec b/xtide.spec index 398b952..f494d78 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,8 +1,8 @@ %define mainver 2.15.5 #%%define betatag dev-20160114 -%define dwfdate 20240104 +%define dwfdate 20241229 -%define baserelease 7 +%define baserelease 8 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -341,6 +341,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Mon Dec 30 2024 Mamoru TASAKA - 2.15.5-8 +- Update harmonics data to 20241229 + * Thu Jul 25 2024 Miroslav Suchý - 2.15.5-7 - convert license to SPDX From 0705b8db89e1def8eb25d78c5ebf2aab3bb3dec8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:23:19 +0000 Subject: [PATCH 27/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index f494d78..767881d 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20241229 -%define baserelease 8 +%define baserelease 9 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -341,6 +341,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.15.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Dec 30 2024 Mamoru TASAKA - 2.15.5-8 - Update harmonics data to 20241229 From 368006ef0c59420928bd3cb1f150a917eb7ff3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:14 +0100 Subject: [PATCH 28/34] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- xtide.spec | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/xtide.spec b/xtide.spec index 767881d..f632752 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20241229 -%define baserelease 9 +%define baserelease 10 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -60,7 +60,6 @@ Requires: xorg-x11-fonts-misc Requires: xtide-common = %{version}-%{release} Requires: libxtide%{?_isa} = %{version}-%{release} -Requires(pre): shadow-utils Requires(preun): systemd Requires(postun): systemd Requires(post): systemd @@ -164,6 +163,11 @@ sed -i.rpath ltmain.sh \ -e 's|\$finalize_rpath|\$finalize_no_rpath|' \ %{nil} +# Create a sysusers.d config file +cat >xtide.sysusers.conf </dev/null || \ - %{_sbindir}/groupadd -r xttpd -getent passwd xttpd &> /dev/null || \ - %{_sbindir}/useradd \ - -c "XTide web server" \ - -g xttpd \ - -d %{_sysconfdir}/%{name} \ - -r \ - -s /sbin/nologin \ - xttpd 2>/dev/null -exit 0 %preun %systemd_preun xttpd.socket xttpd.service @@ -339,8 +333,12 @@ exit 0 %{_sbindir}/xttpd %{_datadir}/man/man8/xttpd.8* +%{_sysusersdir}/xtide.conf %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.15.5-10 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 2.15.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8387637fa018107931635b81a3eefd2d88c0aa91 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Feb 2025 23:25:30 +0900 Subject: [PATCH 29/34] Only apply Systemd Sysusers.d usage for F-42+ --- xtide.spec | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/xtide.spec b/xtide.spec index f632752..62fd99b 100644 --- a/xtide.spec +++ b/xtide.spec @@ -7,6 +7,12 @@ %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} +%if 0%{?fedora} >= 42 +%global use_systemd_sysusers 1 +%else +# Drop this when F41 gets EOF +%global use_systemd_sysusers 0 +%endif Summary: Calculate tide all over the world Name: xtide @@ -60,6 +66,9 @@ Requires: xorg-x11-fonts-misc Requires: xtide-common = %{version}-%{release} Requires: libxtide%{?_isa} = %{version}-%{release} +%if ! %{use_systemd_sysusers} +Requires(pre): shadow-utils +%endif Requires(preun): systemd Requires(postun): systemd Requires(post): systemd @@ -163,10 +172,12 @@ sed -i.rpath ltmain.sh \ -e 's|\$finalize_rpath|\$finalize_no_rpath|' \ %{nil} +%if %{use_systemd_sysusers} # Create a sysusers.d config file cat >xtide.sysusers.conf </dev/null || \ + %{_sbindir}/groupadd -r xttpd +getent passwd xttpd &> /dev/null || \ + %{_sbindir}/useradd \ + -c "XTide web server" \ + -g xttpd \ + -d %{_sysconfdir}/%{name} \ + -r \ + -s /sbin/nologin \ + xttpd 2>/dev/null +%endif +exit 0 %preun %systemd_preun xttpd.socket xttpd.service @@ -333,9 +360,14 @@ exit 0 %{_sbindir}/xttpd %{_datadir}/man/man8/xttpd.8* +%if %{use_systemd_sysusers} %{_sysusersdir}/xtide.conf +%endif %changelog +* Thu Feb 13 2025 Mamoru TASAKA - 2.15.5-10 +- Only apply Systemd Sysusers.d usage for F-42+ + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.15.5-10 - Add sysusers.d config file to allow rpm to create users/groups automatically From 95f3fb6df538bd42b8a9bd7a38220b73be870230 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 27 May 2025 16:17:42 +0200 Subject: [PATCH 30/34] rebuild for new gpsd --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 62fd99b..c67d56c 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20241229 -%define baserelease 10 +%define baserelease 11 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -365,6 +365,9 @@ exit 0 %endif %changelog +* Tue May 27 2025 Remi Collet - 2.15.5-11 +- rebuild for new gpsd + * Thu Feb 13 2025 Mamoru TASAKA - 2.15.5-10 - Only apply Systemd Sysusers.d usage for F-42+ From 7b5c95bcaea61c0c6a6763cdde53445a87d1baaa Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 29 Jun 2025 22:23:18 +0900 Subject: [PATCH 31/34] 2.15.6 --- sources | 2 +- xtide.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 87e6702..7d2aca8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xtide-2.15.5.tar.xz) = 314c3d256a873ae5862e83050937c72983e5ac0bc9dc2c1a9264d0285f73f681eae1451706c5c6c2829d980423044e83adff3fcf8975b33eb03eed8cb72f1f43 +SHA512 (xtide-2.15.6.tar.xz) = cd24908a9f4541ab2b19444dba54aab92310e49d2ba0321d9bbcde9806d7cc975828cc5f22fe0a1a73cebf96f4ad1ccd1530c016e8b22f7d54675aeff9528c82 SHA512 (harmonics-dwf-20241229-free.tar.xz) = f3e9a45a68faf3c56ef511b33625cf6022c9728809e6096449c93623ccd5c564a5705e836f16c227dd56b2671f39f124f027b031902ce2e688ee71639e93f5a9 diff --git a/xtide.spec b/xtide.spec index c67d56c..735e0f3 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,8 +1,8 @@ -%define mainver 2.15.5 +%define mainver 2.15.6 #%%define betatag dev-20160114 %define dwfdate 20241229 -%define baserelease 11 +%define baserelease 1 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -365,6 +365,9 @@ exit 0 %endif %changelog +* Sun Jun 29 2025 Mamoru TASAKA - 2.15.6-1 +- 2.15.6 + * Tue May 27 2025 Remi Collet - 2.15.5-11 - rebuild for new gpsd From dfc6e182497c0e288dae3286e370cfa5fb4916f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:07:11 +0000 Subject: [PATCH 32/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 735e0f3..99535d7 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20241229 -%define baserelease 1 +%define baserelease 2 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -365,6 +365,9 @@ exit 0 %endif %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.15.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jun 29 2025 Mamoru TASAKA - 2.15.6-1 - 2.15.6 From 4d66ffc616493c8a217e41ac593f9ece5103fbad Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 29 Dec 2025 16:04:09 +0900 Subject: [PATCH 33/34] Update harmonics data to 20251228 --- sources | 2 +- xtide.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 7d2aca8..820be91 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (xtide-2.15.6.tar.xz) = cd24908a9f4541ab2b19444dba54aab92310e49d2ba0321d9bbcde9806d7cc975828cc5f22fe0a1a73cebf96f4ad1ccd1530c016e8b22f7d54675aeff9528c82 -SHA512 (harmonics-dwf-20241229-free.tar.xz) = f3e9a45a68faf3c56ef511b33625cf6022c9728809e6096449c93623ccd5c564a5705e836f16c227dd56b2671f39f124f027b031902ce2e688ee71639e93f5a9 +SHA512 (harmonics-dwf-20251228-free.tar.xz) = d7710c2f0fcaf32ca8e017f073912db5e4d344dbc1710c2709766232d0c77d08b4cec65418f9c7196bb792271f0136a8a9fb59de021e8d4c0ad66c2c558ae87b diff --git a/xtide.spec b/xtide.spec index 99535d7..642bbf9 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,8 +1,8 @@ %define mainver 2.15.6 #%%define betatag dev-20160114 -%define dwfdate 20241229 +%define dwfdate 20251228 -%define baserelease 2 +%define baserelease 3 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -365,6 +365,9 @@ exit 0 %endif %changelog +* Mon Dec 29 2025 Mamoru TASAKA - 2.15.6-3 +- Update harmonics data to 20251228 + * Fri Jul 25 2025 Fedora Release Engineering - 2.15.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 64478c099981ca6eea554254ed6804d87de9199c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 14 Jan 2026 11:47:55 +0100 Subject: [PATCH 34/34] Rebuild for new gpsd --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 642bbf9..41061d0 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,7 +2,7 @@ #%%define betatag dev-20160114 %define dwfdate 20251228 -%define baserelease 3 +%define baserelease 4 %define rel %{?betatag:0.}%{baserelease}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -365,6 +365,9 @@ exit 0 %endif %changelog +* Wed Jan 14 2026 Jitka Plesnikova - 2.15.6-4 +- Rebuild for new gpsd + * Mon Dec 29 2025 Mamoru TASAKA - 2.15.6-3 - Update harmonics data to 20251228