rpms/keepalived/devel keepalived-1.1.14-genhashman.patch, NONE, 1.1 keepalived-1.1.14-installmodes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 keepalived.spec, 1.3, 1.4 sources, 1.2, 1.3 keepalived.init, 1.1, NONE keepalived.sysconfig, 1.1, NONE

Fri Sep 14 10:44:59 UTC 2007

Author: thias

Update of /cvs/extras/rpms/keepalived/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10299

Modified Files:
	.cvsignore keepalived.spec sources 
Added Files:
	keepalived-1.1.14-genhashman.patch 
	keepalived-1.1.14-installmodes.patch 
Removed Files:
	keepalived.init keepalived.sysconfig 
Log Message:
Update to 1.1.14.


keepalived-1.1.14-genhashman.patch:

--- NEW FILE keepalived-1.1.14-genhashman.patch ---
diff -Naupr keepalived-1.1.14.orig/genhash/Makefile.in keepalived-1.1.14/genhash/Makefile.in
--- keepalived-1.1.14.orig/genhash/Makefile.in	2007-09-13 16:47:12.000000000 +0200
+++ keepalived-1.1.14/genhash/Makefile.in	2007-09-13 18:48:23.000000000 +0200
@@ -39,13 +39,13 @@ distclean: clean
 
 uninstall:
 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
-	rm -f $(DESTDIR)$(mandir)/man/man1/genhash.1
+	rm -f $(DESTDIR)$(mandir)/man1/genhash.1
 
 install:
 	install -d $(DESTDIR)$(bindir)
 	install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(bindir)/
-	install -d $(DESTDIR)$(mandir)/man/man1
-	install -m 644 ../doc/man/man1/genhash.1 $(DESTDIR)$(mandir)/man/man1
+	install -d $(DESTDIR)$(mandir)/man1
+	install -m 644 ../doc/man/man1/genhash.1 $(DESTDIR)$(mandir)/man1
 
 mrproper: clean distclean
 	rm -f config.*

keepalived-1.1.14-installmodes.patch:

--- NEW FILE keepalived-1.1.14-installmodes.patch ---
diff -Naupr keepalived-1.1.14.orig/keepalived/Makefile.in keepalived-1.1.14/keepalived/Makefile.in
--- keepalived-1.1.14.orig/keepalived/Makefile.in	2007-09-13 15:44:39.000000000 +0200
+++ keepalived-1.1.14/keepalived/Makefile.in	2007-09-14 12:38:43.000000000 +0200
@@ -99,13 +99,13 @@ uninstall:
 
 install:
 	install -d $(DESTDIR)$(sbindir)
-	install -m 700 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/
+	install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/
 	install -d $(DESTDIR)$(init_dir)
 	install -m 755 etc/init.d/keepalived.init $(DESTDIR)$(init_dir)/keepalived
 	install -d $(DESTDIR)$(sysconf_dir)
-	install -m 755 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived
+	install -m 644 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived
 	install -d $(DESTDIR)$(sysconfdir)/keepalived/samples
-	install -m 644 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/
+	install -m 640 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/
 	install -m 644 ../doc/samples/* $(DESTDIR)$(sysconfdir)/keepalived/samples/
 	install -d $(DESTDIR)$(mandir)/man5
 	install -d $(DESTDIR)$(mandir)/man8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Mar 2007 17:32:27 -0000	1.2
+++ .cvsignore	14 Sep 2007 10:44:23 -0000	1.3
@@ -1 +1 @@
-keepalived-1.1.13.tar.gz
+keepalived-1.1.14.tar.gz


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keepalived.spec	22 Aug 2007 17:35:37 -0000	1.3
+++ keepalived.spec	14 Sep 2007 10:44:23 -0000	1.4
@@ -3,18 +3,18 @@
 
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
-Version: 1.1.13
-Release: 8%{?dist}
+Version: 1.1.14
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
-Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
-Source1: keepalived.init
-Source2: keepalived.sysconfig
-Patch0: keepalived-1.1.13-makefile.patch
-Patch1: keepalived-1.1.13-iflabel.patch
-Patch2: keepalived-1.1.13-types.patch
+Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
+Patch0: keepalived-1.1.14-genhashman.patch
+Patch1: keepalived-1.1.14-installmodes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(postun): /sbin/service
 BuildRequires: openssl-devel
 # We need both of these for proper LVS support
 BuildRequires: kernel, kernel-devel
@@ -34,11 +34,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .makefile
-%patch1 -p0 -b .iflabel
-%patch2 -p1 -b .types
+%patch0 -p1 -b .genhashman
+%patch1 -p1 -b .installmodes
 # Fix file mode (600 as of 1.1.13)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
+# Included as doc, so disable its dependencies
+%{__chmod} -x goodies/arpreset.pl
 
 
 %build
@@ -51,12 +52,6 @@
 %{__make} install DESTDIR=%{buildroot}
 # Remove "samples", as we include them in %%doc
 %{__rm} -rf %{buildroot}%{_sysconfdir}/keepalived/samples/
-# Init script (based on the included one, but enhanced)
-%{__install} -D -p -m 0755 %{SOURCE1} \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/keepalived
-# Sysconfig file (used by the init script)
-%{__install} -D -p -m 0640 %{SOURCE2} \
-    %{buildroot}%{_sysconfdir}/sysconfig/keepalived
 
 
 %check
@@ -90,10 +85,10 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHOR ChangeLog CONTRIBUTORS COPYING README TODO
-%doc doc/keepalived.conf.SYNOPSIS doc/samples/
+%doc doc/keepalived.conf.SYNOPSIS doc/samples/ goodies/arpreset.pl
 %dir %{_sysconfdir}/keepalived/
-%attr(0640, root, root) %config(noreplace) %{_sysconfdir}/keepalived/keepalived.conf
-%attr(0640, root, root) %config(noreplace) %{_sysconfdir}/sysconfig/keepalived
+%config(noreplace) %{_sysconfdir}/keepalived/keepalived.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/keepalived
 %{_sysconfdir}/rc.d/init.d/keepalived
 %{_bindir}/genhash
 %{_sbindir}/keepalived
@@ -103,6 +98,14 @@
 
 
 %changelog
+* Thu Sep 13 2007 Matthias Saou <http://freshrpms.net/> 1.1.14-1
+- Update to 1.1.14.
+- Remove all upstreamed patches.
+- Remove our init script and sysconfig files, use the same now provided by the
+  upstream package (will need to patch for LSB stuff soonish).
+- Include new goodies/arpreset.pl in %%doc.
+- Add missing scriplet requirements.
+
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.1.13-8
 - Rebuild for new BuildID feature.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Mar 2007 17:32:27 -0000	1.2
+++ sources	14 Sep 2007 10:44:23 -0000	1.3
@@ -1 +1 @@
-578bdb8e3ff4cca50fc877893bad658c  keepalived-1.1.13.tar.gz
+5a60f1c48a15153baccc0b04855d0e23  keepalived-1.1.14.tar.gz


--- keepalived.init DELETED ---


--- keepalived.sysconfig DELETED ---


