- update to upstream version 1.1

- rebase patches
2008-08-04 09:19:35 +00:00 · 2008-08-04 09:19:35 +00:00 · 14cf28636f
commit 14cf28636f
parent 55fe7223ba
8 changed files with 63 additions and 51 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,2 +1 @@
-mt-st-0.8.tar.gz
-mt-st-0.9b.tar.gz
+mt-st-1.1.tar.gz
--- a/mt-st-0.7-SDLT.patch
+++ b/mt-st-0.7-SDLT.patch
@ -1,11 +0,0 @@
--- mt-st-0.7/mt.c.orig	Sat Feb 22 14:48:09 2003
-+++ mt-st-0.7/mt.c	Sat Feb 22 14:50:21 2003
-@@ -220,6 +220,8 @@
-     {0x41, "DLT 40GB"},
-     {0x45, "QIC-3095-MC (TR-4)"},
-     {0x47, "TR-5"},
-+    {0x48, "Quantum SDLT220"},
-+    {0x49, "Quantum SDLT320"},
-     {0x80, "DLT 15GB uncomp. or Ecrix"},
-     {0x81, "DLT 15GB compressed"},
-     {0x82, "DLT 20GB uncompressed"},
--- a/mt-st-0.9b-mtio.patch
+++ b/mt-st-0.9b-mtio.patch
@ -1,22 +0,0 @@
--- mt-st-0.9b/mt.c.mtio	2007-02-07 08:09:43.000000000 -0500
-+++ mt-st-0.9b/mt.c	2007-02-07 08:09:43.000000000 -0500
-@@ -21,7 +21,7 @@
- #include <sys/types.h>
- #include <sys/ioctl.h>
- 
-#include "mtio.h"
-+#include <linux/mtio.h>
- 
- #ifndef DEFTAPE
- #define DEFTAPE "/dev/tape"     /* default tape device */
--- mt-st-0.9b/stinit.c.mtio	2005-08-21 14:47:51.000000000 -0400
-+++ mt-st-0.9b/stinit.c	2007-02-07 08:10:20.000000000 -0500
-@@ -22,7 +22,7 @@
- #include <linux/major.h>
- #include <scsi/sg.h>
- 
-#include "mtio.h"
-+#include <linux/mtio.h>
- 
- #ifndef FALSE
- #define TRUE 1
--- a/mt-st-1.1-SDLT.patch
+++ b/mt-st-1.1-SDLT.patch
@ -0,0 +1,11 @@
+--- mt-st-1.1/mt.c.sdlt	2008-04-27 18:49:00.000000000 +0200
+++ mt-st-1.1/mt.c	2008-08-04 08:21:54.000000000 +0200
+@@ -225,6 +225,8 @@
+     {0x45, "QIC-3095-MC (TR-4)"},
+     {0x46, "LTO-4"},
+     {0x47, "DDS-5 or TR-5"},
+    {0x48, "Quantum SDLT220"},
+    {0x49, "Quantum SDLT320"},
+     {0x51, "IBM 3592 J1A"},
+     {0x52, "IBM 3592 E05"},
+     {0x80, "DLT 15GB uncomp. or Ecrix"},
--- a/mt-st-1.1-mtio.patch
+++ b/mt-st-1.1-mtio.patch
@ -0,0 +1,22 @@
+--- mt-st-1.1/mt.c.mtio	2008-08-04 08:24:45.000000000 +0200
+++ mt-st-1.1/mt.c	2008-08-04 08:24:45.000000000 +0200
+@@ -23,7 +23,7 @@
+ #include <sys/stat.h>
+ #include <sys/utsname.h>
+ 
+-#include "mtio.h"
+#include <linux/mtio.h>
+ 
+ #ifndef DEFTAPE
+ #define DEFTAPE "/dev/tape"     /* default tape device */
+--- mt-st-1.1/stinit.c.mtio	2008-04-27 13:24:16.000000000 +0200
+++ mt-st-1.1/stinit.c	2008-08-04 08:24:45.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include <linux/major.h>
+ #include <scsi/sg.h>
+ 
+-#include "mtio.h"
+#include <linux/mtio.h>
+ 
+ #ifndef FALSE
+ #define TRUE 1
--- a/mt-st-1.1-redhat.patch
+++ b/mt-st-1.1-redhat.patch
@ -1,23 +1,25 @@
--- mt-st-0.8/Makefile.redhat	2004-04-03 11:52:08.000000000 +0200
-+++ mt-st-0.8/Makefile	2004-08-09 14:37:47.240013472 +0200
-@@ -1,7 +1,8 @@
+--- mt-st-1.1/Makefile.redhat	2008-03-01 11:50:12.000000000 +0100
+++ mt-st-1.1/Makefile	2008-08-04 08:20:01.000000000 +0200
+@@ -1,8 +1,9 @@
 -CFLAGS=  -Wall -O2
 -SBINDIR= /sbin
 -BINDIR=  /bin
