diff --git a/.gitignore b/.gitignore index f59cc1e..2bbb906 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ twlog-2.7.src.tar.gz +/twlog-3.4.src.tar.gz diff --git a/sources b/sources index 4cfcd4c..05353dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89c3ba7a3650a8cb118935595fe264ce twlog-2.7.src.tar.gz +SHA512 (twlog-3.4.src.tar.gz) = f85f5b69c2de871088f84d0f3ce61727809e970b37046b102771690aaf409808571eaa58bd2da20aee2c36a5973dfcab7fbbfb1b00caaebc402012ae26044cbd diff --git a/twlog-2.7.makefiles.patch b/twlog-2.7.makefiles.patch deleted file mode 100644 index b41529d..0000000 --- a/twlog-2.7.makefiles.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -up ./configure.ac.orig ./configure.ac ---- ./configure.ac.orig 2010-06-19 15:16:19.000000000 -0400 -+++ ./configure.ac 2010-07-30 20:00:01.406309130 -0400 -@@ -67,10 +67,15 @@ then - tw_save_LDFLAGS="$LDFLAGS" - for i in \ - /usr/lib \ -+ /usr/lib64 \ - /usr/lib/X11 \ -+ /usr/lib64/X11 \ - /usr/X11R6/lib \ -- /usr/X11/lib -+ /usr/X11R6/lib64 \ -+ /usr/X11/lib \ -+ /usr/X11/lib64 - do -+ - LDFLAGS="$tw_save_LDFLAGS -L$i" - AC_CHECK_FILE([$i/libXpm.so], - [AC_CHECK_LIB([Xpm], [XpmCreatePixmapFromData]) -diff -up ./Makefile.am.orig ./Makefile.am ---- ./Makefile.am.orig 2008-02-01 00:58:06.000000000 -0500 -+++ ./Makefile.am 2010-07-17 15:55:51.848322673 -0400 -@@ -22,9 +22,6 @@ install-data-local: - $(INSTALL) -d $(DESTDIR)@APP_DEFAULTS_PATH@ - $(INSTALL_DATA) src/Twlog $(DESTDIR)@APP_DEFAULTS_PATH@ - -- $(INSTALL) -d $(DESTDIR)@docdir@ -- $(INSTALL_DATA) THANKS ChangeLog README $(DESTDIR)@docdir@ -- - uninstall-local: - echo "Removing $(DESTDIR)@APP_DEFAULTS_PATH@/Twlog" - rm -rf $(DESTDIR)@APP_DEFAULTS_PATH@/Twlog -diff -up ./Makefile.in.orig ./Makefile.in ---- ./Makefile.in.orig 2010-07-05 17:39:07.000000000 -0400 -+++ ./Makefile.in 2010-07-17 15:55:36.780322815 -0400 -@@ -778,9 +778,6 @@ install-data-local: - $(INSTALL) -d $(DESTDIR)@APP_DEFAULTS_PATH@ - $(INSTALL_DATA) src/Twlog $(DESTDIR)@APP_DEFAULTS_PATH@ - -- $(INSTALL) -d $(DESTDIR)@docdir@ -- $(INSTALL_DATA) THANKS ChangeLog README $(DESTDIR)@docdir@ -- - uninstall-local: - echo "Removing $(DESTDIR)@APP_DEFAULTS_PATH@/Twlog" - rm -rf $(DESTDIR)@APP_DEFAULTS_PATH@/Twlog diff --git a/twlog-2.7.configure.patch b/twlog-3.4.configure.patch similarity index 100% rename from twlog-2.7.configure.patch rename to twlog-3.4.configure.patch diff --git a/twlog-2.7.desktop.patch b/twlog-3.4.desktop.patch similarity index 100% rename from twlog-2.7.desktop.patch rename to twlog-3.4.desktop.patch diff --git a/twlog-configure-c99.patch b/twlog-configure-c99.patch new file mode 100644 index 0000000..4873749 --- /dev/null +++ b/twlog-configure-c99.patch @@ -0,0 +1,33 @@ +Avoid an undeclared exit function calls in configure checks. +This improves compatibility with strict(er) C99 compilers, which may +not support implicit function declarations because they were removed +from the C language in 1999. + +One issues would be fixed by regeneration of configure with new autotools. +Other requires change to acinclude.m4 and then regeneration. Now response +from upstream maintainer. + +Issue tracked here: https://bugzilla.redhat.com/show_bug.cgi?id=2151046 + +diff --git a/configure b/configure +index 772cb27..a356ee6 100755 +--- a/configure ++++ b/configure +@@ -5442,7 +5442,7 @@ Display *display=NULL; + short major_version, minor_version; + Status rc; + rc=XpQueryVersion(display, &major_version, &minor_version); +-exit(0); ++return 0; + } + + ; +@@ -5690,7 +5690,7 @@ Display *display=NULL; + short major_version, minor_version; + Status rc; + rc=XpQueryVersion(display, &major_version, &minor_version); +-exit(0); ++return 0; + } + + ; diff --git a/twlog.spec b/twlog.spec index 480c763..306dfcd 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,74 +1,127 @@ +# https://gcc.gnu.org/gcc-10/porting_to.html#common +%define _legacy_common_support 1 + Name: twlog -Version: 2.7 -Release: 19%{?dist} +Version: 3.4 +Release: 14%{?dist} Summary: Records basic ham radio log information -License: GPLv2+ -URL: http://wa0eir.home.mchsi.com/%{name}.html -# .desktop patch -Patch0: %{name}-%{version}.desktop.patch -# Makefile patch -Patch1: %{name}-%{version}.makefiles.patch -# configure patch -Patch2: %{name}-%{version}.configure.patch -Source0: http://wa0eir.home.mchsi.com/src/%{name}-%{version}.src.tar.gz +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later + +URL: http://wa0eir.bcts.info/twlog.html + +Source0: http://wa0eir.bcts.info/src/%{name}-%{version}.src.tar.gz # Wrapper script to install user defaults Source1: %{name}.sh.in -BuildRequires: gcc -BuildRequires: xbae-devel +# .desktop patch +Patch0: %{name}-%{version}.desktop.patch +Patch1: twlog-configure-c99.patch + BuildRequires: desktop-file-utils +BuildRequires: gcc +BuildRequires: make +BuildRequires: xbae-devel %description Twlog records basic Ham log information. It was written for day to day logging, not contesting. There are no dupe checks or contest related features. + %prep -%setup -q -%patch0 -p1 -b %{name}-%{version}.desktop.patch -%patch1 -p1 -b %{name}-%{version}.makefiles.patch -%patch2 -p1 -b %{name}-%{version}.configure.patch +%autosetup -p1 # Set perms on source file chmod 644 ./src/adif.c %build %configure -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +%make_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # Install provided icon -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ -install -p -D -m 0644 ./src/icons/%{name}_14x32.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.png +mkdir -p %{buildroot}/%{_datadir}/pixmaps/ +install -p -D -m 0644 ./src/icons/%{name}.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png desktop-file-install \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ - $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop + --dir=%{buildroot}%{_datadir}/applications/ \ + %{buildroot}/%{_datadir}/applications/%{name}.desktop # Move original binary to libexecdir -mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/ -mv $RPM_BUILD_ROOT/%{_bindir}/%{name} $RPM_BUILD_ROOT/%{_libexecdir}/%{name}-bin +mkdir -p %{buildroot}/%{_libexecdir}/ +mv %{buildroot}/%{_bindir}/%{name} %{buildroot}/%{_libexecdir}/%{name}-bin # Install wrapper script installs needed files in users home directory. -install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/%{name} +install -p -D -m 0755 %{SOURCE1} %{buildroot}/%{_bindir}/%{name} # Twlog default settings -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/ -install -p -D -m 0644 ./src/Twlog $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/Twlog +mkdir -p %{buildroot}/%{_datadir}/X11/app-defaults/ +install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlog + %files -%doc AUTHORS COPYING NEWS README TODO ChangeLog THANKS +%doc AUTHORS NEWS README TODO ChangeLog THANKS +%license COPYING %{_bindir}/%{name} %{_libexecdir}/%{name}-bin %{_datadir}/pixmaps/%{name}.png %{_datadir}/X11/app-defaults/Twlog %{_datadir}/applications/%{name}.desktop +%{_mandir}/man1/%{name}.1* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 3.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 26 2024 Miroslav Suchý - 3.4-12 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 3.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 3.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 3.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 3.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Dec 06 2022 Peter Fordham - 3.4-7 +- Port configure script to C99 + +* Sat Jul 23 2022 Fedora Release Engineering - 3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Feb 19 2020 Richard Shaw - 3.4-1 +- Update to 3.4. + +* Fri Jan 31 2020 Fedora Release Engineering - 2.7-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.7-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 2.7-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild