rpms/lockdev
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Correct rh.patch

Browse Source
This commit is contained in:
Jiří Popelka 2009-12-10 16:21:53 +00:00
parent 43889fad99
commit 8a5413f167
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lockdev-1.0.3-rh.patch
View File

@ -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 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.redhat 2005-10-03 20:51:53.000000000 +0200
+++ lockdev-1.0.3/Makefile 2009-12-05 17:42:41.000000000 +0100 +++ 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 objs = src/lockdev.o
shobjs = src/lockdev.z -shobjs = src/lockdev.z
+lockdev = src/sample.c +lockdev = src/sample.c
VER = $(shell expr `pwd` : '.*-\([0-9.]*\)') VER = $(shell expr `pwd` : '.*-\([0-9.]*\)')
MVER = ${shell expr `pwd` : '.*-\([0-9]*\).[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 basedir = /usr/local
srcdir=. srcdir=.
@ -31,20 +45,22 @@ diff -up lockdev-1.0.3/Makefile.redhat lockdev-1.0.3/Makefile
static ${static}: ${objs} static ${static}: ${objs}
$(AR) $(ARFLAGS) ${static} $^ $(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} ${CC} ${LCFLAGS} -shared -Wl,-soname,${soname} $^ -lc -o ${shared}
-src/lockdev.z: src/lockdev.c
- ${CC} ${CFLAGS} -c -fPIC -o $@ $?
+lockdev.o: ${lockdev} +lockdev.o: ${lockdev}
+ ${CC} ${CFLAGS} -I./src -o $@ -c $^ + ${CC} ${CFLAGS} -I./src -o $@ -c $^
+
+lockdev: lockdev.o ${static} +lockdev: lockdev.o ${static}
+ ${CC} -o $@ $^ + ${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 -m755 -d ${incdir}
install -m644 src/lockdev.h ${incdir} install -m644 src/lockdev.h ${incdir}
install -m644 src/ttylock.h ${incdir} install -m644 src/ttylock.h ${incdir}
@ -52,7 +68,7 @@ diff -up lockdev-1.0.3/Makefile.redhat lockdev-1.0.3/Makefile
install_debug: ${static} ${shared} install_debug: ${static} ${shared}
install -m755 -d ${libdir}/debug 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_run: ${shared}
install -m755 -d ${libdir} install -m755 -d ${libdir}

7
lockdev.spec
View File

@ -1,7 +1,7 @@
Summary: A library for locking devices Summary: A library for locking devices
Name: lockdev Name: lockdev
Version: 1.0.3 Version: 1.0.3
Release: 2%{?dist} Release: 3%{?dist}
License: LGPLv2 License: LGPLv2
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://packages.debian.org/unstable/source/lockdev URL: http://packages.debian.org/unstable/source/lockdev
@ -77,7 +77,7 @@ rm -fr $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE %doc LICENSE AUTHORS ChangeLog ChangeLog.old
%attr(2711,root,lock) %{_sbindir}/lockdev %attr(2711,root,lock) %{_sbindir}/lockdev
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_mandir}/man8/* %{_mandir}/man8/*
@ -90,6 +90,9 @@ rm -fr $RPM_BUILD_ROOT
%{_includedir}/* %{_includedir}/*
%changelog %changelog
* Thu Dec 10 2009 Jiri Popelka <jpopelka@redhat.com> - 1.0.3-3
- Correct rh.patch
* Thu Dec 10 2009 Jiri Popelka <jpopelka@redhat.com> - 1.0.3-2 * Thu Dec 10 2009 Jiri Popelka <jpopelka@redhat.com> - 1.0.3-2
- Correct rh.patch - Correct rh.patch