rpms/corosync
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix pkgconfig and unbreak lvm2 build

Browse Source
This commit is contained in:
Fabio M. Di Nitto 2009-03-30 07:00:39 +00:00
parent a60cf36ca6
commit ebf0cd693d
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
corosync.spec
View File

@ -3,11 +3,12 @@
Name: corosync Name: corosync
Summary: The Corosync Cluster Engine and Application Programming Interfaces Summary: The Corosync Cluster Engine and Application Programming Interfaces
Version: 0.95 Version: 0.95
Release: 1%{?alphatag:.%{alphatag}}%{?dist} Release: 2%{?alphatag:.%{alphatag}}%{?dist}
License: BSD License: BSD
Group: System Environment/Base Group: System Environment/Base
URL: http://www.openais.org URL: http://www.openais.org
Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz
Patch0: fix-pkgconfig.diff
# Runtime bits # Runtime bits
Requires: corosynclib = %{version}-%{release} Requires: corosynclib = %{version}-%{release}
@ -30,6 +31,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%prep %prep
%setup -q -n corosync-%{version} %setup -q -n corosync-%{version}
%patch0 -p1
%if %{buildtrunk} %if %{buildtrunk}
if [ ! -f configure ]; then if [ ! -f configure ]; then
@ -207,6 +209,10 @@ The Corosync Cluster Engine APIs.
%{_mandir}/man8/coroipc_overview.8* %{_mandir}/man8/coroipc_overview.8*
%changelog %changelog
* Mon Mar 30 2009 Fabio M. Di Nitto <fdinitto@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@redhat.com> - 0.95-1 * Tue Mar 24 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 0.95-1
- New upstream release - New upstream release
- spec file updates: - spec file updates:

24
fix-pkgconfig.diff Normal file
View File

@ -0,0 +1,24 @@
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 $@