packages: cman/cman.spec - updated configure options/optflags passing - pac...

[qboosh]

Author: qboosh                       Date: Sun May 22 15:13:57 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated configure options/optflags passing
- package ghost soname symlink

---- Files affected:
packages/cman:
   cman.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/cman/cman.spec
diff -u packages/cman/cman.spec:1.25 packages/cman/cman.spec:1.26
--- packages/cman/cman.spec:1.25	Sat Feb  5 00:19:37 2011
+++ packages/cman/cman.spec	Sun May 22 17:13:52 2011
@@ -15,9 +15,9 @@
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 URL:		http://sources.redhat.com/cluster/cman/
-%{!?with_libonly:BuildRequires:	ccs-devel}
+%{!?with_libonly:BuildRequires:	ccs-devel >= 2.03.10}
 BuildRequires:	ncurses-devel
-BuildRequires:	openais-devel
+BuildRequires:	openais-devel < 1.0
 BuildRequires:	perl-base
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -96,28 +96,24 @@
 %prep
 %setup -q -n cluster-%{version}
 
-cd %{name}
-%{__perl} -pi -e 's/ -g/ %{rpmcflags}/' {lib,qdisk,tests}/Makefile
-%{__perl} -pi -e 's/ -O2 /%{rpmcflags}/' {cman_tool,daemon}/Makefile
-
 %build
 ./configure \
-	--without_kernel_modules \
-	--without_gfs \
-	--without_gfs2 \
-	--without_gnbd \
-	--ccsincdir="$PWD/ccs/lib" \
+	--cc="%{__cc}" \
+	--cflags="%{rpmcflags} -Wall" \
+	--ldflags="%{rpmldflags}" \
 	--incdir=%{_includedir} \
 	--ncursesincdir=%{_includedir}/ncurses \
 	--libdir=%{_libdir} \
 	--libexecdir=%{_libdir} \
 	--mandir=%{_mandir} \
 	--prefix=%{_prefix} \
-	--sbindir=%{_sbindir}
+	--sbindir=%{_sbindir} \
+	--without_gfs \
+	--without_gfs2 \
+	--without_gnbd \
+	--without_kernel_modules
 
-%{__make} %{?with_libonly:-C lib} \
-	CC="%{__cc}" \
-	incdir=`pwd`/include
+%{__make} -C %{name}%{?with_libonly:/lib}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -126,8 +122,10 @@
 %{__make} -C %{name}%{?with_libonly:/lib} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%if %{without libonly}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -162,11 +160,12 @@
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcman.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcman.so.2
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcman.so
-%{_includedir}/*.h
+%{_includedir}/libcman.h
 
 %files static
 %defattr(644,root,root,755)
@@ -178,6 +177,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2011/05/22 15:13:52  qboosh
+- updated configure options/optflags passing
+- package ghost soname symlink
+
 Revision 1.25  2011/02/04 23:19:37  sparky
 - %description for correct %package
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cman/cman.spec?r1=1.25&r2=1.26&f=u