From bb49016d75fc38f0eaa81e25e619d475351df966 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Apr 10 2017 14:52:53 +0000 Subject: New version Resolves: rhbz#1440339 Updated install-fix patch --- diff --git a/.gitignore b/.gitignore index 100a99d..7e5867c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /amprd-1.4.tgz /amprd-1.5.tgz +/amprd-1.6.tgz diff --git a/amprd-1.5-install-fix.patch b/amprd-1.5-install-fix.patch deleted file mode 100644 index 708afef..0000000 --- a/amprd-1.5-install-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile b/Makefile -index 818a77a..23d12bc 100644 ---- a/Makefile -+++ b/Makefile -@@ -26,5 +26,5 @@ clean: - - install: amprd - install -m 755 -p -d -D $(SCACHEDIR) -- install -m 644 -p -b -D amprd.conf.example $(CONFDIR)/amprd.conf -- install -m 755 -p -s -D amprd $(SBINDIR)/amprd -+ install -m 644 -p -D amprd.conf.example $(CONFDIR)/amprd.conf -+ install -m 755 -p -D amprd $(SBINDIR)/amprd diff --git a/amprd-1.6-install-fix.patch b/amprd-1.6-install-fix.patch new file mode 100644 index 0000000..aa69b10 --- /dev/null +++ b/amprd-1.6-install-fix.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index e74ab04..5121178 100644 +--- a/Makefile ++++ b/Makefile +@@ -26,5 +26,5 @@ clean: + + install: amprd + install -m 755 -p -d -D $(SCACHEDIR) +- install -m 644 -p -b -D amprd.conf.example $(CONFDIR)/amprd.conf.example +- install -m 755 -p -s -D amprd $(SBINDIR)/amprd ++ install -m 644 -p -D amprd.conf.example $(CONFDIR)/amprd.conf ++ install -m 755 -p -D amprd $(SBINDIR)/amprd diff --git a/amprd.spec b/amprd.spec index 7429c3f..ff39e9f 100644 --- a/amprd.spec +++ b/amprd.spec @@ -8,7 +8,7 @@ Summary: An user-space IPIP encapsulation daemon for the ampr network Name: amprd -Version: 1.5 +Version: 1.6 Release: 1%{?dist} License: GPLv3+ Group: Applications/Communications @@ -19,7 +19,7 @@ Requires(preun): systemd Requires(postun): systemd Source0: http://www.yo2loj.ro/hamprojects/%{name}-%{version}.tgz Source1: amprd.service -Patch0: amprd-1.5-install-fix.patch +Patch0: amprd-1.6-install-fix.patch %description An user-space IPIP encapsulation daemon with automatic RIPv2 multicast @@ -29,7 +29,7 @@ inside the daemon and it offers one or more virtual TUN interfaces to the system for your 44net traffic. %prep -%setup -qc +%setup -q %patch0 -p1 -b .install-fix dos2unix minGlue.h @@ -66,6 +66,11 @@ install -Dpm 644 -t %{buildroot}%{_datadir}/%{name} startup_example.sh interface %{_unitdir}/amprd.service %changelog +* Mon Apr 10 2017 Jaroslav Škarvada - 1.6-1 +- New version + Resolves: rhbz#1440339 + Updated install-fix patch + * Tue Apr 4 2017 Jaroslav Škarvada - 1.5-1 - New version Resolves: rhbz#1438614 diff --git a/sources b/sources index c0cfee3..7864323 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amprd-1.5.tgz) = 6d722e49bd4a829df6bac5c7fb26df1a156e6f6d189f52ea58d5589972966fd372fbaad35984ffc1bdd95e129c2773ac717719815b80eaab51ba1a8a925900d8 +SHA512 (amprd-1.6.tgz) = 251fe23278271139e47530f938265a54a05153f2ac8c2d8f339c1864961b2c85d8f906289771ce71b3f1e651da04f45f9528e68ed0e75b1576ede33c67413c93