+-USRBINDIR= /usr/bin
 -MANDIR= /usr/share/man
 +CFLAGS=  $(RPM_OPT_FLAGS)
 +SBINDIR= $(RPM_BUILD_ROOT)/sbin
 +BINDIR=  $(RPM_BUILD_ROOT)/bin
+USRBINDIR=  $(RPM_BUILD_ROOT)/$(bindir)
 +MANDIR= $(RPM_BUILD_ROOT)/$(mandir)
 +CC=gcc
 
- all:	mt stinit
+ MTDIR=$(BINDIR)
 
-@@ -12,11 +13,12 @@
+@@ -15,11 +16,12 @@
 	$(CC) $(CFLAGS) -o stinit stinit.c
 
 install: mt stinit
-	install -s mt $(BINDIR)
+-	install -s mt $(MTDIR)
 +	mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
 +	install -m 755 mt $(BINDIR)
 	install -c -m 444 mt.1 $(MANDIR)/man1
--- a/mt-st.spec
+++ b/mt-st.spec
@ -1,16 +1,17 @@
-Summary: Install mt-st if you need a tool to control tape drives
+Summary: Tool for controlling tape drives
 Name: mt-st
-Version: 0.9b
-Release: 6%{?dist}
+Version: 1.1
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
+URL: ftp://ftp.ibiblio.org/pub/linux/system/backup
 Source0: ftp://metalab.unc.edu/pub/Linux/system/backup/mt-st-%{version}.tar.gz
 Source1: stinit.init
-Patch0: mt-st-0.8-redhat.patch
-Patch1: mt-st-0.7-SDLT.patch
+Patch0: mt-st-1.1-redhat.patch
+Patch1: mt-st-1.1-SDLT.patch
 Patch2: mt-st-0.7-config-files.patch
 Patch3: mt-st-0.9b-manfix.patch
-Patch4: mt-st-0.9b-mtio.patch
+Patch4: mt-st-1.1-mtio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@ -30,13 +31,19 @@ Install mt-st if you need a tool to  manage tape drives.
 %patch3 -p1 -b .manfix
 %patch4 -p1 -b .mtio

+# fix encoding
+f=README.stinit
+iconv -f ISO8859-1 -t UTF-8 -o $f.new $f
+touch -r $f $f.new
+mv $f.new $f
+
 %build
 make CFLAGS="$RPM_OPT_FLAGS"

 %install
 rm -rf ${RPM_BUILD_ROOT}
 make install mandir=%{_mandir}
-install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/stinit
+install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/stinit

 %clean
 rm -rf ${RPM_BUILD_ROOT}
@ -51,13 +58,17 @@ fi

 %files
 %defattr(-,root,root)
-%doc COPYING README README.stinit mt-st-0.* stinit.def.examples
+%doc COPYING README README.stinit mt-st-1.1.lsm stinit.def.examples
 /bin/mt
 /sbin/stinit
 %{_mandir}/man[18]/*
-%config %{_sysconfdir}/rc.d/init.d/stinit
+%{_initddir}/stinit

 %changelog
+* Mon Aug  4 2008 Dan Horak <dan[at]danny.cz> - 1.1-1
+- update to upstream version 1.1
+- rebase patches
+
 * Mon May 26 2008 Radek Brich <rbrich@redhat.com> - 0.9b-6
 - add init script to call /sbin/stinit (#249665)

--- a/2
+++ b/2
@ -1 +1 @@
-c80e992a8d16def7af7421549b26ce77  mt-st-0.9b.tar.gz
+fdd5f5ec673c9f630a102ceff7612774  mt-st-1.1.tar.gz