rpms/lockdev/devel lockdev-1.0.3-rh.patch, 1.2, 1.3 lockdev.spec, 1.38, 1.39

[Jiří Popelka]

Author: jpopelka

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

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-3
- Correct rh.patch


lockdev-1.0.3-rh.patch:
 LockDev/Makefile.PL |    2 
 Makefile            |   22 +++++---
 src/baudboy.h       |  137 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lockdev.c       |   48 +++++++++++++-----
 src/lockdev.h       |    4 +
 src/sample.c        |   64 +++++++++++++++---------
 6 files changed, 234 insertions(+), 43 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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lockdev-1.0.3-rh.patch	10 Dec 2009 08:02:19 -0000	1.2
+++ lockdev-1.0.3-rh.patch	10 Dec 2009 16:21:53 -0000	1.3
@@ -1,15 +1,29 @@
+diff -up lockdev-1.0.3/LockDev/Makefile.PL.redhat lockdev-1.0.3/LockDev/Makefile.PL
+--- lockdev-1.0.3/LockDev/Makefile.PL.redhat	2005-10-03 19:49:17.000000000 +0200
++++ lockdev-1.0.3/LockDev/Makefile.PL	2009-12-10 17:07:42.000000000 +0100
+@@ -7,7 +7,7 @@ WriteMakefile(
+          'LIBS'	=> [''],
+        'DEFINE'	=> '',
+           'INC'	=> '-I../src',
+-     'MYEXTLIB'	=> '../src/lockdev.z',
++     'MYEXTLIB'	=> '../liblockdev.a',
+ );
+ 
+ sub MY::postamble {
 diff -up lockdev-1.0.3/Makefile.redhat lockdev-1.0.3/Makefile
 --- lockdev-1.0.3/Makefile.redhat	2005-10-03 20:51:53.000000000 +0200
 +++ lockdev-1.0.3/Makefile	2009-12-05 17:42:41.000000000 +0100
-@@ -6,6 +6,7 @@ pkgname = lockdev
+@@ -4,8 +4,8 @@ libname	= liblockdev
+ pkgname = lockdev
+ 
  objs	= src/lockdev.o
- shobjs	= src/lockdev.z
+-shobjs	= src/lockdev.z
  
 +lockdev	= src/sample.c
  
  VER	= $(shell expr `pwd` : '.*-\([0-9.]*\)')
  MVER	= ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'}
-@@ -18,17 +19,18 @@ soname	= ${libname}.so.${MVER}
+@@ -18,27 +18,30 @@ soname	= ${libname}.so.${MVER}
  basedir	= /usr/local
  srcdir=.
  
@@ -31,20 +45,22 @@ diff -up lockdev-1.0.3/Makefile.redhat l
  
  static ${static}:       ${objs}
  	$(AR) $(ARFLAGS) ${static} $^
-@@ -36,6 +38,12 @@ static ${static}:       ${objs}
- shared ${shared}:	${shobjs}
+ 
+-shared ${shared}:	${shobjs}
++shared ${shared}:	${objs}
  	${CC} ${LCFLAGS} -shared -Wl,-soname,${soname} $^ -lc -o ${shared}
  
+-src/lockdev.z: src/lockdev.c
+-	${CC} ${CFLAGS} -c -fPIC -o $@ $?
 +lockdev.o: ${lockdev}
 +	${CC} ${CFLAGS} -I./src -o $@ -c $^
-+
+ 
 +lockdev: lockdev.o ${static}
 +	${CC} -o $@ $^
-+
- src/lockdev.z: src/lockdev.c
- 	${CC} ${CFLAGS} -c -fPIC -o $@ $?
  
-@@ -54,6 +62,7 @@ install_dev:	${static} src/lockdev.h
+ perl-lib:	static
+ 	cd LockDev && perl Makefile.PL INSTALLDIRS=vendor
+@@ -54,6 +57,7 @@ install_dev:	${static} src/lockdev.h
  	install -m755 -d	${incdir}
  	install -m644 src/lockdev.h	${incdir}
  	install -m644 src/ttylock.h	${incdir}
@@ -52,7 +68,7 @@ diff -up lockdev-1.0.3/Makefile.redhat l
  
  install_debug:	${static} ${shared}
  	install -m755 -d	${libdir}/debug
-@@ -71,7 +80,9 @@ install_doc:	docs/lockdev.3
+@@ -71,7 +75,9 @@ install_doc:	docs/lockdev.3
  
  install_run:	${shared}
  	install -m755 -d	${libdir}


Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- lockdev.spec	10 Dec 2009 08:02:19 -0000	1.38
+++ lockdev.spec	10 Dec 2009 16:21:53 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
@@ -77,7 +77,7 @@ rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc LICENSE
+%doc LICENSE AUTHORS ChangeLog ChangeLog.old
 %attr(2711,root,lock)  %{_sbindir}/lockdev
 %{_libdir}/*.so.*
 %{_mandir}/man8/*
@@ -90,6 +90,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Thu Dec 10 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-3
+- Correct rh.patch
+
 * Thu Dec 10 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-2
 - Correct rh.patch