rpms/mt-st/devel mt-st-1.1-SDLT.patch, NONE, 1.1 mt-st-1.1-mtio.patch, NONE, 1.1 mt-st-1.1-redhat.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 mt-st.spec, 1.27, 1.28 sources, 1.6, 1.7 mt-st-0.7-SDLT.patch, 1.1, NONE mt-st-0.8-redhat.patch, 1.1, NONE mt-st-0.9b-mtio.patch, 1.1, NONE

Dan Horak (sharkcz) fedora-extras-commits at redhat.com
Mon Aug 4 09:20:06 UTC 2008 

Author: sharkcz

Update of /cvs/pkgs/rpms/mt-st/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14965

Modified Files:
	.cvsignore mt-st.spec sources 
Added Files:
	mt-st-1.1-SDLT.patch mt-st-1.1-mtio.patch 
	mt-st-1.1-redhat.patch 
Removed Files:
	mt-st-0.7-SDLT.patch mt-st-0.8-redhat.patch 
	mt-st-0.9b-mtio.patch 
Log Message:
* Mon Aug  4 2008 Dan Horak <dan[at]danny.cz> - 1.1-1
- update to upstream version 1.1
- rebase patches


mt-st-1.1-SDLT.patch:

--- NEW FILE mt-st-1.1-SDLT.patch ---
--- 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"},

mt-st-1.1-mtio.patch:

--- NEW FILE mt-st-1.1-mtio.patch ---
--- 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

mt-st-1.1-redhat.patch:

--- NEW FILE mt-st-1.1-redhat.patch ---
--- 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
 
 MTDIR=$(BINDIR)
 
@@ -15,11 +16,12 @@
 	$(CC) $(CFLAGS) -o stinit stinit.c
 
 install: mt stinit
-	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
 	(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 -m 755 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)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mt-st/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Sep 2005 12:12:41 -0000	1.6
+++ .cvsignore	4 Aug 2008 09:19:35 -0000	1.7
@@ -1,2 +1 @@
-mt-st-0.8.tar.gz
-mt-st-0.9b.tar.gz
+mt-st-1.1.tar.gz


Index: mt-st.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mt-st/devel/mt-st.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mt-st.spec	26 May 2008 12:57:18 -0000	1.27
+++ mt-st.spec	4 Aug 2008 09:19:35 -0000	1.28
@@ -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 @@
 %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 @@
 
 %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 at redhat.com> - 0.9b-6
 - add init script to call /sbin/stinit (#249665)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mt-st/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Sep 2005 12:12:41 -0000	1.6
+++ sources	4 Aug 2008 09:19:35 -0000	1.7
@@ -1 +1 @@
-c80e992a8d16def7af7421549b26ce77  mt-st-0.9b.tar.gz
+fdd5f5ec673c9f630a102ceff7612774  mt-st-1.1.tar.gz


--- mt-st-0.7-SDLT.patch DELETED ---


--- mt-st-0.8-redhat.patch DELETED ---


--- mt-st-0.9b-mtio.patch DELETED ---

More information about the scm-commits mailing list