[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/eject/devel eject-2.1.1-config.patch, NONE, 1.1 eject-2.1.1-po.patch, NONE, 1.1 eject-2.1.1-verbose.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 eject.spec, 1.17, 1.18 sources, 1.6, 1.7 eject-2.0.13-BLKRRPART.patch, 1.1, NONE eject-2.0.13-header.patch, 1.1, NONE eject-2.0.13-scsi.patch, 1.1, NONE eject-2.0.13-tw.patch, 1.1, NONE



Author: than

Update of /cvs/dist/rpms/eject/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13746

Modified Files:
	.cvsignore eject.spec sources 
Added Files:
	eject-2.1.1-config.patch eject-2.1.1-po.patch 
	eject-2.1.1-verbose.patch 
Removed Files:
	eject-2.0.13-BLKRRPART.patch eject-2.0.13-header.patch 
	eject-2.0.13-scsi.patch eject-2.0.13-tw.patch 
Log Message:
- update to 2.1.1
- remove eject-2.0.13-scsi.patch, which included in new upstream


eject-2.1.1-config.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE eject-2.1.1-config.patch ---
--- eject-2.1.1/Makefile.am.tn	2005-08-24 11:41:40.000000000 +0200
+++ eject-2.1.1/Makefile.am	2005-08-24 11:42:32.000000000 +0200
@@ -4,7 +4,7 @@
 
 SUBDIRS = po
 
-AM_CPPFLAGS = -I/usr/src/linux -I/usr/src/linux/include -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG
+AM_CPPFLAGS = -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG
 AM_CFLAGS = -Wall -O3 $(RPM_OPT_FLAGS)
 
 man_MANS = eject.1 volname.1
--- eject-2.1.1/Makefile.in.tn	2005-08-24 11:42:39.000000000 +0200
+++ eject-2.1.1/Makefile.in	2005-08-24 11:42:57.000000000 +0200
@@ -165,7 +165,7 @@
 eject_SOURCES = eject.c
 volname_SOURCES = volname.c
 SUBDIRS = po
-AM_CPPFLAGS = -I/usr/src/linux -I/usr/src/linux/include -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG
+AM_CPPFLAGS = -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG
 AM_CFLAGS = -Wall -O3 $(RPM_OPT_FLAGS)
 man_MANS = eject.1 volname.1
 EXTRA_DIST = $(man_MANS) PORTING PROBLEMS bootstrap eject-$(VERSION).lsm eject-$(VERSION).spec debian/changelog debian/control debian/copyright debian/dirs debian/files debian/rules debian/substvars po/*.pot po/*.po po/Makefile i18n.h

eject-2.1.1-po.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eject-2.1.1-po.patch ---
--- eject-2.1.1/po/Makefile.tn	2005-08-24 11:58:59.000000000 +0200
+++ eject-2.1.1/po/Makefile	2005-08-24 11:59:15.000000000 +0200
@@ -4,7 +4,7 @@
 MODIR = $(PREFIX)/share/locale
 POTFILES = ../*.c ../*.h
 #   ZH translation does not work
-POFILES= de.po fr.po ja.po es.po
+POFILES= de.po fr.po ja.po es.po zh_TW.po
 D_NLS= zh_TW.Big5
 
 all:

eject-2.1.1-verbose.patch:
 eject.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE eject-2.1.1-verbose.patch ---
--- eject-2.1.1/eject.c.tn	2005-08-24 11:27:42.000000000 +0200
+++ eject-2.1.1/eject.c	2005-08-24 11:33:05.000000000 +0200
@@ -638,7 +638,9 @@
 	unsigned char sense_buffer[32];
 
 	if ((ioctl(fd, SG_GET_VERSION_NUM, &k) < 0) || (k < 30000)) {
-	  printf("not an sg device, or old sg driver\n");
+	  if (v_option) {
+		  printf(_("not an sg device, or old sg driver\n"));
+	  }
 	  return 0;
 	}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Sep 2004 04:28:44 -0000	1.6
+++ .cvsignore	24 Aug 2005 10:30:57 -0000	1.7
@@ -1 +1,2 @@
 eject-2.0.13.tar.gz
+eject-2.1.1.tar.gz


Index: eject.spec
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/eject.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- eject.spec	12 May 2005 09:23:45 -0000	1.17
+++ eject.spec	24 Aug 2005 10:31:07 -0000	1.18
@@ -1,18 +1,17 @@
 Summary: A program that ejects removable media using software control.
 Name: eject
-Version: 2.0.13
-Release: 15
+Version: 2.1.1
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
 Source1: eject-zh_TW.po
 Patch: eject-2.0.12-autoclose.patch
-Patch1: eject-2.0.13-header.patch
+Patch1: eject-2.1.1-config.patch
 Patch2: eject-2.0.13-use-mountpoints.patch
 Patch3: eject-2.0.13-finddev.patch
-Patch4: eject-2.0.13-BLKRRPART.patch
-Patch5: eject-2.0.13-scsi.patch
-Patch6: eject-2.0.13-tw.patch
+Patch5: eject-2.1.1-verbose.patch
+Patch6: eject-2.1.1-po.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 URL: http://www.pobox.com/~tranter
 ExcludeArch: s390 s390x
@@ -30,16 +29,14 @@
 %prep
 %setup -q
 %patch -p0 -b .autoclose
-%patch1 -p1 -b .misc
+%patch1 -p1 -b .config
 %patch2 -p1 -b .volume
 %patch3 -p1 -b .finddev
-%patch4 -p1 -b .scsi
-%patch5 -p1 -b .depscsi
+%patch5 -p1 -b .versbose
 %patch6 -p1 -b .tw
 
 %build
-rm -f po/zh_TW*
-cp -f %{SOURCE1} po/zh_TW.po
+cp -f %{SOURCE1} po/zh_TW.Big5.po
 
 %configure
 
@@ -63,6 +60,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Aug 24 2005 Than Ngo <than redhat com> 2.1.1-1
+- update to 2.1.1
+- remove eject-2.0.13-scsi.patch, which included in new upstream
+
 * Thu May 12 2005 Than Ngo <than redhat com> 2.0.13-15
 - add better translation for zh_TW #157519,
   thanks to Wei-Lun Chao


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Sep 2004 04:28:44 -0000	1.6
+++ sources	24 Aug 2005 10:31:07 -0000	1.7
@@ -1 +1 @@
-b796ad77beb4e7bdd08d6149701ab778  eject-2.0.13.tar.gz
+b363341e249d915204043564cb620a38  eject-2.1.1.tar.gz


--- eject-2.0.13-BLKRRPART.patch DELETED ---


--- eject-2.0.13-header.patch DELETED ---


--- eject-2.0.13-scsi.patch DELETED ---


--- eject-2.0.13-tw.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]