rpms/lockdev/devel lockdev-1.0.3-rh.patch, 1.1, 1.2 lockdev.spec, 1.37, 1.38

[Jiří Popelka]

Author: jpopelka

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

Modified Files:
	lockdev-1.0.3-rh.patch lockdev.spec 
Log Message:
* Thu Dec 10 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-2
- Correct rh.patch


lockdev-1.0.3-rh.patch:
 Makefile      |   19 ++++++--
 src/baudboy.h |  137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lockdev.c |   48 +++++++++++++++-----
 src/lockdev.h |    4 +
 src/sample.c  |   64 +++++++++++++++++----------
 5 files changed, 234 insertions(+), 38 deletions(-)

Index: lockdev-1.0.3-rh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev-1.0.3-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lockdev-1.0.3-rh.patch	7 Dec 2009 09:28:58 -0000	1.1
+++ lockdev-1.0.3-rh.patch	10 Dec 2009 08:02:19 -0000	1.2
@@ -236,15 +236,15 @@ diff -up lockdev-1.0.3/src/lockdev.c.red
  		unlink( tpname);	/* in case there was */
  		rename( lockname, tpname);
  		if ( ! (fd=fopen( tpname, "r")) ) {
-@@ -511,7 +524,7 @@ dev_testlock(const char *devname)
- #endif /* DEBUG */
- 	_debug( 3, "dev_testlock(%s)\n", devname);
- 	if ( ! (p=_dl_check_devname( devname)) )
--	 	close_n_return( -1);
-+	 	close_n_return( -errno);
- 	strcpy( device, DEV_PATH);
- 	strcat( device, p);	/* now device has a copy of the pathname */
- 	_debug( 2, "dev_testlock() device = %s\n", device);
+@@ -520,7 +533,7 @@ dev_testlock(const char *devname)
+ 	 * and minor numbers
+ 	 */
+ 	if ( stat( device, &statbuf) == -1 ) {
+-		close_n_return( -1);
++		close_n_return(-errno);
+ 	}
+ 
+ 	/* first check for the FSSTND-1.2 lock, get the pid of the
 @@ -585,7 +598,7 @@ dev_lock (const char *devname)
  #endif /* DEBUG */
  	_debug( 3, "dev_lock(%s)\n", devname);


Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- lockdev.spec	7 Dec 2009 09:28:58 -0000	1.37
+++ lockdev.spec	10 Dec 2009 08:02:19 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
@@ -90,6 +90,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Thu Dec 10 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-2
+- Correct rh.patch
+
 * Mon Dec 07 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-1
 - 1.0.3.  No longer need 1.0.0-signal, 1.0.1-subdir, 1.0.1-fcntl, 1.0.1-32bit patches.
 - Renumbered patches and sources.