From 1b00a8c454fe67c8531c039ca4069c644d1831cc Mon Sep 17 00:00:00 2001 From: Randall 'Randy' Berry Date: Wed, 21 Jul 2010 14:14:58 +0000 Subject: [PATCH 01/44] New package first commit --- .cvsignore | 1 + import.log | 1 + sources | 1 + twlog-2.7.configure.patch | 13 ++++++ twlog-2.7.desktop.patch | 19 ++++++++ twlog-2.7.makefiles.patch | 26 +++++++++++ twlog.sh.in | 41 +++++++++++++++++ twlog.spec | 94 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 196 insertions(+) create mode 100644 import.log create mode 100644 twlog-2.7.configure.patch create mode 100644 twlog-2.7.desktop.patch create mode 100644 twlog-2.7.makefiles.patch create mode 100644 twlog.sh.in create mode 100644 twlog.spec diff --git a/.cvsignore b/.cvsignore index e69de29..f59cc1e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +twlog-2.7.src.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..d72dd30 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +twlog-2_7-2_fc13:HEAD:twlog-2.7-2.fc13.src.rpm:1279721660 diff --git a/sources b/sources index e69de29..4cfcd4c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +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-2.7.desktop.patch b/twlog-2.7.desktop.patch new file mode 100644 index 0000000..d6254e8 --- /dev/null +++ b/twlog-2.7.desktop.patch @@ -0,0 +1,19 @@ +diff -up ./twlog.desktop.old ./twlog.desktop +--- ./twlog.desktop.old 2008-01-29 14:33:47.000000000 -0500 ++++ ./twlog.desktop 2010-07-17 16:02:18.246326198 -0400 +@@ -1,10 +1,10 @@ + [Desktop Entry] + Name=twlog +-Name[en_US]=twlog +-Comment=A logging program for Ham Operators +-Comment[en_US]=A logging program for Ham Operators ++GenericName=twlog ++Comment=A logging program for Ham Radio Operators + Exec=twlog +-Icon=twlog.png ++Icon=twlog + Terminal=false + Type=Application +-Categories=Hamradio ++Categories=Network;HamRadio; ++Version=1.0 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.sh.in b/twlog.sh.in new file mode 100644 index 0000000..dbce739 --- /dev/null +++ b/twlog.sh.in @@ -0,0 +1,41 @@ +#!/bin/sh +# ***************************************************************************** +# twlog.sh.in - Install wrapper script for twlog +# ------------------- +# begin : July 12 2010 +# copyright : (C) 2010 by Randall J. Berry N3LRX +# email : dp67@fedoraproject.org +# ***************************************************************************** +# ***************************************************************************** +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU General Public License as published by * +# * the Free Software Foundation; either GPL version 2 of the License, or * +# * (at your option) any later version. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU General Public License for more details. * +# * * +# * You should have received a copy of the GNU General Public License * +# * along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * +# * * +# ***************************************************************************** + +# Wrapper script for twlog to ensure that configuration is present +twlogbin="/usr/libexec/twlog-bin" +# Check if user configuration is present +# Removed log directory, twlog already checks and if not installed it installs. +# if [ ! -e ~/.twlogDir ] +# then +# mkdir ~/.twlogDir +# fi +# Check if config file is present, if not copy user config file to ~/. If present ignore. +if [ ! -e ~/Twlog ] +then +cp /usr/share/X11/app-defaults/Twlog ~/Twlog +fi +# Launch twlog +$twlogbin diff --git a/twlog.spec b/twlog.spec new file mode 100644 index 0000000..9f0246f --- /dev/null +++ b/twlog.spec @@ -0,0 +1,94 @@ +Name: twlog +Version: 2.7 +Release: 2%{?dist} +Summary: Records basic ham radio log information +Group: Applications/Communications +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 +# Wrapper script to install user defaults +Source1: %{name}.sh.in +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +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 +%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 %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# 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 + +desktop-file-install \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ + $RPM_BUILD_ROOT/%{_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 + +# Install wrapper script installs needed files in users home directory. +install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_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 + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%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 + +%changelog +* Mon Jul 19 2010 Randall "Randy" Berry, N3LRX - 2.7-2 +- Apply configure patch to search proper library directories on x86_64 + +* Sat Jul 17 2010 Randall "Randy" Berry, N3LRX - 2.7-1 +- New upstream release +- Edit spec per review +- Added desktop-file-install to verify .desktop file + +* Thu Jul 15 2010 Randall "Randy" Berry, N3LRX - 2.6-3 +- Tweek install wrapper +- Twlog already checks for log directory. Creates it if not exists. +- Commented routine from wrapper. + +* Mon Jul 12 2010 Randall "Randy" Berry, N3LRX - 2.6-2 +- Tweek install wrapper + +* Mon Jul 12 2010 Randall "Randy" Berry, N3LRX - 2.6-1 +- Initial spec build From 1922de08d64bf5dd6ad2b7fc88183a16c8191228 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:35:00 +0000 Subject: [PATCH 02/44] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index de0d550..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: twlog -# $Id$ -NAME := twlog -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index d72dd30..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -twlog-2_7-2_fc13:HEAD:twlog-2.7-2.fc13.src.rpm:1279721660 From ea8b0cf6a1203ed6631b3dad501642d5c7949d77 Mon Sep 17 00:00:00 2001 From: "Randall J. Berry" Date: Fri, 30 Jul 2010 21:38:28 -0400 Subject: [PATCH 03/44] Rebuild for F14/Rawhide --- twlog-2.7.configure.patch | 37 ++++++++++++++++++++++++++++++++++--- twlog-2.7.makefiles.patch | 20 ++++++++++++++++++++ twlog.spec | 5 ++++- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/twlog-2.7.configure.patch b/twlog-2.7.configure.patch index b3eedac..696a4c6 100644 --- a/twlog-2.7.configure.patch +++ b/twlog-2.7.configure.patch @@ -1,7 +1,33 @@ 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 ++++ ./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 \ @@ -9,5 +35,10 @@ diff -up ./configure.diff ./configure /usr/lib/X11 \ + /usr/lib64/X11 \ /usr/X11R6/lib \ - /usr/X11/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-2.7.makefiles.patch b/twlog-2.7.makefiles.patch index bdf3e38..b41529d 100644 --- a/twlog-2.7.makefiles.patch +++ b/twlog-2.7.makefiles.patch @@ -1,3 +1,23 @@ +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 diff --git a/twlog.spec b/twlog.spec index 9f0246f..576d315 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From def1f8fcdd14f5d13b2c732e4722be6b275cce63 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 15:43:54 -0600 Subject: [PATCH 04/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 576d315..5fecc0a 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From 9418fd48590bc64a4583b24da3de52ad30079298 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:21:14 -0600 Subject: [PATCH 05/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 5fecc0a..4947d64 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From 8384db674defd20246b1e7edaea9c45ece5c1c21 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 20:07:01 -0500 Subject: [PATCH 06/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 4947d64..7803e0c 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From 32ae99c436ba2fff5a4415cae1e92564c3c71c70 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:17:29 -0600 Subject: [PATCH 07/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 7803e0c..ad250cf 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From ba9ed701186de4f5f85b2bb8527c5f94d7558415 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 00:15:30 -0500 Subject: [PATCH 08/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index ad250cf..9de424e 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From 0e8f67d8343360390ede931fae35548884e67e0a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 04:18:24 -0500 Subject: [PATCH 09/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 9de424e..8d777e0 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From bf1be7a4043ee813cb95e495633f6814aefcf0d3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 06:36:08 +0000 Subject: [PATCH 10/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 8d777e0..3ba7935 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From 3b51663878c799bbb3cd7cbd6a6ff683197a7064 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 03:36:47 +0000 Subject: [PATCH 11/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 3ba7935..03b41fd 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From f4fa317c6d505f05efa4a7c847a2b9a321730ce4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 16 Oct 2015 15:12:03 +0200 Subject: [PATCH 12/44] Rebuilt for libXm soname bump --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 03b41fd..9313d68 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From fd25160c17f77e55f04a489c7728df61843553b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:10:49 +0000 Subject: [PATCH 13/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 9313d68..5f2b448 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From 6c2808271d1679588e259299d40fe4cf377f7373 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:33:08 +0000 Subject: [PATCH 14/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 5f2b448..0d5db9c 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From 709ef31072747558a4f16a4f9ac926aae1965210 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 20:48:53 +0000 Subject: [PATCH 15/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 0d5db9c..2030975 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From 2d52b9cbe766b1dccd19e36a1672b011a183299a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:40:34 +0000 Subject: [PATCH 16/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 2030975..fe3504c 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From 606f607fba4a736ff2266cfac99451c1be4d8cb6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 19:46:26 +0000 Subject: [PATCH 17/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index fe3504c..01d99db 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %changelog +* 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 From 1e5c539d2614a7d751589fd0d51d56237350a590 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:45:53 +0100 Subject: [PATCH 18/44] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- twlog.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 01d99db..15fe30e 100644 --- a/twlog.spec +++ b/twlog.spec @@ -14,7 +14,6 @@ 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: xbae-devel BuildRequires: desktop-file-utils From 9e2d6ad4411d7c9817a29ec2734c3521c7a4161a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:56:37 +0100 Subject: [PATCH 19/44] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- twlog.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/twlog.spec b/twlog.spec index 15fe30e..f46be83 100644 --- a/twlog.spec +++ b/twlog.spec @@ -60,9 +60,6 @@ install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/%{name} 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 %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO ChangeLog THANKS From 3b2b39c46e1ed795df384d022a37c824a8ce1fea Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:52 +0200 Subject: [PATCH 20/44] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- twlog.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/twlog.spec b/twlog.spec index f46be83..214cab4 100644 --- a/twlog.spec +++ b/twlog.spec @@ -15,6 +15,7 @@ Source0: http://wa0eir.home.mchsi.com/src/%{name}-%{version}.src.tar.gz # Wrapper script to install user defaults Source1: %{name}.sh.in +BuildRequires: gcc BuildRequires: xbae-devel BuildRequires: desktop-file-utils From 54c4d9f52445d2ce1387d38909cd1802af59b115 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:39:54 -0500 Subject: [PATCH 21/44] Remove needless use of %defattr --- twlog.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 214cab4..e0e2405 100644 --- a/twlog.spec +++ b/twlog.spec @@ -62,7 +62,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/ install -p -D -m 0644 ./src/Twlog $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/Twlog %files -%defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO ChangeLog THANKS %{_bindir}/%{name} %{_libexecdir}/%{name}-bin From 7bda1f19cc26f7701dcf8abaa81a1428be6ede36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:04:38 +0000 Subject: [PATCH 22/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index e0e2405..ddc75df 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Records basic ham radio log information Group: Applications/Communications License: GPLv2+ @@ -70,6 +70,9 @@ install -p -D -m 0644 ./src/Twlog $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/T %{_datadir}/applications/%{name}.desktop %changelog +* 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 From ce3598c1b50123a16223cc8d76821d89b97e6153 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 23/44] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- twlog.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index ddc75df..c7a85aa 100644 --- a/twlog.spec +++ b/twlog.spec @@ -2,7 +2,6 @@ Name: twlog Version: 2.7 Release: 18%{?dist} Summary: Records basic ham radio log information -Group: Applications/Communications License: GPLv2+ URL: http://wa0eir.home.mchsi.com/%{name}.html # .desktop patch From 994ac70957fd5041532586436abb7f844e6d8b14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:34:03 +0000 Subject: [PATCH 24/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index c7a85aa..480c763 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Records basic ham radio log information License: GPLv2+ URL: http://wa0eir.home.mchsi.com/%{name}.html @@ -69,6 +69,9 @@ install -p -D -m 0644 ./src/Twlog $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/T %{_datadir}/applications/%{name}.desktop %changelog +* 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 From 3de0a2c54568e4fba978c88b25f544d8e95f63f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:12:58 +0000 Subject: [PATCH 25/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 480c763..3dc3dd4 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Records basic ham radio log information License: GPLv2+ URL: http://wa0eir.home.mchsi.com/%{name}.html @@ -69,6 +69,9 @@ install -p -D -m 0644 ./src/Twlog $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/T %{_datadir}/applications/%{name}.desktop %changelog +* 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 From 021e33d44489c3113198b65a79c2df4fa1242080 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:20:12 +0000 Subject: [PATCH 26/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 3dc3dd4..0fe622d 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,6 +1,6 @@ Name: twlog Version: 2.7 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Records basic ham radio log information License: GPLv2+ URL: http://wa0eir.home.mchsi.com/%{name}.html @@ -69,6 +69,9 @@ install -p -D -m 0644 ./src/Twlog $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/T %{_datadir}/applications/%{name}.desktop %changelog +* 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 From c155235b1043c36da8079d7e91b832b397a266e2 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Wed, 19 Feb 2020 11:25:51 -0600 Subject: [PATCH 27/44] Update to 3.4. --- twlog-2.7.makefiles.patch | 46 -------------- ...nfigure.patch => twlog-3.4.configure.patch | 0 ...7.desktop.patch => twlog-3.4.desktop.patch | 0 twlog.spec | 60 ++++++++++--------- 4 files changed, 33 insertions(+), 73 deletions(-) delete mode 100644 twlog-2.7.makefiles.patch rename twlog-2.7.configure.patch => twlog-3.4.configure.patch (100%) rename twlog-2.7.desktop.patch => twlog-3.4.desktop.patch (100%) 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.spec b/twlog.spec index 480c763..0ad9b97 100644 --- a/twlog.spec +++ b/twlog.spec @@ -1,19 +1,23 @@ +# 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: 1%{?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 + +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 +# .desktop patch +Patch0: %{name}-%{version}.desktop.patch +# configure patch +#Patch2: %{name}-%{version}.configure.patch + BuildRequires: gcc BuildRequires: xbae-devel BuildRequires: desktop-file-utils @@ -23,45 +27,44 @@ 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 @@ -69,6 +72,9 @@ install -p -D -m 0644 ./src/Twlog $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/T %{_datadir}/applications/%{name}.desktop %changelog +* Mon Mar 04 2019 Richard Shaw - 3.4-1 +- Update to 3.4. + * Sun Feb 03 2019 Fedora Release Engineering - 2.7-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 5cfafd1d206d26a2858e41e6030e8af606d0fdf6 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Wed, 19 Feb 2020 11:29:04 -0600 Subject: [PATCH 28/44] Upload new sources. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 From 78b4c5765de3209e6a4877bdf5c6aa56e0be3f0c Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Wed, 19 Feb 2020 11:35:37 -0600 Subject: [PATCH 29/44] Package new man page. --- twlog.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/twlog.spec b/twlog.spec index 3edfb1b..97f9a75 100644 --- a/twlog.spec +++ b/twlog.spec @@ -15,8 +15,6 @@ Source1: %{name}.sh.in # .desktop patch Patch0: %{name}-%{version}.desktop.patch -# configure patch -#Patch2: %{name}-%{version}.configure.patch BuildRequires: gcc BuildRequires: xbae-devel @@ -70,6 +68,7 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_datadir}/pixmaps/%{name}.png %{_datadir}/X11/app-defaults/Twlog %{_datadir}/applications/%{name}.desktop +%{_mandir}/man1/%{name}.1* %changelog * Wed Feb 19 2020 Richard Shaw - 3.4-1 From 505fa89005f90a23aafa042b295f70c683da6d83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:05:33 +0000 Subject: [PATCH 30/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 97f9a75..fa714db 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,7 +3,7 @@ Name: twlog Version: 3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Records basic ham radio log information License: GPLv2+ @@ -71,6 +71,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_mandir}/man1/%{name}.1* %changelog +* 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. From b7f8ce60f25cc6202ee0c1bd22ca4ab7b45c42cc Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:15:10 +0000 Subject: [PATCH 31/44] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- twlog.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/twlog.spec b/twlog.spec index fa714db..d2c18a9 100644 --- a/twlog.spec +++ b/twlog.spec @@ -16,6 +16,7 @@ Source1: %{name}.sh.in # .desktop patch Patch0: %{name}-%{version}.desktop.patch +BuildRequires: make BuildRequires: gcc BuildRequires: xbae-devel BuildRequires: desktop-file-utils From 561888e9c3513a97ef66dbcb499589f736802dc6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:29:18 +0000 Subject: [PATCH 32/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index d2c18a9..48453e8 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,7 +3,7 @@ Name: twlog Version: 3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Records basic ham radio log information License: GPLv2+ @@ -72,6 +72,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_mandir}/man1/%{name}.1* %changelog +* 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 From 4a9ef816e4d0f62d217ccf54324406c8edd7d843 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:50:23 +0000 Subject: [PATCH 33/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 48453e8..cbb8ca5 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,7 +3,7 @@ Name: twlog Version: 3.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Records basic ham radio log information License: GPLv2+ @@ -72,6 +72,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_mandir}/man1/%{name}.1* %changelog +* 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 From 4846fc1dfe912461d38bc7f55aafffe9bae89a26 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:19:24 +0000 Subject: [PATCH 34/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index cbb8ca5..7e4ab1d 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,7 +3,7 @@ Name: twlog Version: 3.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Records basic ham radio log information License: GPLv2+ @@ -72,6 +72,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_mandir}/man1/%{name}.1* %changelog +* 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 From 2b03567a6f7abd406a2e5743386da52904d61db3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:10:20 +0000 Subject: [PATCH 35/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 7e4ab1d..754642a 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,7 +3,7 @@ Name: twlog Version: 3.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Records basic ham radio log information License: GPLv2+ @@ -72,6 +72,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_mandir}/man1/%{name}.1* %changelog +* 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 From 95e9f3cbc18c2cf1f980358603f818934547230d Mon Sep 17 00:00:00 2001 From: Peter Fordham Date: Tue, 6 Dec 2022 00:49:59 +0000 Subject: [PATCH 36/44] Port confgiure to C99. https://fedoraproject.org/wiki/Toolchain/PortingToModernC https://bugzilla.redhat.com/show_bug.cgi?id=2151046 --- twlog-configure-c99.patch | 33 +++++++++++++++++++++++++++++++++ twlog.spec | 6 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 twlog-configure-c99.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 754642a..f352729 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,7 +3,7 @@ Name: twlog Version: 3.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Records basic ham radio log information License: GPLv2+ @@ -15,6 +15,7 @@ Source1: %{name}.sh.in # .desktop patch Patch0: %{name}-%{version}.desktop.patch +Patch1: twlog-configure-c99.patch BuildRequires: make BuildRequires: gcc @@ -72,6 +73,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_mandir}/man1/%{name}.1* %changelog +* 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 From b94db1f005c5d4e7d5ed9716da370fe95b13bff0 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 5 Dec 2022 19:53:46 -0600 Subject: [PATCH 37/44] Update spec formatting. --- twlog.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/twlog.spec b/twlog.spec index f352729..40b9b2c 100644 --- a/twlog.spec +++ b/twlog.spec @@ -17,10 +17,10 @@ Source1: %{name}.sh.in Patch0: %{name}-%{version}.desktop.patch Patch1: twlog-configure-c99.patch -BuildRequires: make -BuildRequires: gcc -BuildRequires: xbae-devel BuildRequires: desktop-file-utils +BuildRequires: gcc +BuildRequires: make +BuildRequires: xbae-devel %description Twlog records basic Ham log information. It was written From d3b4a78e3627f64b82d6cd06ddaa87a89962b6dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:34:31 +0000 Subject: [PATCH 38/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 40b9b2c..9de505a 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,7 +3,7 @@ Name: twlog Version: 3.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Records basic ham radio log information License: GPLv2+ @@ -73,6 +73,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_mandir}/man1/%{name}.1* %changelog +* 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 From 2729fb0b5de8f42b78fa97bcb99121d8541dce0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 16:53:20 +0000 Subject: [PATCH 39/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 9de505a..3024e48 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,7 +3,7 @@ Name: twlog Version: 3.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Records basic ham radio log information License: GPLv2+ @@ -73,6 +73,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_mandir}/man1/%{name}.1* %changelog +* 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 From 1eba3d18e983409b67a1e637ff47a92df93f5fed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 06:51:56 +0000 Subject: [PATCH 40/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 3024e48..9a8bc4e 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,7 +3,7 @@ Name: twlog Version: 3.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Records basic ham radio log information License: GPLv2+ @@ -73,6 +73,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_mandir}/man1/%{name}.1* %changelog +* 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 From e324addbd11adf7327dc70b74ec913c4050df86e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:01:49 +0000 Subject: [PATCH 41/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 9a8bc4e..75ed857 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,7 +3,7 @@ Name: twlog Version: 3.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Records basic ham radio log information License: GPLv2+ @@ -73,6 +73,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_mandir}/man1/%{name}.1* %changelog +* 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 From b1178679942c8e5e9c8e67311d62102821782c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:25:02 +0200 Subject: [PATCH 42/44] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- twlog.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/twlog.spec b/twlog.spec index 75ed857..9ef0a6d 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,9 +3,10 @@ Name: twlog Version: 3.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Records basic ham radio log information -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://wa0eir.bcts.info/twlog.html @@ -73,6 +74,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_mandir}/man1/%{name}.1* %changelog +* 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 From 9fd8a5c7a6c6ee245d2aaeb725bcae6960c01194 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:29:25 +0000 Subject: [PATCH 43/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 9ef0a6d..6724b5f 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,7 +3,7 @@ Name: twlog Version: 3.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Records basic ham radio log information # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -74,6 +74,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_mandir}/man1/%{name}.1* %changelog +* 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 From 797b6b826ca97580f305ed6028b77c6429aa8a46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:39:20 +0000 Subject: [PATCH 44/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- twlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/twlog.spec b/twlog.spec index 6724b5f..306dfcd 100644 --- a/twlog.spec +++ b/twlog.spec @@ -3,7 +3,7 @@ Name: twlog Version: 3.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Records basic ham radio log information # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -74,6 +74,9 @@ install -p -D -m 0644 ./src/Twlog %{buildroot}/%{_datadir}/X11/app-defaults/Twlo %{_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