Rebuild for new gpsd

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.

.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

noautobuild

@@ -1 +0,0 @@
-Will rebuild with small fix

sources

@@ -1,2 +1,2 @@
-SHA512 (xtide-2.15.3.tar.xz) = 635d9e0c83b2cf0f158a770d41f9f4df236207306bd4fba8168c3f3148978c80033e49a3a01478c9609f15c280cf790a67f18a0dfd097d197215261eec9b6269
-SHA512 (harmonics-dwf-20191229-free.tar.xz) = d0b1bb1ff848f04043e5890f591f0d471661e37b678402d2e84c6f830a8cbb589dcd8bd4b80cfda5b1756a25ee6253684fcedeeaf615e84995d8891c2df5d5bd
+SHA512 (xtide-2.15.6.tar.xz) = cd24908a9f4541ab2b19444dba54aab92310e49d2ba0321d9bbcde9806d7cc975828cc5f22fe0a1a73cebf96f4ad1ccd1530c016e8b22f7d54675aeff9528c82
+SHA512 (harmonics-dwf-20251228-free.tar.xz) = d7710c2f0fcaf32ca8e017f073912db5e4d344dbc1710c2709766232d0c77d08b4cec65418f9c7196bb792271f0136a8a9fb59de021e8d4c0ad66c2c558ae87b

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 <gps.h>
+-#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;

xtide.spec

@@ -1,12 +1,18 @@
-%define          mainver   2.15.3
+%define          mainver   2.15.6
 #%%define          betatag   dev-20160114
-%define          dwfdate   20191229
+%define          dwfdate   20251228
 
-%define          fedorarel 1
+%define          baserelease 4
 
 
-%define          rel        %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')}
+%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
@@ -14,7 +20,7 @@ Version:         %{mainver}
 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
@@ -27,11 +33,13 @@ 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
-Source42:        ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tar.xz
+#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++
 BuildRequires:   libXaw-devel
 BuildRequires:   libXext-devel
@@ -50,30 +58,37 @@ BuildRequires:   libtool
 # By SOURCE3
 BuildRequires:   byacc
 BuildRequires:   flex
+# Explicit for %%PATCH1
+BuildRequires:   %{_bindir}/pkg-config
 
 Requires:        wvs-data
-Requires:        xorg-x11-fonts-base
+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
 
 %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}
 
 
 %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
@@ -128,7 +143,7 @@ sed -i scripts/systemd/xttpd.socket \
 
 cat > scripts/systemd/xttpd.service.conf <<EOF
 HFILE_PATH=%{_datadir}/%{name}-harmonics
-XTTPD_FEEDBACK=xtide-owner@fedoraproject.org
+XTTPD_FEEDBACK=xtide-maintainer@fedoraproject.org
 EOF
 
 sed -i scripts/systemd/xttpd.service.in \
@@ -148,9 +163,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=|' \
@@ -160,11 +172,14 @@ sed -i.rpath ltmain.sh \
 	-e 's|\$finalize_rpath|\$finalize_no_rpath|' \
 	%{nil}
 
-%build
-# Build with experimental SVG support
-export CFLAGS="%{optflags} -DJGFeatures"
-export CXXFLAGS="%{optflags} -DJGFeatures"
+%if %{use_systemd_sysusers}
+# Create a sysusers.d config file
+cat >xtide.sysusers.conf <<EOF
+u xttpd - 'XTide web server' %{_sysconfdir}/%{name} -
+EOF
+%endif
 
+%build
 %configure \
    --enable-systemd \
 %if 0
@@ -228,9 +243,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}
 
@@ -271,6 +283,10 @@ cp -a harmonics-dwf-%{dwfdate}/[A-Z]* \
 # 3 cleanup
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libxtide.{a,la}
 
+%if %{use_systemd_sysusers}
+install -m0644 -D xtide.sysusers.conf %{buildroot}%{_sysusersdir}/xtide.conf
+%endif
+
 %post
 %systemd_post xttpd.socket xttpd.service
 exit 0
@@ -281,6 +297,7 @@ exit 0
 
 
 %pre
+%if ! %{use_systemd_sysusers}
 getent group xttpd &>/dev/null || \
    %{_sbindir}/groupadd -r xttpd
 getent passwd xttpd &> /dev/null || \
@@ -291,6 +308,7 @@ getent passwd xttpd &> /dev/null || \
    -r \
    -s /sbin/nologin \
    xttpd 2>/dev/null
+%endif
 exit 0
 
 %preun
@@ -314,7 +332,7 @@ exit 0
 %{_datadir}/%{name}-harmonics/*.tcd
 
 %files -n libxtide
-%{_libdir}/libxtide.so.1*
+%{_libdir}/libxtide.so.1{,.*}
 
 %files -n libxtide-devel
 %{_libdir}/libxtide.so
@@ -342,8 +360,87 @@ exit 0
 
 %{_sbindir}/xttpd
 %{_datadir}/man/man8/xttpd.8*
+%if %{use_systemd_sysusers}
+%{_sysusersdir}/xtide.conf
+%endif
 
 %changelog
+* Wed Jan 14 2026 Jitka Plesnikova <jplesnik@redhat.com> - 2.15.6-4
+- Rebuild for new gpsd
+
+* Mon Dec 29 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.6-3
+- Update harmonics data to 20251228
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jun 29 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.6-1
+- 2.15.6
+
+* Tue May 27 2025 Remi Collet <remi@fedoraproject.org> - 2.15.5-11
+- rebuild for new gpsd
+
+* Thu Feb 13 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.5-10
+- Only apply Systemd Sysusers.d usage for F-42+
+
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.15.5-10
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Mon Dec 30 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.5-8
+- Update harmonics data to 20241229
+
+* Thu Jul  25 2024 Miroslav Suchý <msuchy@redhat.com> - 2.15.5-7
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan  6 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.5-4
+- harmonics data update (20240104)
+
+* Sat Jul 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jan 24 2023 Adam Williamson <awilliam@redhat.com> - 2.15.5-2
+- rebuild for new libgps
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.5-1.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.5-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu May 12 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.5-1
+- 2.15.5
+
+* Thu May  5 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.4-2
+- Modify configure.ac to detect gpsd API version >=7 (version 3.18)
+
+* Tue Feb 15 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.4-1
+- 2.15.4
+
+* Sun Feb  6 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.3-4
+- Patch for libXaw 1.0.14 XawListChange API change
+
+* Sun Feb  6 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.3-3
+- harmonics data update (20220109)
+
+* Sun Jul 25 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.3-2.2
+- Rebuild for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Mar 02 2021 Peter Hutterer <peter.hutterer@redhat.com> - 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 <mtasaka@fedoraproject.org> - 2.15.3-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Sun Aug  9 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.3-1
 - 2.15.3