Author: gb
Date: Wed Feb 14 07:33:38 2007
New Revision: 120697
Added:
packages/cooker/device-mapper/current/SOURCES/device-mapper.1.02.09-pkgconfig.patch
Removed:
packages/cooker/device-mapper/current/SOURCES/device-mapper.1.02.07-pk.patch
Modified:
packages/cooker/device-mapper/current/SPECS/device-mapper.spec
Log:
- fix DM_LIB_VERSION for pkgconfig deps
Added:
packages/cooker/device-mapper/current/SOURCES/device-mapper.1.02.09-pkgconfig.patch
==============================================================================
--- (empty file)
+++
packages/cooker/device-mapper/current/SOURCES/device-mapper.1.02.09-pkgconfig.patch
Wed Feb 14 07:33:38 2007
@@ -0,0 +1,75 @@
+--- device-mapper.1.02.09/dmeventd/Makefile.in.pkgconfig 2007-02-14
07:20:17.000000000 +0100
++++ device-mapper.1.02.09/dmeventd/Makefile.in 2007-02-14 07:20:17.000000000
+0100
+@@ -55,7 +55,7 @@ install_dynamic: libdevmapper-event.$(LI
+
+ install_pkgconfig:
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.pc \
+- $(usrlibdir)/pkgconfig/devmapper-event.pc
++ $(libdir)/pkgconfig/devmapper-event.pc
+
+ install_static: libdevmapper-event.a
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+--- device-mapper.1.02.09/lib/Makefile.in.pkgconfig 2007-02-14
07:20:17.000000000 +0100
++++ device-mapper.1.02.09/lib/Makefile.in 2007-02-14 07:20:17.000000000
+0100
+@@ -88,7 +88,7 @@ install_ioctl: ioctl/libdevmapper.$(LIB_
+
+ install_pkgconfig:
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.pc \
+- $(usrlibdir)/pkgconfig/devmapper.pc
++ $(libdir)/pkgconfig/devmapper.pc
+
+ install_ioctl_static: ioctl/libdevmapper.a
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+--- device-mapper.1.02.09/lib/libdevmapper.pc.in.pkgconfig 2006-04-19
17:23:10.000000000 +0200
++++ device-mapper.1.02.09/lib/libdevmapper.pc.in 2007-02-14
07:20:17.000000000 +0100
+@@ -8,4 +8,4 @@ Description: device-mapper library
+ Version: @DM_LIB_VERSION@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -ldevmapper
+-Libs.private: -lselinux -lsepol
++Libs.private: @SELIBS@
+--- device-mapper.1.02.09/lib/libdm-common.h.in.pkgconfig 2005-10-25
19:30:00.000000000 +0200
++++ device-mapper.1.02.09/lib/libdm-common.h.in 2007-02-14
07:24:45.000000000 +0100
+@@ -28,6 +28,6 @@ int rm_dev_node(const char *dev_name);
+ int rename_dev_node(const char *old_name, const char *new_name);
+ void update_devs(void);
+
+-#define DM_LIB_VERSION @DM_LIB_VERSION@
++#define DM_LIB_VERSION "@DM_LIB_VERSION@"
+
+ #endif
+--- device-mapper.1.02.09/configure.in.pkgconfig 2007-02-14
07:20:17.000000000 +0100
++++ device-mapper.1.02.09/configure.in 2007-02-14 07:20:17.000000000 +0100
+@@ -229,6 +229,7 @@ if test x$SELINUX = xyes; then
+ if test x$HAVE_SEPOL = xyes; then
+ AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context
is available.])
+ LIBS="-lsepol $LIBS"
++ SELIBS="-lsepol $SELIBS"
+ fi
+
+ AC_CHECK_LIB(selinux, is_selinux_enabled, HAVE_SELINUX=yes,
HAVE_SELINUX=no)
+@@ -236,6 +237,7 @@ if test x$SELINUX = xyes; then
+ if test x$HAVE_SELINUX = xyes; then
+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 if selinux is
available.])
+ LIBS="-lselinux $LIBS"
++ SELIBS="-lselinux $SELIBS"
+ else
+ AC_MSG_WARN(Disabling selinux)
+ fi
+@@ -352,7 +354,7 @@ fi
+ AC_MSG_RESULT($interface)
+
+ if test "-f VERSION" ; then
+- DM_LIB_VERSION="\"`cat VERSION|sed -e \"s/([[0-9.]]*)/\0-$interface/\"`\""
++ DM_LIB_VERSION="`cat VERSION|sed -n
\"/\([[0-9.]]*\).*/s//\1-$interface/p\"`"
+ else
+ DM_LIB_VERSION="Unknown version ($interface)"
+ fi
+@@ -366,6 +368,7 @@ AC_SUBST(STATIC_LINK_DIET)
+ AC_SUBST(OWNER)
+ AC_SUBST(GROUP)
+ AC_SUBST(LIBS)
++AC_SUBST(SELIBS)
+ AC_SUBST(interface)
+ AC_SUBST(kerneldir)
+ AC_SUBST(missingkernel)
Modified: packages/cooker/device-mapper/current/SPECS/device-mapper.spec
==============================================================================
--- packages/cooker/device-mapper/current/SPECS/device-mapper.spec
(original)
+++ packages/cooker/device-mapper/current/SPECS/device-mapper.spec Wed Feb
14 07:33:38 2007
@@ -1,7 +1,7 @@
%define name device-mapper
%define version 1.02.09
%define extraversion %{nil}
-%define release %mkrel 1
+%define release %mkrel 2
%ifarch %{ix86} x86_64 ppc ppc64 %{sunsparc}
%define use_dietlibc 1
@@ -33,7 +33,7 @@
Release: %{release}
Source0:
ftp://sources.redhat.com/pub/dm/%{name}.%{version}%{extraversion}.tar.bz2
Patch0: device-mapper.1.02.07-build.patch
-Patch2: device-mapper.1.02.07-pk.patch
+Patch2: device-mapper.1.02.09-pkgconfig.patch
Patch3: device-mapper.1.02.09-misc.patch
License: GPL
Group: System/Kernel and hardware
@@ -126,7 +126,7 @@
%prep
%setup -q -n %{name}.%{version}%{extraversion}
%patch0 -p1 -b .build
-%patch2 -p1 -b .pkg
+%patch2 -p1 -b .pkgconfig
%patch3 -p1 -b .misc
autoconf
