New version
Resolves: rhbz#1457860
This commit is contained in:
Jaroslav Škarvada
parent
409c7283cf
commit
c2105f5fb6
9 changed files with 58 additions and 8 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -2,3 +2,4 @@
|
|||
/uronode-2.3.1.tar.gz
|
||||
/uronode-2.5.1.tgz
|
||||
/uronode-2.6.tar.gz
|
||||
/uronode-2.7.tar.gz
|
||||
|
|
|
|||
13
patch.patch
Normal file
13
patch.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/configure b/configure
|
||||
index 923f672..f168280 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5,6 +5,8 @@ if [ "$answer" = "Y" -o "$answer" = "y" -o "$answer" = "" ]
|
||||
then NON_INTERACTIVE=0;
|
||||
else NON_INTERACTIVE=1;
|
||||
fi
|
||||
+echo ".$answer."
|
||||
+echo ".$NON_INTERACTIVE."
|
||||
|
||||
_sleep()
|
||||
{
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
e8829f7769e7f1fc602ddfaddefea90e uronode-2.6.tar.gz
|
||||
SHA512 (uronode-2.7.tar.gz) = 3b45d1d3ad934e97e2d02a3e75c9bb774c0dedf7cc0e053ead2748684d8cc3c3c46ffeb96452b268517e9f30d52e3b915a9031c163777e167cb7f3e190ded7c0
|
||||
|
|
|
|||
1
uronode-2.7
Submodule
1
uronode-2.7
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit a100c14d19d9d0ef9839a694239b63611d740572
|
||||
BIN
uronode-2.7-1.fc27.src.rpm
Normal file
BIN
uronode-2.7-1.fc27.src.rpm
Normal file
Binary file not shown.
25
uronode-2.7-configure-non-interactive.patch
Normal file
25
uronode-2.7-configure-non-interactive.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
diff --git a/configure b/configure
|
||||
index 923f672..f859cc6 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1,9 +1,16 @@
|
||||
#!/bin/sh
|
||||
|
||||
-echo -n "Use interactive mode? [Y/n]: "; read answer
|
||||
-if [ "$answer" = "Y" -o "$answer" = "y" -o "$answer" = "" ]
|
||||
- then NON_INTERACTIVE=0;
|
||||
- else NON_INTERACTIVE=1;
|
||||
+if [ "$NON_INTERACTIVE" = 1 ]
|
||||
+then
|
||||
+ echo "Using non-interactive installation, if you want interactive mode"
|
||||
+ echo "unset NON_INTERACTIVE environment variable prior running configure"
|
||||
+ echo "by e.g.: unset NON_INTERACTIVE"
|
||||
+else
|
||||
+ echo -n "Use interactive mode? [Y/n]: "; read answer
|
||||
+ if [ "$answer" = "Y" -o "$answer" = "y" -o "$answer" = "" ]
|
||||
+ then NON_INTERACTIVE=0;
|
||||
+ else NON_INTERACTIVE=1;
|
||||
+ fi
|
||||
fi
|
||||
|
||||
_sleep()
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/Makefile.in b/Makefile.in
|
||||
index daebe36..e1f1d0d 100644
|
||||
index a549299..cacc4d2 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -27,34 +27,34 @@ CALIBRATE_OBJS = $(CALIBRATE_SRC:.c=.o)
|
||||
@@ -27,35 +27,35 @@ CALIBRATE_OBJS = $(CALIBRATE_SRC:.c=.o)
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
|
||||
install: installbin installman installhelp installconf
|
||||
|
|
@ -41,6 +41,7 @@ index daebe36..e1f1d0d 100644
|
|||
|
||||
installconf: installhelp
|
||||
- install -b -m 755 -D -d $(ETC_DIR)
|
||||
- install -b -m 600 -p etc/uronode.announce $(ETC_DIR)
|
||||
- install -b -m 600 -p etc/uronode.conf $(ETC_DIR)
|
||||
- install -b -m 600 -p etc/uronode.perms $(ETC_DIR)
|
||||
- install -b -m 600 -p etc/uronode.info $(ETC_DIR)
|
||||
|
|
@ -49,6 +50,7 @@ index daebe36..e1f1d0d 100644
|
|||
- install -b -m 600 -p etc/uronode.routes $(ETC_DIR)
|
||||
- install -b -m 600 -p etc/flexd.conf $(ETC_DIR)
|
||||
+ install -m 755 -D -d $(ETC_DIR)
|
||||
+ install -m 644 -p etc/uronode.announce $(ETC_DIR)
|
||||
+ install -m 644 -p etc/uronode.conf $(ETC_DIR)
|
||||
+ install -m 600 -p etc/uronode.perms $(ETC_DIR)
|
||||
+ install -m 644 -p etc/uronode.info $(ETC_DIR)
|
||||
|
|
@ -85,10 +87,10 @@ index aca87b5..774d11f 100644
|
|||
ZLIB = @ZLIB@
|
||||
\ No newline at end of file
|
||||
diff --git a/config.h.in b/config.h.in
|
||||
index 6f8845d..a13b18f 100644
|
||||
index 5d488af..51dc57c 100644
|
||||
--- a/config.h.in
|
||||
+++ b/config.h.in
|
||||
@@ -24,14 +24,14 @@
|
||||
@@ -25,14 +25,14 @@
|
||||
#define AX_ROUTES_FILE "@ETC_DIR@/uronode.routes"
|
||||
#define CONF_USERS_FILE "@ETC_DIR@/uronode.users"
|
||||
#define FLEXD_CONF_FILE "@ETC_DIR@/flexd.conf"
|
||||
BIN
uronode-2.7.tar.gz
Normal file
BIN
uronode-2.7.tar.gz
Normal file
Binary file not shown.
14
uronode.spec
14
uronode.spec
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
Summary: Alternative packet radio system for Linux
|
||||
Name: uronode
|
||||
Version: 2.6
|
||||
Release: 2%{?dist}
|
||||
Version: 2.7
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/Communications
|
||||
URL: http://uronode.sourceforge.net
|
||||
|
|
@ -24,7 +24,9 @@ Source3: uronode.socket
|
|||
Source4: uronode.xinetd
|
||||
Source5: uronode-README.fedora
|
||||
# Sent upstream
|
||||
Patch0: uronode-2.5.1-install-fix.patch
|
||||
Patch0: uronode-2.7-install-fix.patch
|
||||
# Sent upstream
|
||||
Patch1: uronode-2.7-configure-non-interactive.patch
|
||||
|
||||
%description
|
||||
URONode is an alternative packet radio system for Linux. It supports
|
||||
|
|
@ -34,6 +36,7 @@ various IP functions, and ANSI colors.
|
|||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .install-fix
|
||||
%patch1 -p1 -b .configure-non-interactive
|
||||
|
||||
# Copy Fedora readme into place
|
||||
cp -p %{SOURCE5} README.fedora
|
||||
|
|
@ -86,6 +89,7 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations
|
|||
%{_sbindir}/*
|
||||
%{_mandir}/*/*
|
||||
%config(noreplace) %{_sysconfdir}/ax25/flexd.conf
|
||||
%config(noreplace) %{_sysconfdir}/ax25/uronode.announce
|
||||
%config(noreplace) %{_sysconfdir}/ax25/uronode.conf
|
||||
%config(noreplace) %{_sysconfdir}/ax25/uronode.info
|
||||
%config(noreplace) %{_sysconfdir}/ax25/uronode.motd
|
||||
|
|
@ -106,6 +110,10 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations
|
|||
%ghost %{_var}/lib/flexd/destinations
|
||||
|
||||
%changelog
|
||||
* Thu Jun 1 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 2.7-1
|
||||
- New version
|
||||
Resolves: rhbz#1457860
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue