rpms/cluster/devel remove-unrequired-headers.diff, NONE, 1.1 .cvsignore, 1.6, 1.7 cluster.spec, 1.10, 1.11 sources, 1.6, 1.7

Fabio M. Di Nitto (fabbione) fedora-extras-commits at redhat.com
Mon Aug 4 07:09:34 UTC 2008


Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17332

Modified Files:
	.cvsignore cluster.spec sources 
Added Files:
	remove-unrequired-headers.diff 
Log Message:
New upstream release


remove-unrequired-headers.diff:

--- NEW FILE remove-unrequired-headers.diff ---
diff --git a/fence/agents/rackswitch/do_rack.h b/fence/agents/rackswitch/do_rack.h
index 613a021..63c1365 100644
--- a/fence/agents/rackswitch/do_rack.h
+++ b/fence/agents/rackswitch/do_rack.h
@@ -11,10 +11,6 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <linux/net.h>
-#include <linux/fs.h>
-#include <linux/socket.h>
-/*#include <linux/in.h>*/
 #include <arpa/inet.h>
 
 #include <signal.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Jul 2008 11:17:04 -0000	1.6
+++ .cvsignore	4 Aug 2008 07:09:04 -0000	1.7
@@ -1 +1 @@
-cluster-2.99.06.tar.gz
+cluster-2.99.07.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cluster.spec	15 Jul 2008 11:17:04 -0000	1.10
+++ cluster.spec	4 Aug 2008 07:09:04 -0000	1.11
@@ -18,12 +18,13 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 2.99.06
+Version: 2.99.07
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
+Patch0: remove-unrequired-headers.diff
 
 ## Setup/build bits
 
@@ -40,12 +41,14 @@
 BuildRequires: glibc-kernheaders glibc-devel
 BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel
 BuildRequires: openais-devel >= 0.84-2 openldap-devel
+BuildRequires: perl(ExtUtils::MakeMaker)
 %if %{buildxen}
 BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs
 %endif
 
 %prep
 %setup -q -n cluster-%{version}
+%patch0 -p1
 
 %build
 # for legacy reasons, all binaries have always been installed in /sbin
@@ -72,7 +75,7 @@
 
 ## tree fix up
 # logrotate name
-mv $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cluster.logrotate \
+mv $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cluster \
 	$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cman
 # remove static libraries
 find $RPM_BUILD_ROOT -name "*.a" -exec rm {} \;
@@ -87,6 +90,11 @@
 find $RPM_BUILD_ROOT -name "fence_vmware" -exec rm {} \;
 # remove docs
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/cluster
+# cleanup perl bindings bits
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
+find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} \;
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -empty -exec rm -f {} \;
+find $RPM_BUILD_ROOT -type f -name CCS.so -exec chmod 755 {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,6 +116,7 @@
 Requires: openais >= 0.84-2 sg3_utils
 Requires: sg3_utils OpenIPMI telnet openssh-clients
 Requires: pexpect net-snmp-utils pyOpenSSL
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description -n cman
 Red Hat Cluster Manager
@@ -152,6 +161,7 @@
 %{_datadir}/fence*
 %{_datadir}/snmp/mibs/*
 /usr/libexec/*
+%{perl_vendorarch}/*
 %dir /var/log/cluster
 %{_mandir}/man5/*
 %{_mandir}/man7/*
@@ -163,6 +173,7 @@
 %{_mandir}/man8/gfs_control*
 %{_mandir}/man8/group*
 %{_mandir}/man8/*qdisk*
+%{_mandir}/man3/*.3pm.gz
 
 %package -n cman-devel
 Group: Development/Libraries
@@ -173,7 +184,7 @@
 %defattr(-,root,root,-)
 %{_libdir}/*.so
 %{_includedir}/*
-%{_mandir}/man3/*
+%{_mandir}/man3/*3.gz
 
 %description -n cman-devel
 The Cluster Manager development package
@@ -290,6 +301,15 @@
 %{_mandir}/man8/gnbd*
 
 %changelog
+* Fri Aug  1 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.07-1
+- New upstream release.
+- Add patch to build against new headers (already part of upstream next release)
+- BR on perl(ExtUtils::MakeMaker) to build perl bindings
+- Fix logrotate install from upstream
+- Add "clean up after perl bindings" snippet
+- Update Requires for perl bindings
+- Properly split man3 man pages
+
 * Tue Jul 15 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.06-1
 - New upstream release.
 - BR on new openais for logging features.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Jul 2008 11:17:04 -0000	1.6
+++ sources	4 Aug 2008 07:09:04 -0000	1.7
@@ -1 +1 @@
-ff0b5733f15043f04f5c84c481dd88ba  cluster-2.99.06.tar.gz
+f3c04af1b1ef4a9213ef0e70a028b9ac  cluster-2.99.07.tar.gz




More information about the fedora-extras-commits mailing list