Rebase to 1.4

This commit is contained in:
Paweł Marciniak 2020-09-16 16:49:47 +02:00
parent 01cbdd9e1c
commit f647a4b3b3
2 changed files with 8 additions and 89 deletions

View File

@ -1,83 +0,0 @@
From 006673f4a5abd301bb519cd20fbbf2b853af4065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Fri, 26 Jun 2020 11:24:03 +0200
Subject: [PATCH 1/2] don't strip binaries on installation
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 2a9aed5..2d0c0a3 100644
--- a/Makefile
+++ b/Makefile
@@ -39,11 +39,11 @@ version.h: Makefile
install: $(PROGS)
install -d $(BINDIR) $(SBINDIR) $(MANDIR) $(MANDIR)/man1 $(MANDIR)/man8
- install -s mt $(BINDIR)
+ install mt $(BINDIR)
install -m 444 mt.1 $(MANDIR)/man1
(if [ -f $(MANDIR)/man1/mt.1.gz ] ; then \
rm -f $(MANDIR)/man1/mt.1.gz; gzip $(MANDIR)/man1/mt.1; fi)
- install -s stinit $(SBINDIR)
+ install stinit $(SBINDIR)
install -m 444 stinit.8 $(MANDIR)/man8
(if [ -f $(MANDIR)/man8/stinit.8.gz ] ; then \
rm -f $(MANDIR)/man8/stinit.8.gz; gzip $(MANDIR)/man8/stinit.8; fi)
--
2.21.3
From 4b61902077bc4733f7043a5a372d3e91f17860d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Fri, 26 Jun 2020 11:26:30 +0200
Subject: [PATCH 2/2] use a variable for the install tool
---
Makefile | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 2d0c0a3..4d22f00 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ BINDIR= $(DESTDIR)$(EXEC_PREFIX)/bin
DATAROOTDIR= $(DESTDIR)/$(PREFIX)/share
MANDIR= $(DATAROOTDIR)/man
DEFTAPE?= /dev/tape
+INSTALL= install
PROGS=mt stinit
@@ -38,13 +39,13 @@ version.h: Makefile
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DDEFTAPE='"$(DEFTAPE)"' -o $@ $<
install: $(PROGS)
- install -d $(BINDIR) $(SBINDIR) $(MANDIR) $(MANDIR)/man1 $(MANDIR)/man8
- install mt $(BINDIR)
- install -m 444 mt.1 $(MANDIR)/man1
+ $(INSTALL) -d $(BINDIR) $(SBINDIR) $(MANDIR) $(MANDIR)/man1 $(MANDIR)/man8
+ $(INSTALL) mt $(BINDIR)
+ $(INSTALL) -m 444 mt.1 $(MANDIR)/man1
(if [ -f $(MANDIR)/man1/mt.1.gz ] ; then \
rm -f $(MANDIR)/man1/mt.1.gz; gzip $(MANDIR)/man1/mt.1; fi)
- install stinit $(SBINDIR)
- install -m 444 stinit.8 $(MANDIR)/man8
+ $(INSTALL) stinit $(SBINDIR)
+ $(INSTALL) -m 444 stinit.8 $(MANDIR)/man8
(if [ -f $(MANDIR)/man8/stinit.8.gz ] ; then \
rm -f $(MANDIR)/man8/stinit.8.gz; gzip $(MANDIR)/man8/stinit.8; fi)
@@ -54,7 +55,7 @@ dist:
trap "rm -rf $$BASE" EXIT && \
DIST="$$BASE/$(RELEASEDIR)" && \
mkdir "$$DIST" && \
- install -m 0644 -p -t "$$DIST/" $(DISTFILES) && \
+ $(INSTALL) -m 0644 -p -t "$$DIST/" $(DISTFILES) && \
tar czvf $(TARFILE) -C "$$BASE" \
--owner root --group root \
$(RELEASEDIR)
--
2.21.3

View File

@ -1,13 +1,11 @@
Summary: Tool for controlling tape drives
Name: mt-st
Version: 1.3
Release: 2%{?dist}
Version: 1.4
Release: 1%{?dist}
License: GPL+
URL: https://github.com/iustin/mt-st
Source0: https://github.com/iustin/mt-st/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
Source0: https://github.com/iustin/mt-st/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1: stinit.service
# https://github.com/iustin/mt-st/pull/18
Patch0: mt-st-1.3-make.patch
BuildRequires: gcc
BuildRequires: systemd
Requires(post): systemd
@ -23,7 +21,7 @@ Install mt-st if you need a tool to manage tape drives.
%prep
%autosetup -p1
%autosetup
%build
@ -52,9 +50,13 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/stinit.service
%{_mandir}/man1/mt.1*
%{_mandir}/man8/stinit.8*
%{_unitdir}/stinit.service
%{_sysconfdir}/bash_completion.d/mt-st
%changelog
* Wed Sep 16 2020 Paweł Marciniak <sunwire+repo@gmail.com> - 1.4-1
- rebased to 1.4
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild