[ax25-tools] Upstream update, upload new source
Randall 'Randy' Berry
dp67 at fedoraproject.org
Mon Jun 27 15:16:31 UTC 2011
commit 6653659655bf469a3f1f51e6edb9e2ad5278d2c5
Author: dp67 <dp67 at fedoraproject.org>
Date: Mon Jun 27 11:16:19 2011 -0400
Upstream update, upload new source
ax25-tools.png | Bin 0 -> 3707 bytes
ax25-tools.spec | 146 +++++++++++++++++++++++++++++++++++++++++++++------
smdiag.desktop | 11 ++++
xfhdlcchpar.desktop | 11 ++++
xfhdlcsd.desktop | 11 ++++
xfsmdiag.desktop | 11 ++++
xfsmmixer.desktop | 11 ++++
7 files changed, 185 insertions(+), 16 deletions(-)
---
diff --git a/ax25-tools.png b/ax25-tools.png
new file mode 100644
index 0000000..68d6cf1
Binary files /dev/null and b/ax25-tools.png differ
diff --git a/ax25-tools.spec b/ax25-tools.spec
index 162769b..14c04c5 100755
--- a/ax25-tools.spec
+++ b/ax25-tools.spec
@@ -1,25 +1,100 @@
-Name: ax25-tools
-Version: 0.0.9
-Release: 6%{?dist}
-Summary: Tools used to configure an ax.25 enabled computer
-Group: Applications/Communications
-License: GPLv2+
-URL: http://www.linux-ax25.org/wiki/LinuxAX25
-Source0: http://www.linux-ax25.org/cvsweb/%{name}/%{name}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: ax25-tools
+Version: 0.0.10
+Release: 0.1.rc2%{?dist}
+Summary: Tools used to configure an ax.25 enabled computer
+Group: Applications/Communications
+License: GPLv2+
+URL: http://www.linux-ax25.org/wiki/LinuxAX25
+
+#Actual tarball URL http://www.linux-ax25.org/cvsweb/ax25-tools/ax25-tools.tar.gz?tarball=1
+Source0: http://www.linux-ax25.org/cvsweb/ax25-tools/ax25-tools.tar.gz
+Source1: smdiag.desktop
+Source2: xfhdlcchpar.desktop
+Source3: xfhdlcsd.desktop
+Source4: xfsmdiag.desktop
+Source5: xfsmmixer.desktop
+#Temporary Icon
+Source6: %{name}.png
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automake
-BuildRequires: libax25-devel
-BuildRequires: ncurses-devel
-BuildRequires: libXt-devel
+BuildRequires: libax25-devel
+BuildRequires: ncurses-devel
+BuildRequires: libXt-devel
BuildRequires: libXi-devel
BuildRequires: fltk-devel
-
+BuildRequires: libX11-devel
+BuildRequires: desktop-file-utils
%description
ax25-tools is a collection of tools that are used to configure an ax.25 enabled
computer. They will configure interfaces and assign callsigns to ports as well
-as Net/ROM and ROSE configuration.
+as Net/ROM and ROSE configuration. This package only contains the command
+line programs; the GUI programs are contained in ax25-tools-x package.
+
+ * m6pack - handle multiple 6pack TNCs on a single interface
+ * ax25d - general purpose AX.25, NET/ROM and Rose daemon
+ * axctl - configure/Kill running AX.25 connections
+ * axparms - configure AX.25 interfaces
+ * axspawn - allow automatic login to a Linux system
+ * beacon - transmit periodic messages on an AX.25 port
+ * bpqparms - configure BPQ ethernet devices
+ * mheardd - display AX.25 calls recently heard
+ * rxecho - transparently route AX.25 packets between ports
+ * mheard - collect information about packet activity
+ * dmascc_cfg - configure dmascc devices
+ * sethdlc - get/set Linux HDLC packet radio modem driver port information
+ * smmixer - get/set Linux soundcard packet radio modem driver mixer
+ * kissattach - Attach a KISS or 6PACK interface
+ * kissnetd - create a virtual network
+ * kissparms - configure KISS TNCs
+ * mkiss - attach multiple KISS interfaces
+ * net2kiss - convert a network AX.25 driver to a KISS stream on a pty
+ * netromd - send and receive NET/ROM routing messages
+ * nodesave - saves NET/ROM routing information
+ * nrattach - start a NET/ROM interface
+ * nrparms - configure a NET/ROM interface
+ * nrsdrv - KISS to NET/ROM serial converter
+ * rsattach - start a ROSE interface
+ * rsdwnlnk - user exit from the ROSE network
+ * rsmemsiz - monitor the ROSE subsystem
+ * rsusers.sh - monitor AX.25, NET/ROM and ROSE users
+ * rsparms - configure a ROSE interface
+ * rsuplnk - User entry into the ROSE network
+ * rip98d - RIP98 routing daemon
+ * ttylinkd - TTYlink daemon for AX.25, NET/ROM, ROSE and IP
+ * ax25_call - Make an AX.25 connection
+ * netrom_call - Make a NET/ROM connection
+ * rose_call - Make a ROSE connection
+ * tcp_call - Make a TCP connection
+ * yamcfg - configure a YAM interface
+
+%package x
+Summary: X tools used to configure an AX.25 enabled computer
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description x
+ax25-tools-x is a collection of tools that are used to configure an ax.25 enabled
+computer. This package contains the GUI programs to configure Baycom modem
+and sound modem.
+
+ * smdiag - Linux soundcard packet radio modem driver diagnostics utility
+ * xfhdlcchpar - kernel HDLC radio modem driver channel parameter utility
+ * xfhdlcst - kernel HDLC radio modem driver status display utility
+ * xfsmdiag - kernel soundcard radio modem driver diagnostics utility
+ * xfsmmixer - kernel soundcard radio modem driver mixer utility
+
+%package docs
+Summary: Documentation for ax25-tools and ax25-tools-x
+Group: Documentation
+
+%description docs
+ax25-tools is a collection of tools that are used to configure an ax.25 enabled
+computer. This package contains the GUI programs to configure Baycom modem
+and sound modem. This package contains the documentation for ax25-tools and
+ax25-tools-x
%prep
%setup -qn %{name}
@@ -29,27 +104,66 @@ autoreconf
%configure
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
-
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+# no upstream .desktop or icon yet so we'll use a temporary one
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
+cp %{SOURCE6} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
+desktop-file-install \
+ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
+desktop-file-install \
+ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
+desktop-file-install \
+ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3}
+desktop-file-install \
+ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE4}
+desktop-file-install \
+ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE5}
+
#don't include these twice
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
%clean
rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%doc yamdrv/README.yamdrv user_call/README.user_call tcpip/ttylinkd.README dmascc/README.dmascc
%{_bindir}/*
%{_sbindir}/*
+
+%files x
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING
+%{_bindir}/*
+%{_sbindir}/*
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/applications/*.desktop
+
+%files docs
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING
%{_mandir}/man?/*
%changelog
+* Mon Jun 27 2011 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 0.0.10-0.1.rc2
+- New upstream release
+
+* Sun Jun 26 2011 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 0.0.9-9
+- Add .desktop files for GUI applications in ax25-tools-x
+- Upload source to git
+
+* Sun Jun 26 2011 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 0.0.9-8
+- Seperate documentation into sperate package
+
+* Sun Jun 26 2011 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 0.0.9-7
+- Attempt rebuild including upstream recommendations
+- Additional BuildRequires libX11-devel
+
* Tue Jun 21 2011 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 0.0.9-6
- Rebuild test including new BRs
diff --git a/smdiag.desktop b/smdiag.desktop
new file mode 100644
index 0000000..6eefec2
--- /dev/null
+++ b/smdiag.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=smdiag
+GenericName=smdiag
+Comment=AX25-tools Linux soundcard packet radio modem driver diagnostics utility
+Exec=smdiag
+Icon=ax25-tools
+Terminal=false
+Type=Application
+Categories=Network;HamRadio;
+Version=1.0
diff --git a/xfhdlcchpar.desktop b/xfhdlcchpar.desktop
new file mode 100644
index 0000000..8a64c3c
--- /dev/null
+++ b/xfhdlcchpar.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=xfhdlcchpar
+GenericName=xfhdlcchpar
+Comment=AX25-tools kernel HDLC radio modem driver channel parameter utility
+Exec=xfhdlcchpar
+Icon=ax25-tools
+Terminal=false
+Type=Application
+Categories=Network;HamRadio;
+Version=1.0
diff --git a/xfhdlcsd.desktop b/xfhdlcsd.desktop
new file mode 100644
index 0000000..950b748
--- /dev/null
+++ b/xfhdlcsd.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=xfhdlcsd
+GenericName=xfhdlcsd
+Comment=AX25-tools kernel HDLC radio modem driver status display utility
+Exec=xfhdlcsd
+Icon=ax25-tools
+Terminal=false
+Type=Application
+Categories=Network;HamRadio;
+Version=1.0
diff --git a/xfsmdiag.desktop b/xfsmdiag.desktop
new file mode 100644
index 0000000..95eb744
--- /dev/null
+++ b/xfsmdiag.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=xfsmdiag
+GenericName=xfsmdiag
+Comment=AX25-tools kernel soundcard radio modem driver diagnostics utility
+Exec=xfsmdiag
+Icon=ax25-tools
+Terminal=false
+Type=Application
+Categories=Network;HamRadio;
+Version=1.0
diff --git a/xfsmmixer.desktop b/xfsmmixer.desktop
new file mode 100644
index 0000000..80206f4
--- /dev/null
+++ b/xfsmmixer.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=xfsmmixer
+GenericName=xfsmmixer
+Comment=AX25-tools kernel soundcard radio modem driver mixer utility
+Exec=xfsmmixer
+Icon=ax25-tools
+Terminal=false
+Type=Application
+Categories=Network;HamRadio;
+Version=1.0
More information about the scm-commits
mailing list