Compare commits
45 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
797b6b826c | ||
|
|
9fd8a5c7a6 | ||
|
|
b117867994 | ||
|
|
e324addbd1 | ||
|
|
1eba3d18e9 | ||
|
|
2729fb0b5d | ||
|
|
d3b4a78e36 | ||
|
|
b94db1f005 | ||
|
|
95e9f3cbc1 | ||
|
|
2b03567a6f | ||
|
|
4846fc1dfe | ||
|
|
4a9ef816e4 | ||
|
|
561888e9c3 | ||
|
|
b7f8ce60f2 | ||
|
|
505fa89005 | ||
|
|
78b4c5765d | ||
|
|
5cfafd1d20 | ||
|
|
6c2bbf2d9c | ||
|
|
c155235b10 | ||
|
|
021e33d444 | ||
|
|
3de0a2c545 | ||
|
|
994ac70957 | ||
|
|
ce3598c1b5 | ||
|
|
7bda1f19cc | ||
|
|
54c4d9f524 | ||
|
|
3b2b39c46e | ||
|
|
9e2d6ad441 |
||
|
|
1e5c539d26 | ||
|
|
606f607fba | ||
|
|
2d52b9cbe7 | ||
|
|
709ef31072 | ||
|
|
6c2808271d | ||
|
|
fd25160c17 | ||
|
|
f4fa317c6d | ||
|
|
3b51663878 | ||
|
|
bf1be7a404 | ||
|
|
0e8f67d834 | ||
|
|
ba9ed70118 | ||
|
|
32ae99c436 | ||
|
|
8384db674d | ||
|
|
9418fd4859 | ||
|
|
def1f8fcdd | ||
|
|
ea8b0cf6a1 | ||
|
|
1922de08d6 | ||
|
|
1b00a8c454 |
9 changed files with 333 additions and 21 deletions
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
twlog-2.7.src.tar.gz
|
||||
/twlog-3.4.src.tar.gz
|
||||
21
Makefile
21
Makefile
|
|
@ -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)
|
||||
1
sources
1
sources
|
|
@ -0,0 +1 @@
|
|||
SHA512 (twlog-3.4.src.tar.gz) = f85f5b69c2de871088f84d0f3ce61727809e970b37046b102771690aaf409808571eaa58bd2da20aee2c36a5973dfcab7fbbfb1b00caaebc402012ae26044cbd
|
||||
44
twlog-3.4.configure.patch
Normal file
44
twlog-3.4.configure.patch
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
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`
|
||||
19
twlog-3.4.desktop.patch
Normal file
19
twlog-3.4.desktop.patch
Normal file
|
|
@ -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
|
||||
33
twlog-configure-c99.patch
Normal file
33
twlog-configure-c99.patch
Normal file
|
|
@ -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;
|
||||
}
|
||||
|
||||
;
|
||||
41
twlog.sh.in
Normal file
41
twlog.sh.in
Normal file
|
|
@ -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
|
||||
193
twlog.spec
Normal file
193
twlog.spec
Normal file
|
|
@ -0,0 +1,193 @@
|
|||
# https://gcc.gnu.org/gcc-10/porting_to.html#common
|
||||
%define _legacy_common_support 1
|
||||
|
||||
Name: twlog
|
||||
Version: 3.4
|
||||
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
|
||||
|
||||
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
|
||||
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
|
||||
%autosetup -p1
|
||||
|
||||
# Set perms on source file
|
||||
chmod 644 ./src/adif.c
|
||||
|
||||
%build
|
||||
%configure
|
||||
%make_build
|
||||
|
||||
|
||||
%install
|
||||
%make_install
|
||||
|
||||
# Install provided icon
|
||||
mkdir -p %{buildroot}/%{_datadir}/pixmaps/
|
||||
install -p -D -m 0644 ./src/icons/%{name}.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png
|
||||
|
||||
desktop-file-install \
|
||||
--dir=%{buildroot}%{_datadir}/applications/ \
|
||||
%{buildroot}/%{_datadir}/applications/%{name}.desktop
|
||||
|
||||
# Move original binary to libexecdir
|
||||
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} %{buildroot}/%{_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
|
||||
|
||||
|
||||
%files
|
||||
%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 <releng@fedoraproject.org> - 3.4-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 3.4-12
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Dec 06 2022 Peter Fordham <peter.fordham@gmail.com> - 3.4-7
|
||||
- Port configure script to C99
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Feb 19 2020 Richard Shaw <hobbes1069@gmail.com> - 3.4-1
|
||||
- Update to 3.4.
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Oct 16 2015 Kalev Lember <klember@redhat.com> - 2.7-12
|
||||
- Rebuilt for libXm soname bump
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Fri Jul 30 2010 Randall "Randy" Berry, N3LRX <dp67@fedoraprojecct.org> - 2.7-3
|
||||
- Rebuild for F14/Rawhide
|
||||
|
||||
* Mon Jul 19 2010 Randall "Randy" Berry, N3LRX <dp67@fedoraprojecct.org> - 2.7-2
|
||||
- Apply configure patch to search proper library directories on x86_64
|
||||
|
||||
* Sat Jul 17 2010 Randall "Randy" Berry, N3LRX <dp67@fedoraprojecct.org> - 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 <dp67@fedoraprojecct.org> - 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 <dp67@fedoraprojecct.org> - 2.6-2
|
||||
- Tweek install wrapper
|
||||
|
||||
* Mon Jul 12 2010 Randall "Randy" Berry, N3LRX <dp67@fedoraprojecct.org> - 2.6-1
|
||||
- Initial spec build
|
||||
Loading…
Add table
Add a link
Reference in a new issue