diff --git a/.gitignore b/.gitignore index 2bbb906..f59cc1e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ twlog-2.7.src.tar.gz -/twlog-3.4.src.tar.gz diff --git a/sources b/sources index 05353dc..4cfcd4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (twlog-3.4.src.tar.gz) = f85f5b69c2de871088f84d0f3ce61727809e970b37046b102771690aaf409808571eaa58bd2da20aee2c36a5973dfcab7fbbfb1b00caaebc402012ae26044cbd +89c3ba7a3650a8cb118935595fe264ce twlog-2.7.src.tar.gz diff --git a/twlog-2.7.configure.patch b/twlog-2.7.configure.patch new file mode 100644 index 0000000..b3eedac --- /dev/null +++ b/twlog-2.7.configure.patch @@ -0,0 +1,13 @@ +diff -up ./configure.diff ./configure +--- ./configure.diff 2010-06-19 15:16:52.000000000 -0400 ++++ ./configure 2010-07-19 17:23:50.698318130 -0400 +@@ -5805,7 +5805,9 @@ then + tw_save_LDFLAGS="$LDFLAGS" + for i in \ + /usr/lib \ ++ /usr/lib64 \ + /usr/lib/X11 \ ++ /usr/lib64/X11 \ + /usr/X11R6/lib \ + /usr/X11/lib + do diff --git a/twlog-3.4.desktop.patch b/twlog-2.7.desktop.patch similarity index 100% rename from twlog-3.4.desktop.patch rename to twlog-2.7.desktop.patch diff --git a/twlog-2.7.makefiles.patch b/twlog-2.7.makefiles.patch new file mode 100644 index 0000000..bdf3e38 --- /dev/null +++ b/twlog-2.7.makefiles.patch @@ -0,0 +1,26 @@ +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-3.4.configure.patch b/twlog-3.4.configure.patch deleted file mode 100644 index 696a4c6..0000000 --- a/twlog-3.4.configure.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up ./configure.diff ./configure ---- ./configure.diff 2010-06-19 15:16:52.000000000 -0400 -+++ ./configure 2010-07-30 20:08:25.821309670 -0400 -@@ -5386,7 +5386,7 @@ else - # /usr/lesstif is used on Linux (Lesstif). - # /usr/openwin is used on Solaris (X and Athena). - # Other directories are just guesses. --for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \ -+for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/lib64 /usr/local/lib \ - /usr/lib/Motif2.1 /usr/lib/Motif2.0 /usr/lib/Motif1.2 \ - /usr/lib/X11 /usr/lib/X11R6 /usr/lib/X11R5 \ - /usr/X11/lib /usr/X11R6/lib /usr/X11R5/lib \ -@@ -5684,11 +5684,14 @@ else - # Locate it and put its directory in `xbae_libraries' - # - # Other directories are just guesses. -- for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \ -- /usr/lib/Xbae \ -+ for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/lib64 /usr/local/lib \ -+ /usr/lib/Xbae /usr/lib64/Xbae \ - /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \ -+ /usr/lib64/X11R6 /usr/lib64/X11R5 /usr/lib64/X11R4 /usr/lib64/X11 \ - /usr/dt/lib /usr/openwin/lib \ - /usr/dt/*/lib /opt/*/lib /usr/lib/Xbae* \ -+ /usr/dt/lib /usr/openwin/lib \ -+ /usr/dt/*/lib64 /opt/*/lib64 /usr/lib64/Xbae* \ - /usr/lesstif*/lib /usr/lib/Lesstif* \ - "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \ - "${prefix}"/lib/* /usr/lib/* /usr/local/lib/* \ -@@ -5805,9 +5808,13 @@ 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/X11/lib \ -+ /usr/X11R6/lib64 \ -+ /usr/X11/lib64 - do - LDFLAGS="$tw_save_LDFLAGS -L$i" - as_ac_File=`$as_echo "ac_cv_file_$i/libXpm.so" | $as_tr_sh` diff --git a/twlog-configure-c99.patch b/twlog-configure-c99.patch deleted file mode 100644 index 4873749..0000000 --- a/twlog-configure-c99.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 306dfcd..9f0246f 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,178 +1,79 @@ -# https://gcc.gnu.org/gcc-10/porting_to.html#common -%define _legacy_common_support 1 - Name: twlog -Version: 3.4 -Release: 14%{?dist} +Version: 2.7 +Release: 2%{?dist} Summary: Records basic ham radio log information -# 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 - +Group: Applications/Communications +License: GPLv2+ +URL: http://wa0eir.home.mchsi.com/%{name}.html # .desktop patch Patch0: %{name}-%{version}.desktop.patch -Patch1: twlog-configure-c99.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 +# Wrapper script to install user defaults +Source1: %{name}.sh.in +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils -BuildRequires: gcc -BuildRequires: make BuildRequires: xbae-devel +BuildRequires: desktop-file-utils %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 -%autosetup -p1 +%setup -q +%patch0 -p1 -b %{name}-%{version}.desktop.patch +%patch1 -p1 -b %{name}-%{version}.makefiles.patch +%patch2 -p1 -b %{name}-%{version}.configure.patch # Set perms on source file chmod 644 ./src/adif.c %build %configure -%make_build +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install -%make_install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT # Install provided icon -mkdir -p %{buildroot}/%{_datadir}/pixmaps/ -install -p -D -m 0644 ./src/icons/%{name}.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ +install -p -D -m 0644 ./src/icons/%{name}_14x32.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.png desktop-file-install \ - --dir=%{buildroot}%{_datadir}/applications/ \ - %{buildroot}/%{_datadir}/applications/%{name}.desktop + --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ + $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop # Move original binary to libexecdir -mkdir -p %{buildroot}/%{_libexecdir}/ -mv %{buildroot}/%{_bindir}/%{name} %{buildroot}/%{_libexecdir}/%{name}-bin +mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/ +mv $RPM_BUILD_ROOT/%{_bindir}/%{name} $RPM_BUILD_ROOT/%{_libexecdir}/%{name}-bin # Install wrapper script installs needed files in users home directory. -install -p -D -m 0755 %{SOURCE1} %{buildroot}/%{_bindir}/%{name} +install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/%{name} # Twlog default settings -mkdir -p %{buildroot}/%{_datadir}/X11/app-defaults/ -install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlog +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/ +install -p -D -m 0644 ./src/Twlog $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/Twlog +%clean +rm -rf $RPM_BUILD_ROOT %files -%doc AUTHORS NEWS README TODO ChangeLog THANKS -%license COPYING +%defattr(-,root,root,-) +%doc AUTHORS COPYING NEWS README TODO ChangeLog THANKS %{_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 - -* Sat Jul 14 2018 Fedora Release Engineering - 2.7-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.7-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 2.7-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.7-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.7-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 2.7-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Oct 16 2015 Kalev Lember - 2.7-12 -- Rebuilt for libXm soname bump - -* Fri Jun 19 2015 Fedora Release Engineering - 2.7-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 2.7-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.7-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 2.7-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 2.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 2.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 2.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 2.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 30 2010 Randall "Randy" Berry, N3LRX - 2.7-3 -- Rebuild for F14/Rawhide - * Mon Jul 19 2010 Randall "Randy" Berry, N3LRX - 2.7-2 - Apply configure patch to search proper library directories on x86_64