- new URLs, updated to 1.3

- updated DESTDIR,remove-unused-code patches
- License is GPL v2

diff --git a/mt-st-DESTDIR.patch b/mt-st-DESTDIR.patch
index d6b1b0c540379e7b2ea5c9d968d01a09d1f5f88f..573d82452c89903404e4d08b5826358bf1029d1c 100644 (file)
--- a/mt-st-DESTDIR.patch
+++ b/mt-st-DESTDIR.patch
@@ -1,31 +1,30 @@
---- mt-st-0.8/Makefile~        2004-04-24 16:34:33.000000000 +0200
-+++ mt-st-0.8/Makefile 2004-04-24 16:38:14.000000000 +0200
-@@ -2,6 +2,7 @@
- SBINDIR= /sbin
- BINDIR=  /bin
- MANDIR= /usr/share/man
-+SYSCONFDIR= /etc
+--- mt-st-1.3/Makefile.orig    2020-08-25 16:45:29.915116419 +0200
++++ mt-st-1.3/Makefile 2020-08-25 16:58:01.857709463 +0200
+@@ -5,6 +5,7 @@
+ BINDIR=  $(DESTDIR)$(EXEC_PREFIX)/bin
+ DATAROOTDIR= $(DESTDIR)/$(PREFIX)/share
+ MANDIR= $(DATAROOTDIR)/man
++SYSCONFDIR= $(DESTDIR)/etc
+ DEFTAPE?= /dev/tape
  
- all:  mt stinit
+ PROGS=mt stinit
+@@ -36,15 +37,16 @@
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DDEFTAPE='"$(DEFTAPE)"' -o $@ $<
  
-@@ -12,14 +13,12 @@
-       $(CC) $(CFLAGS) -o stinit stinit.c
- 
- install: mt stinit
--      install -s mt $(MTDIR)
--      install -c -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: $(PROGS)
+-      install -d $(BINDIR)  $(SBINDIR) $(MANDIR) $(MANDIR)/man1 $(MANDIR)/man8
+-      install -s mt $(BINDIR)
++      install -d $(BINDIR)  $(SBINDIR) $(MANDIR) $(MANDIR)/man1 $(MANDIR)/man8 $(SYSCONFDIR)
++      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 -c -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)
-+      install -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(SYSCONFDIR)
-+      install -s mt $(DESTDIR)$(BINDIR)
-+      install -c -m 444 mt.1 $(DESTDIR)$(MANDIR)/man1
-+      install -s stinit $(DESTDIR)$(SBINDIR)
-+      install -c -m 444 stinit.8 $(DESTDIR)$(MANDIR)/man8
-+      install stinit.def.examples $(DESTDIR)$(SYSCONFDIR)/stinit.def
++      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)
++      install -m 644 stinit.def.examples $(SYSCONFDIR)/stinit.def
  
- dist: clean
-       (mydir=`basename \`pwd\``;\
+ dist:
+       rm -f "$(TARFILE)" && \

diff --git a/mt-st-remove-unused-code.patch b/mt-st-remove-unused-code.patch
index 1fc34be1e9aea03f012e5ff6cf6b97ff89a097de..b3fc8d91c5d636c712d757e91ee81ed808add671 100644 (file)
--- a/mt-st-remove-unused-code.patch
+++ b/mt-st-remove-unused-code.patch
@@ -1,39 +1,10 @@
-diff -Nur mt-st-0.9b.orig/mtio.h mt-st-0.9b.remove-unused-code/mtio.h
---- mt-st-0.9b.orig/mtio.h     2005-08-16 22:16:28.000000000 +0300
-+++ mt-st-0.9b.remove-unused-code/mtio.h       2007-05-18 23:13:33.000000000 +0300
-@@ -10,7 +10,9 @@
- 
- #include <linux/types.h>
- #include <linux/ioctl.h>
-+#if 0
- #include <linux/qic117.h>
-+#endif
- 
- /*
-  * Structures and definitions for mag tape io control commands
-@@ -259,6 +261,7 @@
-       } fmt_arg;
- };
- 
-+#if 0
- struct mtftcmd {
-       unsigned int ft_wait_before; /* timeout to wait for drive to get ready 
-                                     * before command is sent. Milliseconds
-@@ -281,6 +284,7 @@
-                                     * command
-                                     */
- };
-+#endif
- 
- /* mag tape io control commands */
- #define       MTIOCTOP        _IOW('m', 1, struct mtop)       /* do a mag tape op */
-@@ -301,7 +305,9 @@
+--- mt-st-1.1/mtio.h.orig      2020-08-25 16:24:43.215203705 +0200
++++ mt-st-1.1/mtio.h   2020-08-25 16:24:47.328514754 +0200
+@@ -136,7 +136,6 @@
  #define MTIOCVOLINFO  _IOR('m',  8, struct mtvolinfo) /* info about volume */
  #define MTIOCGETSIZE    _IOR('m',  9, struct mttapesize)/* get cartridge size*/
  #define MTIOCFTFORMAT   _IOWR('m', 10, struct mtftformat) /* format ftape */
-+#if 0
- #define MTIOCFTCMD    _IOWR('m', 11, struct mtftcmd) /* send QIC-117 cmd */
-+#endif
+-#define MTIOCFTCMD    _IOWR('m', 11, struct mtftcmd) /* send QIC-117 cmd */
  
  /* Generic Mag Tape (device independent) status macros for examining
   * mt_gstat -- HP-UX compatible.

diff --git a/mt-st.spec b/mt-st.spec
index 04493897f9e0a9e033fb9e30894b838a81713c9d..9e5c5c5655c852383f92104b0d2cbbc67ec29f2f 100644 (file)
--- a/mt-st.spec
+++ b/mt-st.spec
@@ -8,17 +8,19 @@ Summary(ru.UTF-8):    Программы управления работой нак
 Summary(tr.UTF-8):     Manyetik teyp sürücüsünün işlevsel kontrolü (mt)
 Summary(uk.UTF-8):     Програми управління роботою накопичувачів на магнітній стрічці (mt)
 Name:          mt-st
-Version:       1.1
-Release:       2
-License:       BSD
+Version:       1.3
+Release:       1
+License:       GPL v2
 Group:         Applications/System
-Source0:       ftp://metalab.unc.edu/pub/Linux/system/backup/%{name}-%{version}.tar.gz
-# Source0-md5: fdd5f5ec673c9f630a102ceff7612774
+#Source0Download: https://github.com/iustin/mt-st/releases
+Source0:       https://github.com/iustin/mt-st/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 3b1455b194d7048436046d47d1e7362d
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: c2a75e15c360e4c8b2ef350cd6c2c45e
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-errno.h.patch
 Patch2:                %{name}-remove-unused-code.patch
+URL:           https://github.com/iustin/mt-st
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _bindir         /bin
@@ -71,8 +73,7 @@ birçok işlemin gerçekleştirilmesinde kullanılabilir.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-# seems obsolete
-#%patch2 -p1
+%patch2 -p1
 
 %build
 %{__make} \
@@ -92,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README README.stinit mt-st-*.lsm
+%doc CHANGELOG.md README.md
 %config(noreplace) %{_sysconfdir}/stinit.def
 %attr(755,root,root) %{_bindir}/mt
 %attr(755,root,root) %{_sbindir}/stinit