- added optflags patch, updated URLs and build

diff --git a/ax25-apps-optflags.patch b/ax25-apps-optflags.patch
new file mode 100644 (file)
index 0000000..5da8514
--- /dev/null
+++ b/ax25-apps-optflags.patch
@@ -0,0 +1,11 @@
+--- ax25-apps-0.0.6/ax25ipd/Makefile.am.orig   2001-10-09 03:03:05.000000000 +0200
++++ ax25-apps-0.0.6/ax25ipd/Makefile.am        2023-03-24 21:30:04.906258789 +0100
+@@ -8,7 +8,7 @@ EXTRA_DIST = $(man_MANS) $(etcfiles) $(d
+ docdir = ${datadir}/doc/ax25-apps
+ doc_DATA = README.ax25ipd HISTORY.ax25ipd COPYING.ax25ipd
+ 
+-CFLAGS = -DUSE_TERMIO
++AM_CFLAGS = -DUSE_TERMIO
+ ax25ipd_LDADD = $(AX25_LIB)
+ 
+ ax25ipd_SOURCES =     \

diff --git a/ax25-apps.spec b/ax25-apps.spec
index 8f49e5324845792b123533bd438235a64980519f..d9f15eb1e19c0a238f45005fc3bfecb41c37d0a7 100644 (file)
--- a/ax25-apps.spec
+++ b/ax25-apps.spec
@@ -3,21 +3,22 @@ Summary(pl.UTF-8):    Narzędzia ax25 dla hamradio
 Name:          ax25-apps
 Version:       0.0.6
 Release:       6
-License:       GPL
+License:       GPL v2+
 Group:         Applications/Communications
-Source0:       http://dl.sourceforge.net/ax25/%{name}-%{version}.tar.gz
+Source0:       https://downloads.sourceforge.net/ax25/%{name}-%{version}.tar.gz
 # Source0-md5: 47d9a775890f3694cf47659423a69ae5
-URL:           http://ax25.sourceforge.net/
+Patch0:                %{name}-optflags.patch
+URL:           https://ax25.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libax25-devel
+BuildRequires: libax25-devel >= 0.0.8
 BuildRequires: libtool
 BuildRequires: ncurses-devel
 BuildRequires: zlib-devel
 Requires:      ax25-tools >= 0.0.8
 Requires:      libax25 >= 0.0.9
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Conflicts:     kernel <= 2.2.0
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Applications to test our AX25 connects.
@@ -27,14 +28,14 @@ Aplikacje testujące sprawność połączeń protokołu AX25.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-AM_CFLAGS="-I/usr/include/ncurses"; export AM_CFLAGS
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
 %configure
 %{__make}
 
@@ -44,14 +45,28 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install installconf \
        DESTDIR=$RPM_BUILD_ROOT
 
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/ax25-apps
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 # note: ax25ipd/COPYING.ax25ipd contains notes other than GPL
-%doc AUTHORS ChangeLog NEWS README ax25*/{COPYING,HISTORY,README}.ax25*
-%{_sysconfdir}/ax25/*
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_sbindir}/*
-%{_mandir}/man[158]/*
+%doc AUTHORS ChangeLog NEWS README ax25ipd/{COPYING,HISTORY,README}.ax25ipd ax25rtd/{README,TODO}.ax25rtd
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ax25/ax25ipd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ax25/ax25mond.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ax25/ax25rtd.conf
+%attr(755,root,root) %{_bindir}/call
+%attr(755,root,root) %{_bindir}/listen
+%attr(755,root,root) %{_sbindir}/ax25ipd
+%attr(755,root,root) %{_sbindir}/ax25mond
+%attr(755,root,root) %{_sbindir}/ax25rtctl
+%attr(755,root,root) %{_sbindir}/ax25rtd
+%{_mandir}/man1/call.1*
+%{_mandir}/man1/listen.1*
+%{_mandir}/man5/ax25ipd.conf.5*
+%{_mandir}/man5/ax25mond.conf.5*
+%{_mandir}/man8/ax25ipd.8*
+%{_mandir}/man8/ax25mond.8*