rpms/corosync/devel fix-pkgconfig.diff, NONE, 1.1 corosync.spec, 1.23, 1.24

[Fabio M. Di Nitto]

Author: fabbione

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

Modified Files:
	corosync.spec 
Added Files:
	fix-pkgconfig.diff 
Log Message:
Fix pkgconfig and unbreak lvm2 build


fix-pkgconfig.diff:

--- NEW FILE fix-pkgconfig.diff ---
diff -Naurd corosync-0.95.orig/pkgconfig/Makefile.am corosync-0.95/pkgconfig/Makefile.am
--- corosync-0.95.orig/pkgconfig/Makefile.am	2009-03-22 19:44:33.000000000 +0100
+++ corosync-0.95/pkgconfig/Makefile.am	2009-03-30 08:48:32.000000000 +0200
@@ -44,7 +44,7 @@
 		-e 's#@PREFIX@#$(exec_prefix)#g' \
 		-e 's#@LIBDIR@#$(libdir)#g' \
 		-e 's#@LIBVERSION@#$(VERSION)#g' \
-		-e 's#@LIB@#'$@'#g' \
+		-e 's#@LIB@#'$(@:lib%=%)'#g' \
 	> $@.pc;
 	touch $@
 
diff -Naurd corosync-0.95.orig/pkgconfig/Makefile.in corosync-0.95/pkgconfig/Makefile.in
--- corosync-0.95.orig/pkgconfig/Makefile.in	2009-03-23 23:14:38.000000000 +0100
+++ corosync-0.95/pkgconfig/Makefile.in	2009-03-30 08:48:56.000000000 +0200
@@ -353,7 +353,7 @@
 		-e 's#@PREFIX@#$(exec_prefix)#g' \
 		-e 's#@LIBDIR@#$(libdir)#g' \
 		-e 's#@LIBVERSION@#$(VERSION)#g' \
-		-e 's#@LIB@#'$@'#g' \
+		-e 's#@LIB@#'$(@:lib%=%)'#g' \
 	> $@.pc;
 	touch $@
 


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- corosync.spec	24 Mar 2009 07:33:41 -0000	1.23
+++ corosync.spec	30 Mar 2009 07:00:39 -0000	1.24
@@ -3,11 +3,12 @@
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
 Version: 0.95
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openais.org
 Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz
+Patch0: fix-pkgconfig.diff
 
 # Runtime bits
 Requires: corosynclib = %{version}-%{release}
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q -n corosync-%{version}
+%patch0 -p1
 
 %if %{buildtrunk}
 if [ ! -f configure ]; then
@@ -207,6 +209,10 @@
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* Mon Mar 30 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.95-2
+- Backport svn commit 1913 to fix pkgconfig files generation
+  and unbreak lvm2 build.
+
 * Tue Mar 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.95-1
 - New upstream release
 - spec file updates: