[arch-commits] Commit in lockdev/trunk (PKGBUILD build.patch)

[Balló György]

    Date: Wednesday, September 11, 2013 @ 23:00:39
  Author: bgyorgy
Revision: 97055

upgpkg: lockdev 1.0.3_1.5-3

Change library file name, install devel symlink (FS#33280)

Added:
  lockdev/trunk/build.patch
Modified:
  lockdev/trunk/PKGBUILD

-------------+
 PKGBUILD    |   15 ++++++++++-----
 build.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-11 19:49:22 UTC (rev 97054)
+++ PKGBUILD	2013-09-11 21:00:39 UTC (rev 97055)
@@ -6,22 +6,27 @@
 pkgname=lockdev
 pkgver=1.0.3_1.5
 _pkgver=1.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.'
 url='http://packages.qa.debian.org/l/lockdev.html'
 license=("GPL")
 arch=('i686' 'x86_64')
 source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz"
-	      "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz")
+	"http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz"
+	'build.patch')
 md5sums=('64b9c1b87b125fc348e892e24625524a'
-         'c4e8a5a2e46b76b48339c232b358f579')
+         'c4e8a5a2e46b76b48339c232b358f579'
+         '2db93cadf6670ddcd01de4bfc22a35e1')
 
-build() {
+prepare() {
   cd "${pkgname}-${_pkgver}"
-
   patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff"
   sed -i "s|CFLAGS	= -g|CFLAGS	= -g -fPIC|" Makefile
+  patch -p1 -i ../build.patch # FS#33280
+}
 
+build() {
+  cd "${pkgname}-${_pkgver}"
   make shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
   make static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
 }

Added: build.patch
===================================================================
--- build.patch	                        (rev 0)
+++ build.patch	2013-09-11 21:00:39 UTC (rev 97055)
@@ -0,0 +1,30 @@
+commit 0dd47123655c52d68185f06b9da8fb0e1b925400
+Author: Ludwig Nussel <ludwig.nussel at suse.de>
+Date:   Tue Feb 9 14:56:23 2010 +0100
+
+    RedHat patch 2
+    
+    - change library file name
+    - install devel symlink
+
+diff --git a/Makefile b/Makefile
+index b7b4d1f..3b351dd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@ VER	= $(shell expr `pwd` : '.*-\([0-9.]*\)')
+ MVER	= ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'}
+ 
+ static	= ${libname}.a
+-shared	= ${libname}.${VER}.so
++shared	= ${libname}.so.${VER}
+ soname	= ${libname}.so.${MVER}
+ 
+ # overwritten by caller (e.g.: debian/rules)
+@@ -76,6 +76,7 @@ install_doc:	docs/lockdev.3
+ install_run:	${shared}
+ 	install -m755 -d	${libdir}
+ 	install -m644 ${shared}	${libdir}
++	ln -s ${shared}		${libdir}/liblockdev.so
+ 
+ .PHONY: clean distclean perl-clean mostyclean 
+ perl-clean:	clean