dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ocfs2-tools
-# $Id$
-NAME := ocfs2-tools
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

ocfs2-tools.spec

@@ -6,7 +6,7 @@
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
 Version: 1.3.9
-Release: 7.%{alphatag}%{?dist}
+Release: 8%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -22,7 +22,7 @@ Source: %{name}-%{version}.tar.gz
 URL: http://oss.oracle.com/projects/ocfs2-tools/
 Requires(post): chkconfig
 Requires(preun): chkconfig
-Requires(preun): /sbin/service
+Requires(preun): initscripts
 Requires: bash, coreutils, net-tools, modutils
 Requires: e2fsprogs, chkconfig, glib2 >= 2.2.3
 BuildRequires: e2fsprogs-devel, glib2-devel >= 2.2.3
@@ -82,7 +82,7 @@ develop Ocfs2 filesystem-specific programs.
     --enable-dynamic-fsck=yes
 
 # parallel build currently fails, so no %{_smp_mflags}
-make
+CFLAGS="$(echo '%{optflags}')" make
 
 
 %install
@@ -183,11 +183,16 @@ fi
 
 
 %changelog
+* Thu Jun 19 2008 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.3.9-8.20080221git
+- Make alpha tag optional
+- Use package names rather than files for Requires
+- Clean up changelog in spec file
+- Respect fedora build default CFLAGS
 
-* Fri Apr 18 2008 Mark Fasheh <mark@fasheh.com> - 1.3.9-7.20080221git.fc8
+* Fri Apr 18 2008 Mark Fasheh <mark@fasheh.com> - 1.3.9-7.20080221git
 - Use 'Fedora' as vendor for desktop-file-install
 
-* Thu Feb 21 2008 Mark Fasheh <mark@fasheh.com> - 1.3.9-6.20080221git.fc8
+* Thu Feb 21 2008 Mark Fasheh <mark@fasheh.com> - 1.3.9-6.20080221git
 - Move to git revision 22fb58d0318a2946479833bb5e2fd58864499c78
 
 * Mon Feb  4 2008 Mark Fasheh <mark@fasheh.com> - 1.3.9-5.20080131git