diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 852af0f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vblade -# $Id$ -NAME := vblade -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) diff --git a/vblade.spec b/vblade.spec index 23fbd61..f02ef91 100644 --- a/vblade.spec +++ b/vblade.spec @@ -1,10 +1,10 @@ Name: vblade Version: 14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual EtherDrive (R) blade daemon Group: System Environment/Base -License: GPL +License: GPLv2 URL: http://sourceforge.net/projects/aoetools/ Source0: http://dl.sf.net/aoetools/%{name}-%{version}.tgz Source1: %{name}.init @@ -41,6 +41,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/var/run/%{name} install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name} install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf @@ -67,6 +68,7 @@ fi %defattr(-,root,root,-) %doc COPYING HACKING NEWS README %config(noreplace) %{_sysconfdir}/%{name}.conf +%dir /var/run/%{name} %{_initrddir}/%{name} %{_sbindir}/vblade %{_sbindir}/vbladed @@ -74,6 +76,10 @@ fi %changelog +* Wed Aug 22 2007 Patrick "Jima" Laughton 14-3 +- Add missing /var/run/vblade/ +- License clarification + * Sat Apr 07 2007 Patrick "Jima" Laughton 14-2 - Forced CFLAGS on build