rpms/gfs2-utils/F-9 .cvsignore, 1.12, 1.13 gfs2-utils.spec, 1.22, 1.23 sources, 1.13, 1.14

Fabio M. Di Nitto (fabbione) fedora-extras-commits at redhat.com
Fri May 30 07:33:58 UTC 2008


Author: fabbione

Update of /cvs/pkgs/rpms/gfs2-utils/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7556

Modified Files:
	.cvsignore gfs2-utils.spec sources 
Log Message:
Prepare update for F-9 based on new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Apr 2008 09:47:05 -0000	1.12
+++ .cvsignore	30 May 2008 07:33:17 -0000	1.13
@@ -1 +1 @@
-cluster-2.03.00.tar.gz
+cluster-2.03.03.tar.gz


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-9/gfs2-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gfs2-utils.spec	14 Apr 2008 09:47:05 -0000	1.22
+++ gfs2-utils.spec	30 May 2008 07:33:17 -0000	1.23
@@ -11,19 +11,18 @@
 ###############################################################################
 
 Name: gfs2-utils
-Version: 2.03.00
-Release: 3%{?dist}
+Version: 2.03.03
+Release: 1%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS2)
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(preun): /sbin/chkconfig
+Requires(post): chkconfig
+Requires(preun): initscripts
+Requires(preun): chkconfig
 Requires: ncurses
 BuildRequires: ncurses-devel
 BuildRequires: glibc-kernheaders
 BuildRequires: libvolume_id-devel
-BuildRequires: kernel-devel
 BuildRequires: perl
 URL: http://sources.redhat.com/cluster/wiki/
 # This file comes from the link at the above URL (cluster 2).
@@ -42,10 +41,13 @@
 %setup -q -n cluster-%{version}
 
 %build
-ksrc=`ls -d /usr/src/kernels/*`
-./configure --kernel_build=${ksrc} --kernel_src=${ksrc} --libdir=%{_libdir} --release_version=%{version}
-cd gfs2
-make %{_smp_mflags}
+./configure \
+  --sbindir=/sbin \
+  --initddir=%{_sysconfdir}/rc.d/init.d \
+  --libdir=%{_libdir} \
+  --disable_kernel_check
+
+make -C gfs2 all %{_smp_mflags}
 
 %post
 /sbin/chkconfig --add gfs2
@@ -58,20 +60,29 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd gfs2
-make install DESTDIR=$RPM_BUILD_ROOT
+make -C gfs2 install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-/usr/sbin/*
+%{_sysconfdir}/rc.d/init.d/gfs2
 /sbin/*
-/etc/init.d/gfs2
-%{_mandir}/*/*
+%{_mandir}/man8/*gfs2*
 
 %changelog
+* Fri May 30 2008 Fabio M. Di Nitto <fdinitto at redhat.com> 2.03.03-1
+- New upstream release
+- Fix several build warnings
+- Update spec files to use macros
+- Update Requires to use packages rather than pointing at files
+- Drop BR on kernel-devel since it's not required anymore
+- Update build section to use proper _sysconfdir, libdir and sbindir
+- Avoid abusing cd when we can ask make to do the work for us
+- Remove /usr/sbin from file section. We don't have any file there
+  and we can avoid shipping stuff by mistake
+
 * Mon Apr 14 2008 Steven Whitehouse <swhiteho at redhat.com> 2.03.00-3
 - Fabbione saves the day. We can get rid of the sed stuff after all
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	14 Apr 2008 09:47:05 -0000	1.13
+++ sources	30 May 2008 07:33:17 -0000	1.14
@@ -1 +1 @@
-48921660b484849843af9edce107f5ee  cluster-2.03.00.tar.gz
+77439dadf16204c3f68e7d4f3fdfd33d  cluster-2.03.03.tar.gz




More information about the fedora-extras-commits mailing list