dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-ucarp-1.0.tar.bz2

.gitignore

@@ -0,0 +1 @@
+ucarp-1.2.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ucarp
-# $Id$
-NAME := ucarp
-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/Rootx && { 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)

carp.init

@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: carp.init,v 1.1 2004/11/09 02:50:47 cvsextras Exp $
+# $Id: carp.init,v 1.3 2006/08/22 13:08:17 thias Exp $
 #
 # chkconfig: - 91 09
 # description: Starts and stops ucarp. \
@@ -15,7 +15,7 @@
 [ ${NETWORKING} = "no" ] && exit 0
 
 get_files() {
-    FILES=`find /etc/sysconfig/carp -type f -name 'vip-*.conf' -maxdepth 1 \
+    FILES=`find /etc/sysconfig/carp -maxdepth 1 -type f -name 'vip-*.conf' \
            -printf "%f\n" | LC_COLLATE="C" sort`
 }
 

sources

@@ -1 +1 @@
-f40451c2d614e00121cbae0b0cbdb832  ucarp-1.0.tar.bz2
+bed7ae84520f2e0faf3e68e9cfe4e1aa  ucarp-1.2.tar.bz2

ucarp.spec

@@ -1,20 +1,26 @@
-# $Id: ucarp.spec,v 1.2 2004/11/09 02:50:54 cvsextras Exp $
-
 Summary: Common Address Redundancy Protocol (CARP) for Unix
 Name: ucarp
-Version: 1.0
-Release: 1.1.fc2.fr
+Version: 1.2
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.ucarp.org/
-Source: http://www.pureftpd.org/ucarp/ucarp-%{version}.tar.bz2
+Source0: http://download.pureftpd.org/pub/ucarp/ucarp-%{version}.tar.bz2
 Source1: carp.init
 Source2: vip-001.conf.example
+Patch0: ucarp-1.3-pre.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
-BuildRequires: libpcap, gettext
+BuildRequires: gettext
+BuildRequires: autoconf, automake, libtool
+# Use libpcap up to FC5, and libpcap-devel for FC6+ and non-Fedora
+%if %{!?fedora:6}%{?fedora} >= 6
+BuildRequires: libpcap-devel
+%else
+BuildRequires: libpcap
+%endif
 
 
 %description
@@ -29,6 +35,7 @@ need for any dedicated extra network link between redundant hosts.
 
 %prep
 %setup
+%patch -p1
 
 
 %build
@@ -91,6 +98,7 @@ fi
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING ChangeLog NEWS README examples/linux/*.sh
 /etc/rc.d/init.d/carp
+%dir /etc/sysconfig/carp/
 /etc/sysconfig/carp/vip-001.conf.example
 %attr(0700, root, root) %config(noreplace) /etc/sysconfig/carp/vip-up
 %attr(0700, root, root) %config(noreplace) /etc/sysconfig/carp/vip-down
@@ -98,6 +106,41 @@ fi
 
 
 %changelog
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.2-4
+- FC6 rebuild.
+
+* Tue Aug 22 2006 Matthias Saou <http://freshrpms.net/> 1.2-3
+- Update to 1.3 snapshot, which includes the ARP fix, as well as fixes for the
+  segfaults reported in #200400 and #201596.
+- Add autoconf, automake and libtool build reqs for the 1.3 patch.
+
+* Thu Jul 27 2006 Matthias Saou <http://freshrpms.net/> 1.2-3
+- Fix init script for recent find versions (#200395).
+
+* Thu Jun 22 2006 Matthias Saou <http://freshrpms.net/> 1.2-2
+- Include ARP patch backported from 1.3 snapshot (#196095).
+- Make libpcap build requirement conditional to be able to share spec file.
+
+* Wed Jun 21 2006 Matthias Saou <http://freshrpms.net/> 1.2-1
+- Update to 1.2.
+- BuildRequire libpcap-devel instead of libpcap now that it has been split.
+
+* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 1.1-5
+- FC5 rebuild.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 1.1-4
+- Rebuild for new gcc/glibc.
+
+* Thu Nov 17 2005 Matthias Saou <http://freshrpms.net/> 1.1-3
+- Rebuild against new libpcap library.
+
+* Fri Apr  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1-2
+- Add %%dir entry for /etc/sysconfig/carp directory.
+
+* Thu Jan 13 2005 Matthias Saou <http://freshrpms.net/> 1.1-1
+- Update to 1.1.
+- Update source location.
+
 * Fri Jul  9 2004 Matthias Saou <http://freshrpms.net/> 1.0-1
 - Initial RPM release.
 

vip-001.conf.example

@@ -1,6 +1,6 @@
 # Virtual IP configuration file for UCARP
 # The number (from 001 to 255) in the name of the file is the identifier
-# $Id: vip-001.conf.example,v 1.1 2004/11/09 02:50:47 cvsextras Exp $
+# $Id: vip-001.conf.example,v 1.2 2006/06/22 10:05:17 thias Exp $
 
 # Set the same password on all mamchines sharing the same virtual IP
 PASSWORD="love"