rpms/mtx/devel mtx-1.3.12-argc.patch, NONE, 1.1 mtx-1.3.12-destdir.patch, NONE, 1.1 mtx.spec, 1.29, 1.30

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/mtx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10318

Modified Files:
	mtx.spec 
Added Files:
	mtx-1.3.12-argc.patch mtx-1.3.12-destdir.patch 
Log Message:
* Thu Nov 19 2009 Dan Horák <dan[at]danny.cz> 1.3.12-5
- dropped debug output when tools are called with wrong number of arguments (#538403)
- added patch to support DESTDIR for installing


mtx-1.3.12-argc.patch:
 loaderinfo.c |    1 -
 tapeinfo.c   |    2 --
 2 files changed, 3 deletions(-)

--- NEW FILE mtx-1.3.12-argc.patch ---
>From f8e0af006f6a85243f0882ed08d31016032531b1 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 19 Nov 2009 15:45:54 +0100
Subject: [PATCH 2/2] remove the weird debugging-like info
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

The loaderinfo and tapeinfo utilities print a debugging-like information
about the number of arguments on command line when started with wrong number
of arguments.

Signed-off-by: Dan Horák <dan at danny.cz>
---
 mtx/loaderinfo.c |    1 -
 mtx/tapeinfo.c   |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/mtx/loaderinfo.c b/mtx/loaderinfo.c
index 534666f..27d22d9 100644
--- a/mtx/loaderinfo.c
+++ b/mtx/loaderinfo.c
@@ -488,7 +488,6 @@ int main(int argc, char **argv)
 	argv0=argv[0];
 	if (argc != 3)
 	{
-		fprintf(stderr,"argc=%d",argc);
 		usage();
 	}
 
diff --git a/mtx/tapeinfo.c b/mtx/tapeinfo.c
index 4d9c283..67547a6 100644
--- a/mtx/tapeinfo.c
+++ b/mtx/tapeinfo.c
@@ -933,7 +933,6 @@ int main(int argc, char **argv)
 
 	if (argc != 3)
 	{
-		fprintf(stderr,"argc=%d",argc);
 		usage();
 	}
 
-- 
1.6.3.3


mtx-1.3.12-destdir.patch:
 Makefile.in |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE mtx-1.3.12-destdir.patch ---
>From a5d4d1c2fbdad8b24c2938b00406bccb037e5ab4 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sat, 24 Jan 2009 18:06:43 +0100
Subject: [PATCH 1/2] add support for DESTDIR
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit


Signed-off-by: Dan Horák <dan at danny.cz>
---
 mtx/Makefile.in |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mtx/Makefile.in b/mtx/Makefile.in
index 6b967cf..05894d2 100644
--- a/mtx/Makefile.in
+++ b/mtx/Makefile.in
@@ -33,6 +33,7 @@ INSTALL_DOC = $(INSTALL) -m 644
 INSTALL_BIN = $(INSTALL) -m 755
 INSTALL_DIR = $(INSTALL) -m 755 -d
 
+DESTDIR		=
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 sbindir		= @sbindir@
@@ -109,13 +110,13 @@ all:	$(BINS)
 dbgs: $(DBGS)
 
 install: $(BINS)
-	$(INSTALL_DIR) $(sbindir)
+	$(INSTALL_DIR) $(DESTDIR)$(sbindir)
 	for file in $(BINS); do \
-	$(INSTALL_BIN) "$$file" $(sbindir) ; \
+	$(INSTALL_BIN) "$$file" $(DESTDIR)$(sbindir) ; \
 	done	
-	$(INSTALL_DIR) $(mandir) $(mandir)/man1
+	$(INSTALL_DIR) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1
 	for file in mtx.1 tapeinfo.1 scsitape.1 scsieject.1 loaderinfo.1 ; do \
-	$(INSTALL_DOC) "$$file"  $(mandir)/man1 ; \
+	$(INSTALL_DOC) "$$file"  $(DESTDIR)$(mandir)/man1 ; \
 	done
 
 clean:
-- 
1.6.3.3



Index: mtx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtx/devel/mtx.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- mtx.spec	25 Jul 2009 15:21:04 -0000	1.29
+++ mtx.spec	19 Nov 2009 16:20:32 -0000	1.30
@@ -1,10 +1,15 @@
 Name: mtx
 Version: 1.3.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: SCSI media changer control program
 License: GPLv2
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# http://mtx.opensource-sw.net/bugs/view.php?id=9
+Patch0: %{name}-1.3.12-destdir.patch
+# http://mtx.opensource-sw.net/bugs/view.php?id=13
+# https://bugzilla.redhat.com/show_bug.cgi?id=538403
+Patch1: %{name}-1.3.12-argc.patch
 URL: http://mtx.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,6 +28,9 @@ tape at a time, you should install MTX.
 %prep
 %setup -q
 
+%patch0 -p2 -b .destdir
+%patch1 -p2 -b .argc
+
 # remove exec permission
 chmod a-x contrib/config_sgen_solaris.sh contrib/mtx-changer
 
@@ -35,7 +43,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %clean
@@ -51,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 19 2009 Dan Horák <dan[at]danny.cz> 1.3.12-5
+- dropped debug output when tools are called with wrong number of arguments (#538403)
+- added patch to support DESTDIR for installing
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild