rpms/device-mapper/devel device-mapper-1.02.02-pkg-config.patch, NONE, 1.1 device-mapper-1.02.02-selinux.patch, NONE, 1.1 device-mapper.spec, 1.24, 1.25 device-mapper-selinux.patch, 1.1, NONE

Wed Jan 11 15:21:04 UTC 2006

Author: kzak

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9182

Modified Files:
	device-mapper.spec 
Added Files:
	device-mapper-1.02.02-pkg-config.patch 
	device-mapper-1.02.02-selinux.patch 
Removed Files:
	device-mapper-selinux.patch 
Log Message:
cleanup selinux patch, add pkg-config support

device-mapper-1.02.02-pkg-config.patch:
 configure.in                   |    2 ++
 dmeventd/Makefile.in           |    2 ++
 dmeventd/devmapper-event.pc.in |   12 ++++++++++++
 lib/Makefile.in                |    4 ++--
 lib/devmapper.pc.in            |   12 ++++++++++++
 make.tmpl.in                   |    1 +
 6 files changed, 31 insertions(+), 2 deletions(-)

--- NEW FILE device-mapper-1.02.02-pkg-config.patch ---
--- device-mapper.1.02.02/make.tmpl.in.pkg-config	2005-10-16 16:33:22.000000000 +0200
+++ device-mapper.1.02.02/make.tmpl.in	2006-01-11 13:04:39.000000000 +0100
@@ -37,6 +37,7 @@
 bindir = $(DESTDIR)@bindir@
 includedir = $(DESTDIR)@includedir@
 libdir = $(DESTDIR)@libdir@
+usrlibdir = $(DESTDIR)$(prefix)@libdir@
 sbindir = $(DESTDIR)@sbindir@
 infodir = $(DESTDIR)@infodir@
 mandir = $(DESTDIR)@mandir@
--- /dev/null	2006-01-03 10:30:41.192875500 +0100
+++ device-mapper.1.02.02/lib/devmapper.pc.in	2006-01-11 13:06:11.000000000 +0100
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: devmapper
+Description: device-mapper library
+Version: @DM_LIB_VERSION@
+Requires:
+Cflags: -I${includedir} 
+Libs: -L${libdir} -ldevmapper
+Libs.private: -lselinux -lsepol
--- device-mapper.1.02.02/lib/Makefile.in.pkg-config	2005-12-02 16:39:16.000000000 +0100
+++ device-mapper.1.02.02/lib/Makefile.in	2006-01-11 13:04:39.000000000 +0100
@@ -58,11 +58,11 @@
 		$(libdir)/libdevmapper.$(LIB_SUFFIX)
 	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
 		$(includedir)/libdevmapper.h
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 devmapper.pc \
+		$(usrlibdir)/pkgconfig/devmapper.pc
 
 install_static: install_ at interface@_static
 	$(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(libdir)/libdevmapper.a
-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
-		$(includedir)/libdevmapper.h
 
 install_fs: fs/libdevmapper.$(LIB_SUFFIX)
 	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
--- device-mapper.1.02.02/configure.in.pkg-config	2006-01-11 13:04:39.000000000 +0100
+++ device-mapper.1.02.02/configure.in	2006-01-11 13:04:39.000000000 +0100
@@ -367,7 +367,9 @@
 dmsetup/Makefile							\
 lib/Makefile							 	\
 lib/libdm-common.h						 	\
+lib/devmapper.pc							\
 dmeventd/Makefile						 	\
+dmeventd/devmapper-event.pc						\
 kernel/Makefile								\
 man/Makefile								\
 po/Makefile								\
--- /dev/null	2006-01-03 10:30:41.192875500 +0100
+++ device-mapper.1.02.02/dmeventd/devmapper-event.pc.in	2006-01-11 13:06:32.000000000 +0100
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: devmapper-event
+Description: device-mapper event library
+Version: @DM_LIB_VERSION@
+Requires: devmapper
+Cflags: -I${includedir}
+Libs: -L${libdir} -ldevmapper-event
+Libs.private: -lpthread -ldl
--- device-mapper.1.02.02/dmeventd/Makefile.in.pkg-config	2006-01-11 13:04:39.000000000 +0100
+++ device-mapper.1.02.02/dmeventd/Makefile.in	2006-01-11 13:04:39.000000000 +0100
@@ -47,6 +47,8 @@
 		$(libdir)/libdevmapper-event.$(LIB_SUFFIX)
 	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.h \
 		$(includedir)/libdevmapper-event.h
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 devmapper-event.pc \
+		$(usrlibdir)/pkgconfig/devmapper-event.pc
 
 install_static: libdevmapper-event.a
 	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \

device-mapper-1.02.02-selinux.patch:
 configure.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE device-mapper-1.02.02-selinux.patch ---
--- device-mapper.1.02.02/configure.in.selinux	2006-01-11 12:40:58.000000000 +0100
+++ device-mapper.1.02.02/configure.in	2006-01-11 12:41:12.000000000 +0100
@@ -204,7 +204,7 @@
 
 	if test x$HAVE_SELINUX = xyes; then
 		CFLAGS="$CFLAGS -DHAVE_SELINUX"
-		LIBS="-lselinux $LIBS"
+		LIBS="-lselinux -lsepol $LIBS"
 	else
 		AC_MSG_WARN(Disabling selinux)
 	fi


Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- device-mapper.spec	9 Dec 2005 22:40:11 -0000	1.24
+++ device-mapper.spec	11 Jan 2006 15:21:02 -0000	1.25
@@ -1,13 +1,14 @@
 Summary: device mapper library
 Name: device-mapper
 Version: 1.02.02
-Release: 2.1
+Release: 3
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
 Source0: %{name}.%{version}.tgz
-Patch0: device-mapper-selinux.patch
+Patch0: device-mapper-1.02.02-selinux.patch
 Patch1: device-mapper-1.02.02-libpaths.patch
+Patch2: device-mapper-1.02.02-pkg-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libselinux-devel, libsepol-devel
 
@@ -21,8 +22,10 @@
 %setup -q -n %{name}.%{version}
 %patch0 -p1 -b .selinux
 %patch1 -p1 -b .libpaths
+%patch2 -p1 -b .pkg-config
 
 %build
+autoconf
 %configure --enable-static_link --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-dmeventd
 make
 
@@ -49,10 +52,15 @@
 %{_mandir}/*/*
 %{_includedir}/libdevmapper.h
 %{_includedir}/libdevmapper-event.h
+/usr/lib/pkgconfig/*.pc
 
 
 %changelog
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+* Wed Jan 11 2006 Karel Zak <kzak at redhat.com> - 1.02.02-3
+- cleanup selinux patch
+- add pkg-config support
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - - 1.02.02-2.1
 - rebuilt
 
 * Sun Dec  3 2005 Peter Jones <pjones at redhat.com> - 1.02.02-2


--- device-mapper-selinux.patch DELETED ---


