From 8f61533ac1761df12bfeb9a34e47d8dd919c6451 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 9 Feb 2013 21:39:24 +0900 Subject: [PATCH 01/81] F-19: kill vendorization of desktop file (fpc#247) --- xtide.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xtide.spec b/xtide.spec index 0f464e0..1a7de3e 100644 --- a/xtide.spec +++ b/xtide.spec @@ -3,7 +3,7 @@ %define dwfdate 20121224 -%define fedorarel 3 +%define fedorarel 4 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -166,7 +166,9 @@ 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} @@ -270,7 +272,7 @@ exit 0 # xtide %{_mandir}/man1/*tide.1* -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/*%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/%{name}/icon_*_orig.png @@ -285,7 +287,10 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog -* Mon Dec 31 2012 Mamoru TASAKA - 2.13.3 +* Sat Feb 9 2013 Mamoru TASAKA - 2.13-4 +- F-19: kill vendorization of desktop file (fpc#247) + +* Mon Dec 31 2012 Mamoru TASAKA - 2.13-3 - Update harmonics data to 20121224 * Mon Aug 6 2012 Mamoru Tasaka - 2.13-2 From b3e8ea1fbd048559619d550b6d04ae031873d3af Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 12 Jul 2013 18:26:52 +0900 Subject: [PATCH 02/81] 2.13.1 --- .gitignore | 1 + sources | 2 +- xtide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7343e54..64f8abd 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ xtide-2.11.tar.bz2 /xtide-2.13-RC3.tar.bz2 /xtide-2.13.tar.bz2 /harmonics-dwf-20121224-free.tar.bz2 +/xtide-2.13.1.tar.bz2 diff --git a/sources b/sources index 14ba4c2..a8183d7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d208dcceddf73731e978ff2aaab5b576 xtide-2.13.tar.bz2 f9a8c5414aa14bd6b08d1be4e6a3eea7 harmonics-dwf-20121224-free.tar.bz2 +7d5833522eec8a05c6e0cb8aac397f73 xtide-2.13.1.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 1a7de3e..5d3bc3e 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ -%define mainver 2.13 +%define mainver 2.13.1 %undefine betatag %define dwfdate 20121224 -%define fedorarel 4 +%define fedorarel 1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -287,6 +287,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Fri Jul 12 2013 Mamoru TASAKA - 2.13.1-1 +- 2.13.1 + * Sat Feb 9 2013 Mamoru TASAKA - 2.13-4 - F-19: kill vendorization of desktop file (fpc#247) From 00ae94f67d7539cbfa084a6115dc9a8101a20958 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 24 Jul 2013 13:56:47 +0900 Subject: [PATCH 03/81] 2.13.2 --- .gitignore | 1 + sources | 2 +- xtide.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 64f8abd..bf78c63 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ xtide-2.11.tar.bz2 /xtide-2.13.tar.bz2 /harmonics-dwf-20121224-free.tar.bz2 /xtide-2.13.1.tar.bz2 +/xtide-2.13.2.tar.bz2 diff --git a/sources b/sources index a8183d7..b276b60 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ f9a8c5414aa14bd6b08d1be4e6a3eea7 harmonics-dwf-20121224-free.tar.bz2 -7d5833522eec8a05c6e0cb8aac397f73 xtide-2.13.1.tar.bz2 +59de866e0684e123419d7a1c97ea23a5 xtide-2.13.2.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 5d3bc3e..c4a6746 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,4 +1,4 @@ -%define mainver 2.13.1 +%define mainver 2.13.2 %undefine betatag %define dwfdate 20121224 @@ -287,6 +287,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Wed Jul 24 2013 Mamoru TASAKA - 2.13.2-1 +- 2.13.2 + * Fri Jul 12 2013 Mamoru TASAKA - 2.13.1-1 - 2.13.1 From 7ff3fcf90f827cb232f1b79fb7f59b2764c11b59 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 6 Aug 2013 16:44:59 +0900 Subject: [PATCH 04/81] 2.13.2 --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index c4a6746..f4b9ee2 100644 --- a/xtide.spec +++ b/xtide.spec @@ -3,7 +3,7 @@ %define dwfdate 20121224 -%define fedorarel 1 +%define fedorarel 2 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -287,6 +287,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Aug 6 2013 Mamoru TASAKA - 2.13.2-2 +- F-20: mass rebuild + * Wed Jul 24 2013 Mamoru TASAKA - 2.13.2-1 - 2.13.2 From e113930fa92744fb534e9be57c7f828c6492c7fe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 1 Dec 2013 03:17:04 +0900 Subject: [PATCH 05/81] F-21: rebuild against new gpsd --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index f4b9ee2..26e3041 100644 --- a/xtide.spec +++ b/xtide.spec @@ -3,7 +3,7 @@ %define dwfdate 20121224 -%define fedorarel 2 +%define fedorarel 3 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -287,6 +287,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Dec 1 2013 Mamoru TASAKA - 2.13.2-3 +- F-21: rebuild against new gpsd + * Tue Aug 6 2013 Mamoru TASAKA - 2.13.2-2 - F-20: mass rebuild From 09b6d83cf2d74baaad784f632d118f197a49d43d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Dec 2013 17:14:34 +0900 Subject: [PATCH 06/81] Update harmonics data to 20131228 --- .gitignore | 1 + sources | 2 +- xtide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bf78c63..cc7476d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ xtide-2.11.tar.bz2 /harmonics-dwf-20121224-free.tar.bz2 /xtide-2.13.1.tar.bz2 /xtide-2.13.2.tar.bz2 +/harmonics-dwf-20131228-free.tar.bz2 diff --git a/sources b/sources index b276b60..16215ba 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f9a8c5414aa14bd6b08d1be4e6a3eea7 harmonics-dwf-20121224-free.tar.bz2 59de866e0684e123419d7a1c97ea23a5 xtide-2.13.2.tar.bz2 +4558082d11502085500c49fa86554976 harmonics-dwf-20131228-free.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 26e3041..8973941 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ %define mainver 2.13.2 %undefine betatag -%define dwfdate 20121224 +%define dwfdate 20131228 -%define fedorarel 3 +%define fedorarel 4 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -287,6 +287,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Mon Dec 30 2013 Mamoru TASAKA - 2.13.2-4 +- Update harmonics data to 20131228 + * Sun Dec 1 2013 Mamoru TASAKA - 2.13.2-3 - F-21: rebuild against new gpsd From 5812a7586f0e6461ec25f1a9f6f3702f343b9aa5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 26 May 2014 14:35:15 +0900 Subject: [PATCH 07/81] 2.14 dev20140504 --- .gitignore | 21 +-------------------- sources | 3 ++- xtide.spec | 9 ++++++--- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index cc7476d..ce9fab7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1,2 @@ -xtide-2.11-RC1.tar.bz2 -harmonics-dwf-20100529-free.tar.bz2 -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 -/xtide-2.13-RC2.tar.bz2 -/xtide-2.13-RC3.tar.bz2 -/xtide-2.13.tar.bz2 -/harmonics-dwf-20121224-free.tar.bz2 -/xtide-2.13.1.tar.bz2 -/xtide-2.13.2.tar.bz2 /harmonics-dwf-20131228-free.tar.bz2 +/xtide-2.14-dev-20140504.tar.bz2 diff --git a/sources b/sources index 16215ba..e6a5726 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -59de866e0684e123419d7a1c97ea23a5 xtide-2.13.2.tar.bz2 +838a367fcd0ada63dc4d6020a9c4c0a3 xtide-2.14-dev-20140504.tar.bz2 4558082d11502085500c49fa86554976 harmonics-dwf-20131228-free.tar.bz2 + diff --git a/xtide.spec b/xtide.spec index 8973941..7362fa6 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ -%define mainver 2.13.2 -%undefine betatag +%define mainver 2.14 +%define betatag dev-20140504 %define dwfdate 20131228 -%define fedorarel 4 +%define fedorarel 1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -287,6 +287,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Mon May 26 2014 Mamoru TASAKA - 2.14-0.1.dev20140504 +- 2.14 dev20140504 + * Mon Dec 30 2013 Mamoru TASAKA - 2.13.2-4 - Update harmonics data to 20131228 From 8c8738ac610d33f2fea494201e1458fab73ea367 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 26 May 2014 14:50:33 +0900 Subject: [PATCH 08/81] fix sources --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index e6a5726..e084384 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ 838a367fcd0ada63dc4d6020a9c4c0a3 xtide-2.14-dev-20140504.tar.bz2 4558082d11502085500c49fa86554976 harmonics-dwf-20131228-free.tar.bz2 - From 5124577ba3358ebb7319a1b3f6fea352b48d143d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 12 Jun 2014 10:46:59 +0900 Subject: [PATCH 09/81] F-21: mass rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 7362fa6..b9e2f16 100644 --- a/xtide.spec +++ b/xtide.spec @@ -3,7 +3,7 @@ %define dwfdate 20131228 -%define fedorarel 1 +%define fedorarel 2 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -287,6 +287,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Thu Jun 12 2014 Mamoru TASAKA - 2.14-0.2.dev20140504 +- F-21: mass rebuild + * Mon May 26 2014 Mamoru TASAKA - 2.14-0.1.dev20140504 - 2.14 dev20140504 From ecffb4deca386de19a4b2f491cfc33d4ef6d8eab Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Jun 2014 13:37:55 +0900 Subject: [PATCH 10/81] 2.14 dev20140622 --- .gitignore | 1 + sources | 2 +- xtide.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ce9fab7..1b193e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /harmonics-dwf-20131228-free.tar.bz2 /xtide-2.14-dev-20140504.tar.bz2 +/xtide-2.14-dev-20140622.tar.bz2 diff --git a/sources b/sources index e084384..a788e9e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -838a367fcd0ada63dc4d6020a9c4c0a3 xtide-2.14-dev-20140504.tar.bz2 4558082d11502085500c49fa86554976 harmonics-dwf-20131228-free.tar.bz2 +9ba23a7d17aec79204230a9517aa8822 xtide-2.14-dev-20140622.tar.bz2 diff --git a/xtide.spec b/xtide.spec index b9e2f16..6804418 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ %define mainver 2.14 -%define betatag dev-20140504 +%define betatag dev-20140622 %define dwfdate 20131228 -%define fedorarel 2 +%define fedorarel 3 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -120,6 +120,9 @@ export CFLAGS="%{optflags} -DJGFeatures" export CXXFLAGS="%{optflags} -DJGFeatures" %configure \ +%if 0 + --enable-moon-age \ +%endif --with-xttpd-user=xttpd \ --with-xttpd-group=xttpd @@ -287,6 +290,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Mon Jun 30 2014 Mamoru TASAKA - 2.14-0.3.dev20140622 +- 2.14 dev20140622 + * Thu Jun 12 2014 Mamoru TASAKA - 2.14-0.2.dev20140504 - F-21: mass rebuild From fd5432de08135c80856ef48cc6b691d87fdd6eae Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:05:42 +0000 Subject: [PATCH 11/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 6804418..2a40b02 100644 --- a/xtide.spec +++ b/xtide.spec @@ -12,7 +12,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 @@ -290,6 +290,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 2.14-0.3.dev20140622.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Mon Jun 30 2014 Mamoru TASAKA - 2.14-0.3.dev20140622 - 2.14 dev20140622 From 3c364ef8d653ff95dabe657e462bfa926995d3e9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Oct 2014 22:36:59 +0900 Subject: [PATCH 12/81] 2.14 dev20141014 - New subpackage: libxtide - Make -common noarch --- .gitignore | 1 + sources | 2 +- xtide.spec | 47 +++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1b193e2..f1caed5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /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 diff --git a/sources b/sources index a788e9e..11f2d19 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 4558082d11502085500c49fa86554976 harmonics-dwf-20131228-free.tar.bz2 -9ba23a7d17aec79204230a9517aa8822 xtide-2.14-dev-20140622.tar.bz2 +434bfa5d429d314dde138e4126eb4193 xtide-2.14-dev-20141014.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 2a40b02..22e47b8 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ %define mainver 2.14 -%define betatag dev-20140622 +%define betatag dev-20141014 %define dwfdate 20131228 -%define fedorarel 3 +%define fedorarel 4 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -12,7 +12,7 @@ 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 @@ -49,7 +49,8 @@ BuildRequires: gpsd-devel >= 3 Requires: wvs-data Requires: xorg-x11-fonts-base -Requires: xtide-common +Requires: xtide-common = %{version}-%{release} +Requires: libxtide%{?_isa} = %{version}-%{release} Requires(pre): shadow-utils Requires(preun): /sbin/service @@ -57,12 +58,25 @@ Requires(preun): /sbin/chkconfig Requires(postun): /sbin/service Requires(post): /sbin/chkconfig +%package -n libxtide +Summary: XTide library +Group: System Environment/Libraries +License: GPLv3+ + +%package -n libxtide-devel +Summary: Development files for libxtide +Group: Development/Libraries +License: GPLv3+ +Requires: libxtide%{?_isa} = %{version}-%{release} + + %package common Summary: Xtide common files Group: Applications/Engineering License: Public Domain Requires: bzip2 Requires: wget +BuildArch: noarch %description XTide is a package that provides tide and current @@ -88,6 +102,13 @@ NOTE: Please also see README.fedora in xtide-common package for Fedora specific issue. +%description -n libxtide +The libxtide package provides library files used for XTide. + +%description -n libxtide-devel +The libxtide-devel package contains libraries and header files for +developing applications that use libxtide. + %description common This package contains common files needed by xtide, xttpd and @@ -213,6 +234,9 @@ mkdir harmonics-dwf cp -a harmonics-dwf-%{dwfdate}/[A-Z]* \ harmonics-dwf/ +# 3 cleanup +rm -rf $RPM_BUILD_ROOT%{_libdir}/libxtide.{a,la} + %post touch --no-create %{_datadir}/icons/hicolor || : @@ -254,6 +278,9 @@ exit 0 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : exit 0 +%post -n libxtide -p /sbin/ldconfig +%postun -n libxtide -p /sbin/ldconfig + %files common %doc README.fedora %doc harmonics-dwf/ @@ -268,6 +295,13 @@ exit 0 # Now include tcd data %{_datadir}/%{name}-harmonics/*.tcd +%files -n libxtide +%{_libdir}/libxtide.so.0* + +%files -n libxtide-devel +%{_libdir}/libxtide.so +%{_includedir}/libxtide/ + %files %defattr(-,root,root,-) @@ -290,6 +324,11 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Fri Oct 17 2014 Mamoru TASAKA - 2.14-0.4.dev20141014 +- 2.14 dev20141014 +- New subpackage: libxtide +- Make -common noarch + * Mon Aug 18 2014 Fedora Release Engineering - 2.14-0.3.dev20140622.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From d91107cb3bd1eb681f8e98a20bdf4babe6bf18cf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 4 Nov 2014 13:58:06 +0900 Subject: [PATCH 13/81] 2.14 --- .gitignore | 1 + sources | 3 +-- xtide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f1caed5..12518bf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 diff --git a/sources b/sources index 11f2d19..1b8bd6d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -4558082d11502085500c49fa86554976 harmonics-dwf-20131228-free.tar.bz2 -434bfa5d429d314dde138e4126eb4193 xtide-2.14-dev-20141014.tar.bz2 +0f50833e6f686eca16dcb33c1719cf6c xtide-2.14.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 22e47b8..4c28dda 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ %define mainver 2.14 -%define betatag dev-20141014 +#%%define betatag dev-20141014 %define dwfdate 20131228 -%define fedorarel 4 +%define fedorarel 1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -324,6 +324,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Nov 4 2014 Mamoru TASAKA - 2.14-1 +- 2.14 + * Fri Oct 17 2014 Mamoru TASAKA - 2.14-0.4.dev20141014 - 2.14 dev20141014 - New subpackage: libxtide From 0fb04d77b9917bafa9c9edfaea34db60839f4424 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 4 Nov 2014 14:17:31 +0900 Subject: [PATCH 14/81] mistakenly deleted needed source... From 1fc6bd49d65e42e9d312b571a9fab6440178a62e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 4 Nov 2014 14:20:38 +0900 Subject: [PATCH 15/81] again commit --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 1b8bd6d..039ef41 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 0f50833e6f686eca16dcb33c1719cf6c xtide-2.14.tar.bz2 +4558082d11502085500c49fa86554976 harmonics-dwf-20131228-free.tar.bz2 From 397763ff7af4464a2380ff85fc4c0b59d4e461fa Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Dec 2014 17:43:46 +0900 Subject: [PATCH 16/81] Harmonics data 20141224 --- .gitignore | 1 + sources | 1 + xtide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 12518bf..f2db787 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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 diff --git a/sources b/sources index 039ef41..b09c02f 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 0f50833e6f686eca16dcb33c1719cf6c xtide-2.14.tar.bz2 4558082d11502085500c49fa86554976 harmonics-dwf-20131228-free.tar.bz2 +27adcccb2824ac45b072636b1ee1cdd5 harmonics-dwf-20141224-free.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 4c28dda..1139015 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ %define mainver 2.14 #%%define betatag dev-20141014 -%define dwfdate 20131228 +%define dwfdate 20141224 -%define fedorarel 1 +%define fedorarel 2 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -324,6 +324,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Dec 28 2014 Mamoru TASAKA - 2.14-2 +- Harmonics data 20141224 + * Tue Nov 4 2014 Mamoru TASAKA - 2.14-1 - 2.14 From 144c9a55dd286d7fbf09b950b3bcebf761fc7c98 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 8 Mar 2015 21:08:08 +0900 Subject: [PATCH 17/81] F-23: rebuild against new gpsd --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 1139015..fe4685d 100644 --- a/xtide.spec +++ b/xtide.spec @@ -3,7 +3,7 @@ %define dwfdate 20141224 -%define fedorarel 2 +%define fedorarel 3 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -324,6 +324,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Mar 8 2015 Mamoru TASAKA - 2.14-3 +- F-23: rebuild against new gpsd + * Sun Dec 28 2014 Mamoru TASAKA - 2.14-2 - Harmonics data 20141224 From 228d5571ebf0ae031ae725b086426ad0e6204f6a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:48:01 +0200 Subject: [PATCH 18/81] Rebuilt for GCC 5 C++11 ABI change --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index fe4685d..8adb64d 100644 --- a/xtide.spec +++ b/xtide.spec @@ -12,7 +12,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 @@ -324,6 +324,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sat May 02 2015 Kalev Lember - 2.14-3.1 +- Rebuilt for GCC 5 C++11 ABI change + * Sun Mar 8 2015 Mamoru TASAKA - 2.14-3 - F-23: rebuild against new gpsd From 44832b5e739e4475a425d2a4e137772028333bac Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 30 Dec 2015 16:11:33 +0900 Subject: [PATCH 19/81] Harmonics data 20151227 --- .gitignore | 1 + sources | 3 +-- xtide.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f2db787..8464542 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /xtide-2.14-dev-20141014.tar.bz2 /xtide-2.14.tar.bz2 /harmonics-dwf-20141224-free.tar.bz2 +/harmonics-dwf-20151227-free.tar.bz2 diff --git a/sources b/sources index b09c02f..fac00cb 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ 0f50833e6f686eca16dcb33c1719cf6c xtide-2.14.tar.bz2 -4558082d11502085500c49fa86554976 harmonics-dwf-20131228-free.tar.bz2 -27adcccb2824ac45b072636b1ee1cdd5 harmonics-dwf-20141224-free.tar.bz2 +1c1adf4c8a7d69547f296f783914de5d harmonics-dwf-20151227-free.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 8adb64d..9fc0627 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,9 +1,9 @@ %define mainver 2.14 #%%define betatag dev-20141014 -%define dwfdate 20141224 +%define dwfdate 20151227 -%define fedorarel 3 +%define fedorarel 4 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -12,7 +12,7 @@ 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 @@ -123,7 +123,7 @@ grep -rl 'include.*' . | while read f ; do sed -i.name -e 's|\(include.*\)|\1|' $f done -%patch0 -p1 +%patch0 -p1 -b .pid # Embed version sed -i.ver \ @@ -324,6 +324,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Dec 29 2015 Mamoru TASAKA - 2.14.3-4 +- Harmonics data 20151227 + * Sat May 02 2015 Kalev Lember - 2.14-3.1 - Rebuilt for GCC 5 C++11 ABI change From d9f6f3f68e588eacc0fb3900d7006546e2f8214d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 31 Dec 2015 01:48:22 +0900 Subject: [PATCH 20/81] Switch to use systemd unit on F-24+ --- ...-rcscript-pidfile-with-server-change.patch | 51 ++++++ xtide-2.14-server-write-pid.patch | 147 ++++++++++++++++++ xtide.spec | 61 +++++++- xttpd.service | 13 ++ 4 files changed, 268 insertions(+), 4 deletions(-) create mode 100644 xtide-2.14-rcscript-pidfile-with-server-change.patch create mode 100644 xtide-2.14-server-write-pid.patch create mode 100644 xttpd.service diff --git a/xtide-2.14-rcscript-pidfile-with-server-change.patch b/xtide-2.14-rcscript-pidfile-with-server-change.patch new file mode 100644 index 0000000..d6f4ee3 --- /dev/null +++ b/xtide-2.14-rcscript-pidfile-with-server-change.patch @@ -0,0 +1,51 @@ +--- xtide-2.14/scripts/Fedora/rc.xttpd.pid_rc 2006-11-25 07:03:03.000000000 +0900 ++++ xtide-2.14/scripts/Fedora/rc.xttpd 2015-12-30 23:37:17.110917961 +0900 +@@ -6,13 +6,14 @@ + # description: Harmonic tide clock and tide predictor server + # processname: xttpd + # config: /etc/sysconfig/xttpd +-# pidfile: /var/run/xttpd.pid ++# pidfile: /var/run/xttpd/xttpd.pid + # + + PATH=/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin + CONFIG=/etc/sysconfig/xttpd + + LOCK=/var/lock/subsys/xttpd ++PIDFILE=/var/run/xttpd.pid + + # Source function library. + . /etc/rc.d/init.d/functions +@@ -40,13 +41,8 @@ + return $RETVAL + fi + +- if test "$XTTPD_FEEDBACK"; then +- daemon $DAEMON $PORT XTTPD_FEEDBACK=$XTTPD_FEEDBACK HOME=$HOME ++ daemon --pidfile $PIDFILE $DAEMON $PORT XTTPD_FEEDBACK=$XTTPD_FEEDBACK HOME=$HOME + RETVAL=$? +- else +- daemon $DAEMON $PORT HOME=$HOME +- RETVAL=$? +- fi + [ $RETVAL -eq 0 ] && touch $LOCK + echo + return $RETVAL +@@ -54,7 +50,7 @@ + + stop(){ + echo -n $"Stopping $PROG: " +- killproc $DAEMON ++ killproc -p $PIDFILE $DAEMON + RETVAL=$? + [ $RETVAL -eq 0 ] && rm -f $LOCK + echo +@@ -67,7 +63,7 @@ + } + + status_xttpd(){ +- status $PROG ++ status -p $PIDFILE $PROG + } + + case "$1" in diff --git a/xtide-2.14-server-write-pid.patch b/xtide-2.14-server-write-pid.patch new file mode 100644 index 0000000..506ab48 --- /dev/null +++ b/xtide-2.14-server-write-pid.patch @@ -0,0 +1,147 @@ +--- xtide-2.14/xttpd.cc.pidfile 2014-10-12 04:42:10.000000000 +0900 ++++ xtide-2.14/xttpd.cc 2015-12-30 21:05:16.087233767 +0900 +@@ -34,6 +34,11 @@ using namespace libxtide; + #include + #include + #include ++#include ++#include ++#include ++#include ++#include + + + // These browsers nowadays can get pretty verbose. +@@ -44,6 +49,11 @@ static const size_t bufsize (10000); + static Dstr webmaster; + static ZoneIndex zoneIndex; + static bool zoneinfoIsNotHorriblyObsolete; ++static int processTermReason = 0; ++ ++// Pid file name ++#define PID_FILE_DIR "/var/run/xttpd" ++#define PID_FILE_NAME PID_FILE_DIR "/xttpd.pid" + + + namespace TimeControl { +@@ -1153,6 +1163,89 @@ static void dontBeRoot() { + } + } + ++static void createPidFileDirectory(void) { ++ struct stat st; ++ mode_t dirMode = S_IRWXU | S_IRGRP | S_IXGRP; ++ ++ if (stat(PID_FILE_DIR, &st) != 0) { ++ int errnum = errno; ++ if (errnum != ENOENT) { ++ Global::xperror("stat"); ++ exit (-1); ++ } ++ ++ if (mkdir(PID_FILE_DIR, dirMode) < 0) { ++ Global::xperror("mkdir"); ++ exit (-1); ++ } ++ ++ if (stat(PID_FILE_DIR, &st) != 0) { ++ Global::xperror("stat"); ++ exit (-1); ++ } ++ } ++ ++ // Make it sure that PID_FILE_DIR is a directory ++ // (not a symlink or so) ++ if (!S_ISDIR(st.st_mode)) { ++ Dstr msg (PID_FILE_DIR " is not a directory"); ++ Global::log (msg, LOG_ERR); ++ exit (-1); ++ } ++ ++ // Again chmod ++ if (chmod(PID_FILE_DIR, dirMode) < 0) { ++ Global::xperror("chmod"); ++ exit (-1); ++ } ++ ++ group *gr = getgrnam (xttpd_group); ++ if (!gr) { ++ Global::xperror ("getgrnam"); ++ exit (-1); ++ } ++ passwd *nb = getpwnam (xttpd_user); ++ if (!nb) { ++ Global::xperror ("getpwnam"); ++ exit(-1); ++ } ++ ++ if (chown(PID_FILE_DIR, nb->pw_uid, gr->gr_gid) < 0) { ++ Global::xperror ("chown"); ++ exit(-1); ++ } ++ ++} ++ ++static void writePidFile(pid_t pid) { ++ FILE *pidFd = fopen(PID_FILE_NAME, "w"); ++ if (!pidFd) { ++ Global::xperror("fopen"); ++ exit (-1); ++ } ++ ++ if (fprintf(pidFd, "%d", (int)pid) < 0) { ++ Global::xperror ("fprintf"); ++ exit (-1); ++ } ++ ++ fclose(pidFd); ++} ++ ++static void handlerSigterm(int sig) { ++ processTermReason = sig; ++} ++ ++static void initSignalHander(void) { ++ struct sigaction sigact; ++ memset(&sigact, 0, sizeof sigact); ++ ++ sigemptyset(&sigact.sa_mask); ++ sigact.sa_flags |= SA_RESTART; ++ sigact.sa_handler = handlerSigterm; ++ ++ sigaction(SIGTERM, &sigact, NULL); ++} + + int main (int argc, char **argv) { + +@@ -1181,7 +1274,13 @@ int main (int argc, char **argv) { + portNumberEvade = parseAddress (portnum, addr, argv[1]); + setupSocket (portnum, addr, listenSocket); + } ++ // Create pid directory before dropping priviledge ++ createPidFileDirectory(); + dontBeRoot(); ++ writePidFile(getpid()); ++ ++ // Initialize signal handler ++ initSignalHander(); + + // An unfortunate consequence of needing to drop root ASAP is that + // failure to bind the port prevents xttpd -v from working. +@@ -1212,7 +1311,7 @@ int main (int argc, char **argv) { + FD_ZERO (&rdset); + FD_SET (listenSocket, &rdset); + sockaddr addr; +- while (true) { ++ while (!processTermReason) { + fd_set trdset, twrset, texset; + trdset = rdset; + // I seem to remember that some platforms barf if you provide +@@ -1235,6 +1334,7 @@ int main (int argc, char **argv) { + while (waitpid (-1, (int*)NULL, WNOHANG|WUNTRACED) > 0); + } + ++ unlink(PID_FILE_NAME); + exit (0); + } + diff --git a/xtide.spec b/xtide.spec index 9fc0627..a634cb5 100644 --- a/xtide.spec +++ b/xtide.spec @@ -2,8 +2,13 @@ #%%define betatag dev-20141014 %define dwfdate 20151227 +%global use_systemd_unit 1 +%if 0%{?fedora} <= 23 +%global use_systemd_unit 0 +%endif -%define fedorarel 4 + +%define fedorarel 6 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -30,8 +35,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 +# The following files need discussion with the upstream +Source50: xttpd.service # new systemd ( >= 37.4? ) needs pidfile -Patch0: xtide-2.12.1-rcscript-pidfile.patch +Patch0: xtide-2.14-rcscript-pidfile-with-server-change.patch +Patch1: xtide-2.14-server-write-pid.patch License: GPLv3+ Group: Applications/Engineering @@ -43,8 +51,9 @@ BuildRequires: zlib-devel BuildRequires: desktop-file-utils BuildRequires: libdstr-devel BuildRequires: libtcd-devel -%if 0%{?fedora} >= 17 BuildRequires: gpsd-devel >= 3 +%if %{?use_systemd_unit} +BuildRequires: systemd-devel %endif Requires: wvs-data @@ -123,7 +132,8 @@ grep -rl 'include.*' . | while read f ; do sed -i.name -e 's|\(include.*\)|\1|' $f done -%patch0 -p1 -b .pid +%patch1 -p1 -b .pid_server +%patch0 -p1 -b .pid_rc # Embed version sed -i.ver \ @@ -178,6 +188,20 @@ echo "%{_datadir}/wvs-data/" >> %{name}.conf %{__sed} -i -e 's|/usr/libexec|%{_libexecdir}|' \ $RPM_BUILD_ROOT%{_sbindir}/xttpd +# Create pid directory for xttpd +# and create tmpfile.d file +%{__mkdir_p} ${RPM_BUILD_ROOT}%{_localstatedir}/run/xttpd +%{__mkdir_p} ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d +%{__cat} > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/xttpd.conf </dev/null || : fi +%endif [ $1 -eq 0 ] || exit 0 touch --no-create %{_datadir}/icons/hicolor || : @@ -268,10 +302,14 @@ getent passwd xttpd &> /dev/null || \ exit 0 %preun +%if 0%{?use_systemd_unit} +%systemd_preun xttpd.service +%else if [ $1 = 0 ] ; then /sbin/service xttpd stop &>/dev/null /sbin/chkconfig --del xttpd fi +%endif exit 0 %posttrans @@ -317,13 +355,28 @@ exit 0 # xttpd %config(noreplace) %{_sysconfdir}/sysconfig/xttpd +%attr(0750,xttpd,xttpd) %dir %{_localstatedir}/run/xttpd +%{_prefix}/lib/tmpfiles.d/xttpd.conf +%if 0%{?use_systemd_unit} +%{_unitdir}/xttpd.service +%else %{_initddir}/xttpd +%endif %{_sbindir}/xttpd %{_libexecdir}/xttpd %{_datadir}/man/man8/xttpd.8* %changelog +* Thu Dec 31 2015 Mamoru TASAKA - 2.14.3-6 +- Switch to use systemd unit on F-24+ + +* Wed Dec 30 2015 Mamoru TASAKA - 2.14.3-5 +- Make xttpd server create pidfile by itself +- Modify rcscript to reflect server change +- Remove if-condition when calling xttpd-wrapper.sh + with regard to XTTPD_FEEDBACK option + * Tue Dec 29 2015 Mamoru TASAKA - 2.14.3-4 - Harmonics data 20151227 diff --git a/xttpd.service b/xttpd.service new file mode 100644 index 0000000..fbbf976 --- /dev/null +++ b/xttpd.service @@ -0,0 +1,13 @@ +[Unit] +Description=Harmonic tide clock and tide predictor (web server) +Documentation=man:xttpd(8) +After=network.target + +[Service] +Type=forking +PIDFile=/var/run/xttpd/xttpd.pid +EnvironmentFile=-/etc/sysconfig/xttpd +ExecStart=/usr/sbin/xttpd $PORT XTTPD_FEEDBACK=$XTTPD_FEEDBACK HOME=$HOME + +[Install] +WantedBy=multi-user.target From a16d7da1472ee7823d0549ca91e2640177ed57cd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 31 Dec 2015 12:11:50 +0900 Subject: [PATCH 21/81] a bit fix --- xtide-2.14-rcscript-pidfile-with-server-change.patch | 2 +- xtide.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xtide-2.14-rcscript-pidfile-with-server-change.patch b/xtide-2.14-rcscript-pidfile-with-server-change.patch index d6f4ee3..ee3d561 100644 --- a/xtide-2.14-rcscript-pidfile-with-server-change.patch +++ b/xtide-2.14-rcscript-pidfile-with-server-change.patch @@ -12,7 +12,7 @@ CONFIG=/etc/sysconfig/xttpd LOCK=/var/lock/subsys/xttpd -+PIDFILE=/var/run/xttpd.pid ++PIDFILE=/var/run/xttpd/xttpd.pid # Source function library. . /etc/rc.d/init.d/functions diff --git a/xtide.spec b/xtide.spec index a634cb5..7b1b3d0 100644 --- a/xtide.spec +++ b/xtide.spec @@ -8,7 +8,7 @@ %endif -%define fedorarel 6 +%define fedorarel 6.1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} From 95a2c9787dbc00a6414f37ba125187ea48c12649 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 Jan 2016 22:21:15 +0900 Subject: [PATCH 22/81] Use systemd patches provided by the upstream - Make xttpd.socket (provided by the upstream) be symlink from %_sysconfdir --- .gitignore | 1 + sources | 1 + xtide.spec | 97 ++++++++++++++++++++++++++++++++++++++------------- xttpd.service | 11 +++--- 4 files changed, 82 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 8464542..c5373d7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /xtide-2.14.tar.bz2 /harmonics-dwf-20141224-free.tar.bz2 /harmonics-dwf-20151227-free.tar.bz2 +/systemd-patch.tar.gz diff --git a/sources b/sources index fac00cb..250729e 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 0f50833e6f686eca16dcb33c1719cf6c xtide-2.14.tar.bz2 1c1adf4c8a7d69547f296f783914de5d harmonics-dwf-20151227-free.tar.bz2 +bb71524254f7ded08348d6e1e2268a47 systemd-patch.tar.gz diff --git a/xtide.spec b/xtide.spec index 7b1b3d0..b288008 100644 --- a/xtide.spec +++ b/xtide.spec @@ -8,7 +8,7 @@ %endif -%define fedorarel 6.1 +%define fedorarel 7 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -21,6 +21,10 @@ Release: %{rel}%{?dist} URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.bz2 +# Upstream systemd patches +Source1: systemd-patch.tar.gz +# Upstream service file +Source2: xttpd.service Source14: xtide-get_harmonics-data.sh Source20: %{name}.desktop @@ -35,11 +39,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 -# The following files need discussion with the upstream -Source50: xttpd.service # new systemd ( >= 37.4? ) needs pidfile -Patch0: xtide-2.14-rcscript-pidfile-with-server-change.patch -Patch1: xtide-2.14-server-write-pid.patch +Patch0: xtide-2.12.1-rcscript-pidfile.patch License: GPLv3+ Group: Applications/Engineering @@ -54,6 +55,9 @@ BuildRequires: libtcd-devel BuildRequires: gpsd-devel >= 3 %if %{?use_systemd_unit} BuildRequires: systemd-devel +# By SOURCE1 +BuildRequires: automake +BuildRequires: autoconf %endif Requires: wvs-data @@ -125,15 +129,33 @@ tideEditor. Please read README.fedora for Fedora specific issue. %prep -%setup -q -n %{name}-%{version}%{?betatag:-%{betatag}} -a 42 +%setup -q -n %{name}-%{version}%{?betatag:-%{betatag}} -a 1 -a 42 + +# Systemd stuff +# copy sources in SOURCE1 to the proper directory +cp -a systemd-patch/xtide-stuff/* . +sed -i systemd-patch/systemd-stuff/xttpd.socket \ + -e 's|ListenStream=80|ListenStream=8080|' +sed -i systemd-patch/systemd-stuff/xttpdenv \ + -e 's|HFILE_PATH=/usr/local/share/xtide|HFILE_PATH=%{_datadir}/%{name}-harmonics|' \ + -e 's|^XTTPD_FEEDBACK=.*$|XTTPD_FEEDBACK=xtide-owner@fedoraproject.org|' + +cp -p %{SOURCE2} . +sed -i xttpd.service \ + -e 's|^EnvironmentFile=.*$|EnvironmentFile=-%{_sysconfdir}/sysconfig/xttpd.service.conf|' + +# Systemd stuff +# Needed by Source1 +sed -i configure.ac \ + -e '\@AM_INIT_AUTOMAKE@s|-Werror||' +autoreconf -fi # Dstr -> Dstr.h grep -rl 'include.*' . | while read f ; do sed -i.name -e 's|\(include.*\)|\1|' $f done -%patch1 -p1 -b .pid_server -%patch0 -p1 -b .pid_rc +%patch0 -p1 -b .pid # Embed version sed -i.ver \ @@ -151,6 +173,11 @@ 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 @@ -170,7 +197,9 @@ 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 @@ -179,28 +208,34 @@ 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 -# Create pid directory for xttpd -# and create tmpfile.d file -%{__mkdir_p} ${RPM_BUILD_ROOT}%{_localstatedir}/run/xttpd -%{__mkdir_p} ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d -%{__cat} > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/xttpd.conf </dev/null || : @@ -303,7 +339,7 @@ exit 0 %preun %if 0%{?use_systemd_unit} -%systemd_preun xttpd.service +%systemd_preun xttpd.socket xttpd.service %else if [ $1 = 0 ] ; then /sbin/service xttpd stop &>/dev/null @@ -343,7 +379,9 @@ exit 0 %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README README-QUICK +%doc AUTHORS README README-QUICK +%doc scripts/DOS/.xtide.xml +%license COPYING # xtide %{_mandir}/man1/*tide.1* @@ -354,20 +392,31 @@ 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 -%attr(0750,xttpd,xttpd) %dir %{_localstatedir}/run/xttpd -%{_prefix}/lib/tmpfiles.d/xttpd.conf +%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 +* Sun Jan 3 2016 Mamoru TASAKA - 2.14.3-7 +- Use systemd patches provided by the upstream +- Make xttpd.socket (provided by the upstream) be symlink from + %%_sysconfdir + * Thu Dec 31 2015 Mamoru TASAKA - 2.14.3-6 - Switch to use systemd unit on F-24+ diff --git a/xttpd.service b/xttpd.service index fbbf976..8787e70 100644 --- a/xttpd.service +++ b/xttpd.service @@ -1,13 +1,16 @@ [Unit] Description=Harmonic tide clock and tide predictor (web server) Documentation=man:xttpd(8) -After=network.target +Wants=xttpd.socket [Service] -Type=forking -PIDFile=/var/run/xttpd/xttpd.pid +User=xttpd +Group=xttpd +WorkingDirectory=~ +Type=simple EnvironmentFile=-/etc/sysconfig/xttpd -ExecStart=/usr/sbin/xttpd $PORT XTTPD_FEEDBACK=$XTTPD_FEEDBACK HOME=$HOME +ExecStart=/usr/sbin/xttpd +NotifyAccess=main [Install] WantedBy=multi-user.target From 4ec3b82a18fcf17e69ada09dfe3db58ecd70ad94 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 Jan 2016 22:29:02 +0900 Subject: [PATCH 23/81] add BR: libtool --- xtide.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xtide.spec b/xtide.spec index b288008..5be934f 100644 --- a/xtide.spec +++ b/xtide.spec @@ -58,6 +58,7 @@ BuildRequires: systemd-devel # By SOURCE1 BuildRequires: automake BuildRequires: autoconf +BuildRequires: libtool %endif Requires: wvs-data From ec2ea74007e951c7f72888936f510ca0ab4afe78 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 Jan 2016 00:42:18 +0900 Subject: [PATCH 24/81] Use new configure.ac, Makefile.am provided by the upstream --- .gitignore | 1 + sources | 1 + xtide.spec | 21 ++++++++++++++++----- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c5373d7..7ceac1d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /harmonics-dwf-20141224-free.tar.bz2 /harmonics-dwf-20151227-free.tar.bz2 /systemd-patch.tar.gz +/configure.ac.temp.tar.gz diff --git a/sources b/sources index 250729e..9072c9b 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ 0f50833e6f686eca16dcb33c1719cf6c xtide-2.14.tar.bz2 1c1adf4c8a7d69547f296f783914de5d harmonics-dwf-20151227-free.tar.bz2 bb71524254f7ded08348d6e1e2268a47 systemd-patch.tar.gz +149b266ee07ab357cc8d32209085636a configure.ac.temp.tar.gz diff --git a/xtide.spec b/xtide.spec index 5be934f..bd2c229 100644 --- a/xtide.spec +++ b/xtide.spec @@ -8,7 +8,7 @@ %endif -%define fedorarel 7 +%define fedorarel 8 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -25,6 +25,9 @@ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}%{?betatag:-%bet Source1: systemd-patch.tar.gz # Upstream service file Source2: xttpd.service +# Upstream new configure.ac or so +# Renamed from temp.tar.gz +Source3: configure.ac.temp.tar.gz Source14: xtide-get_harmonics-data.sh Source20: %{name}.desktop @@ -131,7 +134,6 @@ Please read README.fedora for Fedora specific issue. %prep %setup -q -n %{name}-%{version}%{?betatag:-%{betatag}} -a 1 -a 42 - # Systemd stuff # copy sources in SOURCE1 to the proper directory cp -a systemd-patch/xtide-stuff/* . @@ -145,11 +147,17 @@ cp -p %{SOURCE2} . sed -i xttpd.service \ -e 's|^EnvironmentFile=.*$|EnvironmentFile=-%{_sysconfdir}/sysconfig/xttpd.service.conf|' +# New configure.ac, Makefile.am +%{__mkdir} temp +pushd temp +%{__gzip} -dc %SOURCE3 | %{__tar} xf - +popd +cp -pb temp/* . + + # Systemd stuff # Needed by Source1 -sed -i configure.ac \ - -e '\@AM_INIT_AUTOMAKE@s|-Werror||' -autoreconf -fi +autoreconf -i # Dstr -> Dstr.h grep -rl 'include.*' . | while read f ; do @@ -413,6 +421,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Jan 5 2016 Mamoru TASAKA - 2.14.3-8 +- Use new configure.ac, Makefile.am provided by the upstream + * Sun Jan 3 2016 Mamoru TASAKA - 2.14.3-7 - Use systemd patches provided by the upstream - Make xttpd.socket (provided by the upstream) be symlink from From 2b45de165721f7d38a4d5221877a7a8b8652b961 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 Jan 2016 00:56:58 +0900 Subject: [PATCH 25/81] add some BR --- xtide.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xtide.spec b/xtide.spec index bd2c229..8856f92 100644 --- a/xtide.spec +++ b/xtide.spec @@ -62,6 +62,9 @@ BuildRequires: systemd-devel BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool +# By SOURCE3 +BuildRequires: byacc +BuildRequires: flex %endif Requires: wvs-data From 7e8a4ac3f63451cdbe4bf0b8e549079538dee80f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 10 Jan 2016 02:17:22 +0900 Subject: [PATCH 26/81] 2.15 dev20160105 --- .gitignore | 1 + sources | 4 +--- xtide.spec | 70 +++++++++++++++++++++++++----------------------------- 3 files changed, 35 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 7ceac1d..350ab77 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /harmonics-dwf-20151227-free.tar.bz2 /systemd-patch.tar.gz /configure.ac.temp.tar.gz +/xtide-2.15-dev-20160105.tar.bz2 diff --git a/sources b/sources index 9072c9b..3c9347f 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ -0f50833e6f686eca16dcb33c1719cf6c xtide-2.14.tar.bz2 +64ec126850c96504971d69a27db08871 xtide-2.15-dev-20160105.tar.bz2 1c1adf4c8a7d69547f296f783914de5d harmonics-dwf-20151227-free.tar.bz2 -bb71524254f7ded08348d6e1e2268a47 systemd-patch.tar.gz -149b266ee07ab357cc8d32209085636a configure.ac.temp.tar.gz diff --git a/xtide.spec b/xtide.spec index 8856f92..aa9f48b 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,5 +1,5 @@ -%define mainver 2.14 -#%%define betatag dev-20141014 +%define mainver 2.15 +%define betatag dev-20160105 %define dwfdate 20151227 %global use_systemd_unit 1 @@ -8,7 +8,7 @@ %endif -%define fedorarel 8 +%define fedorarel 1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -21,13 +21,6 @@ Release: %{rel}%{?dist} URL: http://www.flaterco.com/xtide/ Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}%{?betatag:-%betatag}.tar.bz2 -# Upstream systemd patches -Source1: systemd-patch.tar.gz -# Upstream service file -Source2: xttpd.service -# Upstream new configure.ac or so -# Renamed from temp.tar.gz -Source3: configure.ac.temp.tar.gz Source14: xtide-get_harmonics-data.sh Source20: %{name}.desktop @@ -73,10 +66,16 @@ 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 @@ -136,30 +135,24 @@ tideEditor. Please read README.fedora for Fedora specific issue. %prep -%setup -q -n %{name}-%{version}%{?betatag:-%{betatag}} -a 1 -a 42 -# Systemd stuff -# copy sources in SOURCE1 to the proper directory -cp -a systemd-patch/xtide-stuff/* . -sed -i systemd-patch/systemd-stuff/xttpd.socket \ - -e 's|ListenStream=80|ListenStream=8080|' -sed -i systemd-patch/systemd-stuff/xttpdenv \ - -e 's|HFILE_PATH=/usr/local/share/xtide|HFILE_PATH=%{_datadir}/%{name}-harmonics|' \ - -e 's|^XTTPD_FEEDBACK=.*$|XTTPD_FEEDBACK=xtide-owner@fedoraproject.org|' +%if 0%{?betatag:1} +%setup -q -n %{name}-%{version}-DEVELOPMENT -a 42 +%else +%setup -q -n %{name}-%{version}%{?betatag:-%{betatag}} -a 42 +%endif -cp -p %{SOURCE2} . -sed -i xttpd.service \ +# Systemd stuff +sed -i scripts/systemd/xttpd.socket \ + -e 's|ListenStream=80|ListenStream=8080|' + +cat > scripts/systemd/xttpd.service.conf < Dstr.h @@ -235,18 +228,18 @@ echo "%{_datadir}/wvs-data/" >> %{name}.conf %if 0%{?use_systemd_unit} %{__mkdir_p} ${RPM_BUILD_ROOT}%{_unitdir} %{__install} -c -p -m 644 \ - systemd-patch/systemd-stuff/xttpd.socket \ - xttpd.service \ + scripts/systemd/xttpd.socket \ + scripts/systemd/xttpd.service \ ${RPM_BUILD_ROOT}%{_unitdir} %{__ln_s} -f \ %{_sysconfdir}/sysconfig/xttpd.socket \ ${RPM_BUILD_ROOT}%{_unitdir}/xttpd.socket %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig %{__install} -c -p -m 644 \ - systemd-patch/systemd-stuff/xttpdenv \ - $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/xttpd.service.conf + scripts/systemd/xttpd.service.conf \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ %{__install} -c -p -m 644 \ - systemd-patch/systemd-stuff/xttpd.socket \ + scripts/systemd/xttpd.socket \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/xttpd.socket %endif @@ -382,7 +375,7 @@ exit 0 %{_datadir}/%{name}-harmonics/*.tcd %files -n libxtide -%{_libdir}/libxtide.so.0* +%{_libdir}/libxtide.so.1* %files -n libxtide-devel %{_libdir}/libxtide.so @@ -424,6 +417,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Jan 10 2016 Mamoru TASAKA - 2.15-0.1.dev20160105 +- 2.15 dev20160105 + * Tue Jan 5 2016 Mamoru TASAKA - 2.14.3-8 - Use new configure.ac, Makefile.am provided by the upstream From 0be0684a141187a0fbb60cf0b9834edbc1783a32 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 16 Jan 2016 02:26:46 +0900 Subject: [PATCH 27/81] 2.15 dev20160114 --- .gitignore | 1 + sources | 2 +- xtide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 350ab77..6789d60 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /systemd-patch.tar.gz /configure.ac.temp.tar.gz /xtide-2.15-dev-20160105.tar.bz2 +/xtide-2.15-dev-20160114.tar.bz2 diff --git a/sources b/sources index 3c9347f..c4f20dd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -64ec126850c96504971d69a27db08871 xtide-2.15-dev-20160105.tar.bz2 +6bbf6d2dae82bb8281aa6c76a0295877 xtide-2.15-dev-20160114.tar.bz2 1c1adf4c8a7d69547f296f783914de5d harmonics-dwf-20151227-free.tar.bz2 diff --git a/xtide.spec b/xtide.spec index aa9f48b..d6ec073 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,5 +1,5 @@ %define mainver 2.15 -%define betatag dev-20160105 +%define betatag dev-20160114 %define dwfdate 20151227 %global use_systemd_unit 1 @@ -8,7 +8,7 @@ %endif -%define fedorarel 1 +%define fedorarel 2 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -417,6 +417,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sat Jan 16 2016 Mamoru TASAKA - 2.15-0.2.dev20160114 +- 2.15 dev20160114 + * Sun Jan 10 2016 Mamoru TASAKA - 2.15-0.1.dev20160105 - 2.15 dev20160105 From 15aa905cc92562bc0af731791ff5da53f3ea9d9b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 26 Jan 2016 22:58:26 +0900 Subject: [PATCH 28/81] 2.15 --- .gitignore | 1 + sources | 2 +- xtide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6789d60..6ff213e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /configure.ac.temp.tar.gz /xtide-2.15-dev-20160105.tar.bz2 /xtide-2.15-dev-20160114.tar.bz2 +/xtide-2.15.tar.bz2 diff --git a/sources b/sources index c4f20dd..4db328e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6bbf6d2dae82bb8281aa6c76a0295877 xtide-2.15-dev-20160114.tar.bz2 +d87d291b38f34baad189f3e618e846ee xtide-2.15.tar.bz2 1c1adf4c8a7d69547f296f783914de5d harmonics-dwf-20151227-free.tar.bz2 diff --git a/xtide.spec b/xtide.spec index d6ec073..6ae41ef 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,5 +1,5 @@ %define mainver 2.15 -%define betatag dev-20160114 +#%%define betatag dev-20160114 %define dwfdate 20151227 %global use_systemd_unit 1 @@ -8,7 +8,7 @@ %endif -%define fedorarel 2 +%define fedorarel 1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -417,6 +417,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Jan 26 2016 Mamoru TASAKA - 2.15-1 +- 2.15 + * Sat Jan 16 2016 Mamoru TASAKA - 2.15-0.2.dev20160114 - 2.15 dev20160114 From 56c66306fd7c6b5c903a4a967ea18090d227a503 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 26 Jan 2016 23:35:40 +0900 Subject: [PATCH 29/81] change BR --- xtide.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 6ae41ef..075005e 100644 --- a/xtide.spec +++ b/xtide.spec @@ -51,6 +51,7 @@ BuildRequires: libtcd-devel BuildRequires: gpsd-devel >= 3 %if %{?use_systemd_unit} BuildRequires: systemd-devel +%endif # By SOURCE1 BuildRequires: automake BuildRequires: autoconf @@ -58,7 +59,6 @@ BuildRequires: libtool # By SOURCE3 BuildRequires: byacc BuildRequires: flex -%endif Requires: wvs-data Requires: xorg-x11-fonts-base From a7ae0bc2fc2f0e2238f48249aec3c4bbf0d3917d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 Feb 2016 03:10:09 +0900 Subject: [PATCH 30/81] F-24: mass rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 075005e..171c2a7 100644 --- a/xtide.spec +++ b/xtide.spec @@ -8,7 +8,7 @@ %endif -%define fedorarel 1 +%define fedorarel 2 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -417,6 +417,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sat Feb 6 2016 Mamoru TASAKA - 2.15-2 +- F-24: mass rebuild + * Tue Jan 26 2016 Mamoru TASAKA - 2.15-1 - 2.15 From 622a915d4fa7e6b7b88cd72f79ec779b9b7ed2a6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Feb 2016 01:01:37 +0900 Subject: [PATCH 31/81] 2.15.1 --- .gitignore | 1 + sources | 2 +- xtide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6ff213e..9619490 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /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 diff --git a/sources b/sources index 4db328e..ce90301 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d87d291b38f34baad189f3e618e846ee xtide-2.15.tar.bz2 +a0e6ed814bb583d826971ea4a6b8a164 xtide-2.15.1.tar.bz2 1c1adf4c8a7d69547f296f783914de5d harmonics-dwf-20151227-free.tar.bz2 diff --git a/xtide.spec b/xtide.spec index 171c2a7..fed987b 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,4 +1,4 @@ -%define mainver 2.15 +%define mainver 2.15.1 #%%define betatag dev-20160114 %define dwfdate 20151227 @@ -8,7 +8,7 @@ %endif -%define fedorarel 2 +%define fedorarel 1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -417,6 +417,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Feb 28 2016 Mamoru TASAKA - 2.15.1-1 +- 2.15.1 + * Sat Feb 6 2016 Mamoru TASAKA - 2.15-2 - F-24: mass rebuild From aacf67f7e6b914acfc7de122d5c3f1f33f77becd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 2 Jan 2017 00:05:42 +0900 Subject: [PATCH 32/81] harmonics data update --- .gitignore | 1 + sources | 4 ++-- xtide.spec | 7 +++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9619490..ca3be97 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /xtide-2.15-dev-20160114.tar.bz2 /xtide-2.15.tar.bz2 /xtide-2.15.1.tar.bz2 +/harmonics-dwf-20161231-free.tar.bz2 diff --git a/sources b/sources index ce90301..41a4ba8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a0e6ed814bb583d826971ea4a6b8a164 xtide-2.15.1.tar.bz2 -1c1adf4c8a7d69547f296f783914de5d harmonics-dwf-20151227-free.tar.bz2 +SHA512 (xtide-2.15.1.tar.bz2) = 3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448 +SHA512 (harmonics-dwf-20161231-free.tar.bz2) = a9e5cf2adeef45ba0c842e534e2ada3e0ff202f0d2ca2a7b0186da09d61876feee6d47fa6208e6ae5f687f3896d678f4ce6bfe5a111e6cc0d7bb5c8e793f2351 diff --git a/xtide.spec b/xtide.spec index fed987b..7ab4b85 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,6 +1,6 @@ %define mainver 2.15.1 #%%define betatag dev-20160114 -%define dwfdate 20151227 +%define dwfdate 20161231 %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')} @@ -417,6 +417,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Mon Jan 2 2017 Mamoru TASAKA - 2.15.1-2 +- harmonics data update + * Sun Feb 28 2016 Mamoru TASAKA - 2.15.1-1 - 2.15.1 From a3cf05dc1672e56411e80fe06e353848c98ddca3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 2 Jan 2017 00:33:08 +0900 Subject: [PATCH 33/81] add BR: systemd for macro --- xtide.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xtide.spec b/xtide.spec index 7ab4b85..944fb77 100644 --- a/xtide.spec +++ b/xtide.spec @@ -50,6 +50,7 @@ BuildRequires: libdstr-devel BuildRequires: libtcd-devel BuildRequires: gpsd-devel >= 3 %if %{?use_systemd_unit} +BuildRequires: systemd BuildRequires: systemd-devel %endif # By SOURCE1 From 519ba9b4465ba9d565a3e4be01fe3aba3677b45c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 15 Feb 2017 11:07:20 +0900 Subject: [PATCH 34/81] F-26: mass rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 944fb77..9deea0e 100644 --- a/xtide.spec +++ b/xtide.spec @@ -8,7 +8,7 @@ %endif -%define fedorarel 2 +%define fedorarel 3 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -418,6 +418,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Wed Feb 15 2017 Mamoru TASAKA - 2.15.1-3 +- F-26: mass rebuild + * Mon Jan 2 2017 Mamoru TASAKA - 2.15.1-2 - harmonics data update From 0ae6d3b6b692021fbf3c0e8906e51fae1d879908 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 21:27:00 +0000 Subject: [PATCH 35/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 9deea0e..11572fe 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 @@ -418,6 +418,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Mon May 15 2017 Fedora Release Engineering - 2.15.1-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Wed Feb 15 2017 Mamoru TASAKA - 2.15.1-3 - F-26: mass rebuild From 7515e151b42cea2f4b097a8864d9e7722d2a7350 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 22 Sep 2017 12:25:37 +0900 Subject: [PATCH 36/81] F-28: rebuild for gpsd --- xtide.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xtide.spec b/xtide.spec index 11572fe..daa7bb0 100644 --- a/xtide.spec +++ b/xtide.spec @@ -8,7 +8,7 @@ %endif -%define fedorarel 3 +%define fedorarel 4 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -17,7 +17,7 @@ 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 @@ -418,6 +418,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Fri Sep 22 2017 Mamoru TASAKA - 2.15.1-4 +- F-28: rebuild for gpsd + * Mon May 15 2017 Fedora Release Engineering - 2.15.1-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From 3d2bd080883aed325eaeab193380e7ffac441ef6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jan 2018 22:55:39 +0100 Subject: [PATCH 37/81] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- xtide.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/xtide.spec b/xtide.spec index daa7bb0..e707a8c 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 @@ -306,8 +306,6 @@ cp -a harmonics-dwf-%{dwfdate}/[A-Z]* \ rm -rf $RPM_BUILD_ROOT%{_libdir}/libxtide.{a,la} %post -touch --no-create %{_datadir}/icons/hicolor || : - %if 0%{?use_systemd_unit} %systemd_post xttpd.socket xttpd.service %else @@ -354,10 +352,6 @@ fi %endif exit 0 -%posttrans -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -exit 0 - %post -n libxtide -p /sbin/ldconfig %postun -n libxtide -p /sbin/ldconfig @@ -418,6 +412,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Thu Jan 18 2018 Igor Gnatenko - 2.15.1-4.1 +- Remove obsolete scriptlets + * Fri Sep 22 2017 Mamoru TASAKA - 2.15.1-4 - F-28: rebuild for gpsd From 16a2306121428660def579191f8cd64d694a8fd3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 15 Feb 2018 14:23:42 +0900 Subject: [PATCH 38/81] harmonics data update (20180101) --- .gitignore | 1 + sources | 2 +- xtide.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ca3be97..79722c6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /xtide-2.15.tar.bz2 /xtide-2.15.1.tar.bz2 /harmonics-dwf-20161231-free.tar.bz2 +/harmonics-dwf-20180101-free.tar.bz2 diff --git a/sources b/sources index 41a4ba8..9d6ac9c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (xtide-2.15.1.tar.bz2) = 3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448 -SHA512 (harmonics-dwf-20161231-free.tar.bz2) = a9e5cf2adeef45ba0c842e534e2ada3e0ff202f0d2ca2a7b0186da09d61876feee6d47fa6208e6ae5f687f3896d678f4ce6bfe5a111e6cc0d7bb5c8e793f2351 +SHA512 (harmonics-dwf-20180101-free.tar.bz2) = c252c99b85e2bf87e11f6334339d1919d9e63b797ba25b08189b8d2dfe98a352550d14ffc54c253c09845f2bce02981b8049c95654b14c34a77d687f4aeed27f diff --git a/xtide.spec b/xtide.spec index e707a8c..cdcb24e 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,6 +1,6 @@ %define mainver 2.15.1 #%%define betatag dev-20160114 -%define dwfdate 20161231 +%define dwfdate 20180101 %global use_systemd_unit 1 %if 0%{?fedora} <= 23 @@ -8,7 +8,7 @@ %endif -%define fedorarel 4 +%define fedorarel 5 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -17,7 +17,7 @@ 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 @@ -412,6 +412,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Thu Feb 15 2018 Mamoru TASAKA - 2.15.1-5 +- harmonics data update (20180101) + * Thu Jan 18 2018 Igor Gnatenko - 2.15.1-4.1 - Remove obsolete scriptlets From 82ac4ffc252e05656c99bd36deadbbf02ac1fcd5 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 9 Jul 2018 23:56:12 -0500 Subject: [PATCH 39/81] Remove needless use of %defattr --- xtide.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index cdcb24e..d9f5a3f 100644 --- a/xtide.spec +++ b/xtide.spec @@ -377,7 +377,6 @@ exit 0 %{_includedir}/libxtide/ %files -%defattr(-,root,root,-) %doc AUTHORS README README-QUICK %doc scripts/DOS/.xtide.xml From 34399763a80b1baeb1752c2455b50b1d534c7851 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 Jul 2018 22:22:41 +0900 Subject: [PATCH 40/81] =?UTF-8?q?=E3=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xtide.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xtide.spec b/xtide.spec index d9f5a3f..cdcb24e 100644 --- a/xtide.spec +++ b/xtide.spec @@ -377,6 +377,7 @@ exit 0 %{_includedir}/libxtide/ %files +%defattr(-,root,root,-) %doc AUTHORS README README-QUICK %doc scripts/DOS/.xtide.xml From cdcd07d06099e6f7e70bc94e976e4e7816b6f6c2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 16 Jul 2018 12:33:50 +0900 Subject: [PATCH 41/81] rebuild --- xtide.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index cdcb24e..6d21f1c 100644 --- a/xtide.spec +++ b/xtide.spec @@ -8,7 +8,7 @@ %endif -%define fedorarel 5 +%define fedorarel 6 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -41,6 +41,7 @@ Patch0: xtide-2.12.1-rcscript-pidfile.patch License: GPLv3+ Group: Applications/Engineering +BuildRequires: gcc-c++ BuildRequires: libXaw-devel BuildRequires: libXext-devel BuildRequires: libpng-devel @@ -412,6 +413,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Mon Jul 15 2018 Mamoru TASAKA - 2.15.1-6 +- F-29: mass rebuild + * Thu Feb 15 2018 Mamoru TASAKA - 2.15.1-5 - harmonics data update (20180101) From 5437052eba7592989311e27021b547ec62188c77 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 2 Jan 2019 15:38:26 +0900 Subject: [PATCH 42/81] harmonics data update (20181227) --- .gitignore | 1 + sources | 2 +- xtide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 79722c6..5ac5bfe 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /xtide-2.15.1.tar.bz2 /harmonics-dwf-20161231-free.tar.bz2 /harmonics-dwf-20180101-free.tar.bz2 +/harmonics-dwf-20181227-free.tar.bz2 diff --git a/sources b/sources index 9d6ac9c..1000d44 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (xtide-2.15.1.tar.bz2) = 3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448 -SHA512 (harmonics-dwf-20180101-free.tar.bz2) = c252c99b85e2bf87e11f6334339d1919d9e63b797ba25b08189b8d2dfe98a352550d14ffc54c253c09845f2bce02981b8049c95654b14c34a77d687f4aeed27f +SHA512 (harmonics-dwf-20181227-free.tar.bz2) = 34d19d0b6fd08f40f3ad222b37378b54d619e079c4488e918dc8fdd5fd78e5705eca850554e256793b65b55a58256eede213274c0cd2e4d007fb50007f0c81cf diff --git a/xtide.spec b/xtide.spec index 6d21f1c..3c21b29 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,6 +1,6 @@ %define mainver 2.15.1 #%%define betatag dev-20160114 -%define dwfdate 20180101 +%define dwfdate 20181227 %global use_systemd_unit 1 %if 0%{?fedora} <= 23 @@ -8,7 +8,7 @@ %endif -%define fedorarel 6 +%define fedorarel 7 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -413,6 +413,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Wed Jan 2 2019 Mamoru TASAKA - 2.15.1-7 +- harmonics data update (20181227) + * Mon Jul 15 2018 Mamoru TASAKA - 2.15.1-6 - F-29: mass rebuild From 7eb3111915510c3ed0f9b41a088635ef3e669ec4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:22 +0100 Subject: [PATCH 43/81] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- xtide.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xtide.spec b/xtide.spec index 3c21b29..58abe8c 100644 --- a/xtide.spec +++ b/xtide.spec @@ -353,8 +353,7 @@ fi %endif exit 0 -%post -n libxtide -p /sbin/ldconfig -%postun -n libxtide -p /sbin/ldconfig +%ldconfig_scriptlets -n libxtide %files common %doc README.fedora From abc88c5a4e48e75ed7993ec1a368c929ce51ca6b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 27 Jan 2019 13:23:16 +0100 Subject: [PATCH 44/81] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- xtide.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xtide.spec b/xtide.spec index 58abe8c..8e1aa9e 100644 --- a/xtide.spec +++ b/xtide.spec @@ -322,10 +322,6 @@ if [ $1 -ge 1 ] ; then /sbin/service xttpd condrestart &>/dev/null || : fi %endif -[ $1 -eq 0 ] || exit 0 - -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : exit 0 From dbb4cc293ec17d266bebaad9401ddff52caf8bc7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:32 +0100 Subject: [PATCH 45/81] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xtide.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xtide.spec b/xtide.spec index 8e1aa9e..8d731be 100644 --- a/xtide.spec +++ b/xtide.spec @@ -39,7 +39,6 @@ Source42: ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tar. Patch0: xtide-2.12.1-rcscript-pidfile.patch License: GPLv3+ -Group: Applications/Engineering BuildRequires: gcc-c++ BuildRequires: libXaw-devel @@ -81,19 +80,16 @@ Requires(post): /sbin/chkconfig %package -n libxtide Summary: XTide library -Group: System Environment/Libraries License: GPLv3+ %package -n libxtide-devel Summary: Development files for libxtide -Group: Development/Libraries License: GPLv3+ Requires: libxtide%{?_isa} = %{version}-%{release} %package common Summary: Xtide common files -Group: Applications/Engineering License: Public Domain Requires: bzip2 Requires: wget From 2b7fa77d878c1f4c752639afa1045c3dae84a52f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 Feb 2019 12:44:04 +0900 Subject: [PATCH 46/81] F-30: mass rebuild --- xtide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtide.spec b/xtide.spec index 8d731be..6cd3292 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 @@ -404,6 +404,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Feb 05 2019 Mamoru TASAKA - 2.15.1-7.1 +- F-30: mass rebuild + * Wed Jan 2 2019 Mamoru TASAKA - 2.15.1-7 - harmonics data update (20181227) From 75b370bb4a1170f02b1bf853e3ba39262cb13f7b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 26 Feb 2019 13:43:38 +0900 Subject: [PATCH 47/81] 2.15.2 --- .gitignore | 1 + sources | 2 +- xtide.spec | 19 ++++++++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5ac5bfe..673f69f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /harmonics-dwf-20161231-free.tar.bz2 /harmonics-dwf-20180101-free.tar.bz2 /harmonics-dwf-20181227-free.tar.bz2 +/xtide-2.15.2.tar.bz2 diff --git a/sources b/sources index 1000d44..b022f84 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xtide-2.15.1.tar.bz2) = 3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448 +SHA512 (xtide-2.15.2.tar.bz2) = adfcaeb0f87defb5918d80651b90de47f5afd5cf651fcf12fc1d02d970e8ac3fec613445b91464e72806037cfa9e576b880c8d361d3062f1bc3bc2df58da1ba6 SHA512 (harmonics-dwf-20181227-free.tar.bz2) = 34d19d0b6fd08f40f3ad222b37378b54d619e079c4488e918dc8fdd5fd78e5705eca850554e256793b65b55a58256eede213274c0cd2e4d007fb50007f0c81cf diff --git a/xtide.spec b/xtide.spec index 6cd3292..ad05dec 100644 --- a/xtide.spec +++ b/xtide.spec @@ -1,4 +1,4 @@ -%define mainver 2.15.1 +%define mainver 2.15.2 #%%define betatag dev-20160114 %define dwfdate 20181227 @@ -8,7 +8,7 @@ %endif -%define fedorarel 7 +%define fedorarel 1 %define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')} @@ -17,7 +17,7 @@ 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 @@ -170,6 +170,15 @@ sed -i.ver \ # 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=|' \ + -e 's|hardcode_libdir_flag_spec_CXX=|kill_hardcode_libdir_flag_spec_CXX=|' \ + %{nil} +sed -i.rpath ltmain.sh \ + -e 's|\$finalize_rpath|\$finalize_no_rpath|' \ + %{nil} + %build # Build with experimental SVG support export CFLAGS="%{optflags} -DJGFeatures" @@ -187,6 +196,7 @@ export CXXFLAGS="%{optflags} -DJGFeatures" --with-xttpd-user=xttpd \ --with-xttpd-group=xttpd + %{__make} %{?_smp_mflags} -k echo "%{_datadir}/xtide-harmonics/" > %{name}.conf @@ -404,6 +414,9 @@ exit 0 %{_datadir}/man/man8/xttpd.8* %changelog +* Tue Feb 26 2019 Mamoru TASAKA - 2.15.2-1 +- 2.15.2 + * Tue Feb 05 2019 Mamoru TASAKA - 2.15.1-7.1 - F-30: mass rebuild From df605a97bbf6cdeb823c58c657034373f53ea29d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 28 Jan 2020 13:38:05 +0900 Subject: [PATCH 48/81] 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 49/81] 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 50/81] 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 51/81] 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 52/81] 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 53/81] 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 54/81] 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 55/81] 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 56/81] 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 57/81] 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 58/81] 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 59/81] 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 60/81] 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 61/81] 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 62/81] 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 63/81] 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 64/81] 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 65/81] 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 66/81] 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 67/81] 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 68/81] 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 69/81] 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 70/81] 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 71/81] 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 72/81] 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 73/81] 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 74/81] 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 75/81] 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 76/81] 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 77/81] 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 78/81] 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 79/81] 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 80/81] 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 81/81] 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