rpms/eject/devel eject-2.1.1-verbose.patch, 1.1, 1.2 eject-2.1.5-lock.patch, 1.2, 1.3 eject-2.1.5-opendevice.patch, 1.1, 1.2 eject-2.1.5-umount.patch, 1.4, 1.5 eject.spec, 1.42, 1.43
Kamil Dudka
kdudka at fedoraproject.org
Tue Feb 2 09:58:43 UTC 2010
Author: kdudka
Update of /cvs/extras/rpms/eject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26246
Modified Files:
eject-2.1.1-verbose.patch eject-2.1.5-lock.patch
eject-2.1.5-opendevice.patch eject-2.1.5-umount.patch
eject.spec
Log Message:
- eliminated rpmlint warnings (#225720)
eject-2.1.1-verbose.patch:
eject.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: eject-2.1.1-verbose.patch
===================================================================
RCS file: /cvs/extras/rpms/eject/devel/eject-2.1.1-verbose.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eject-2.1.1-verbose.patch 24 Aug 2005 10:31:07 -0000 1.1
+++ eject-2.1.1-verbose.patch 2 Feb 2010 09:58:42 -0000 1.2
@@ -1,6 +1,8 @@
---- 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 @@
+diff --git a/eject.c b/eject.c
+index b14d5f2..662ba54 100644
+--- a/eject.c
++++ b/eject.c
+@@ -709,7 +709,9 @@ static int EjectScsi(int fd)
unsigned char sense_buffer[32];
if ((ioctl(fd, SG_GET_VERSION_NUM, &k) < 0) || (k < 30000)) {
eject-2.1.5-lock.patch:
eject.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 52 insertions(+), 2 deletions(-)
Index: eject-2.1.5-lock.patch
===================================================================
RCS file: /cvs/extras/rpms/eject/devel/eject-2.1.5-lock.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- eject-2.1.5-lock.patch 17 Jul 2008 20:00:25 -0000 1.2
+++ eject-2.1.5-lock.patch 2 Feb 2010 09:58:42 -0000 1.3
@@ -1,6 +1,7 @@
-diff -up ./eject.c.lock ./eject.c
---- ./eject.c.lock 2008-07-17 15:48:42.000000000 -0400
-+++ ./eject.c 2008-07-17 15:53:52.000000000 -0400
+diff --git a/eject.c b/eject.c
+index 54e79f7..bfccd37 100644
+--- a/eject.c
++++ b/eject.c
@@ -116,6 +116,7 @@ int d_option = 0;
int f_option = 0;
int h_option = 0;
@@ -43,7 +44,7 @@ diff -up ./eject.c.lock ./eject.c
#ifdef GETOPTLONG
static struct option long_options[] =
{
-@@ -223,6 +226,7 @@ static void parse_args(int argc, char **
+@@ -223,6 +226,7 @@ static void parse_args(int argc, char **argv, char **device)
{"default", no_argument, NULL, 'd'},
{"auto", required_argument, NULL, 'a'},
{"changerslot", required_argument, NULL, 'c'},
@@ -51,7 +52,7 @@ diff -up ./eject.c.lock ./eject.c
{"trayclose", no_argument, NULL, 't'},
{"traytoggle", no_argument, NULL, 'T'},
{"cdspeed", required_argument, NULL, 'x'},
-@@ -297,6 +301,21 @@ static void parse_args(int argc, char **
+@@ -297,6 +301,21 @@ static void parse_args(int argc, char **argv, char **device)
usage();
exit(0);
break;
@@ -73,7 +74,7 @@ diff -up ./eject.c.lock ./eject.c
case 'm':
m_option = 1;
break;
-@@ -482,6 +501,30 @@ static char *FindDevice(const char *name
+@@ -482,6 +501,30 @@ static char *FindDevice(const char *name)
}
@@ -104,7 +105,7 @@ diff -up ./eject.c.lock ./eject.c
/* Set or clear auto-eject mode. */
static void AutoEject(int fd, int onOff)
{
-@@ -1227,6 +1270,13 @@ int main(int argc, char **argv)
+@@ -1231,6 +1274,13 @@ int main(int argc, char **argv)
exit(0);
}
eject-2.1.5-opendevice.patch:
eject.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
Index: eject-2.1.5-opendevice.patch
===================================================================
RCS file: /cvs/extras/rpms/eject/devel/eject-2.1.5-opendevice.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eject-2.1.5-opendevice.patch 30 Oct 2006 14:53:46 -0000 1.1
+++ eject-2.1.5-opendevice.patch 2 Feb 2010 09:58:42 -0000 1.2
@@ -1,6 +1,8 @@
---- eject.c 2006/02/11 01:54:38 1.8
-+++ eject.c 2006/06/11 22:48:16 1.9
-@@ -543,10 +543,11 @@
+diff --git a/eject.c b/eject.c
+index 79fd01b..d67089c 100644
+--- a/eject.c
++++ b/eject.c
+@@ -543,10 +543,11 @@ static void ToggleTray(int fd)
#ifdef CDROMCLOSETRAY
@@ -15,7 +17,7 @@
gettimeofday(&time_start, NULL);
/* Send the CDROMEJECT command to the device. */
-@@ -813,10 +814,17 @@
+@@ -815,10 +816,17 @@ static void Unmount(const char *fullName)
}
eject-2.1.5-umount.patch:
eject.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 151 insertions(+)
Index: eject-2.1.5-umount.patch
===================================================================
RCS file: /cvs/extras/rpms/eject/devel/eject-2.1.5-umount.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eject-2.1.5-umount.patch 2 Apr 2008 08:42:46 -0000 1.4
+++ eject-2.1.5-umount.patch 2 Feb 2010 09:58:42 -0000 1.5
@@ -1,5 +1,7 @@
---- eject/eject.c.umount 2008-03-27 09:40:44.000000000 +0100
-+++ eject/eject.c 2008-04-02 09:37:37.000000000 +0200
+diff --git a/eject.c b/eject.c
+index bfccd37..948e2b2 100644
+--- a/eject.c
++++ b/eject.c
@@ -42,6 +42,7 @@
#include <string.h>
#include <fcntl.h>
@@ -8,7 +10,7 @@
#ifdef GETOPTLONG
#include <getopt.h>
-@@ -1127,6 +1128,145 @@ static char *MultiplePartitions(const ch
+@@ -1131,6 +1132,145 @@ static char *MultiplePartitions(const char *name)
return 0;
}
@@ -154,7 +156,7 @@
/* handle -x option */
static void HandleXOption(char *deviceName)
-@@ -1270,6 +1410,17 @@ int main(int argc, char **argv)
+@@ -1274,6 +1414,17 @@ int main(int argc, char **argv)
exit(0);
}
Index: eject.spec
===================================================================
RCS file: /cvs/extras/rpms/eject/devel/eject.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- eject.spec 25 Nov 2009 14:29:00 -0000 1.42
+++ eject.spec 2 Feb 2010 09:58:42 -0000 1.43
@@ -1,7 +1,7 @@
Summary: A program that ejects removable media using software control
Name: eject
Version: 2.1.5
-Release: 16%{?dist}
+Release: 17%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@ Patch6: eject-2.1.5-umount.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
URL: http://www.pobox.com/~tranter
ExcludeArch: s390 s390x
+Requires: usermode
BuildRequires: gettext
BuildRequires: libtool
@@ -31,9 +32,9 @@ control.
%setup -q -n %{name}
%patch1 -p1
%patch2 -p1
-%patch3 -p0
+%patch3 -p1
%patch4 -p1
-%patch5 -p0
+%patch5 -p1
%patch6 -p1
%build
@@ -65,15 +66,18 @@ popd
rm -rf %{buildroot}
%files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc README TODO COPYING ChangeLog
-%attr(644,root,root) %{_sysconfdir}/security/console.apps/*
-%attr(644,root,root) %{_sysconfdir}/pam.d/*
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/security/console.apps/*
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/*
%{_bindir}/*
%{_sbindir}/*
%{_mandir}/man1/*
%changelog
+* Tue Jan 02 2010 Kamil Dudka <kdudka at redhat.com> 2.1.5-17
+- eliminated rpmlint warnings (#225720)
+
* Wed Nov 25 2009 Kamil Dudka <kdudka at redhat.com> 2.1.5-16
- honor merge review comments (#225720)
More information about the scm-commits
mailing list