From eaa7f84b63e020434285dcc568794cc23465f01c Mon Sep 17 00:00:00 2001
From: Patrick Laughton <jima@fedoraproject.org>
Date: Apr 11 2007 19:30:51 +0000
Subject: - New upstream release with "certainly important" bugfix

- Removed URLs from patch lines (it's all in CVS)
- Added patch to fix man page permissions (755 -> 644)
- rpmlint's "mixed-use-of-spaces-and-tabs" is mostly a false positive

---

diff --git a/.cvsignore b/.cvsignore
index 28917f9..91d4146 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-conserver-8.1.14.tar.gz
+conserver-8.1.16.tar.gz
diff --git a/conserver-manperms.patch b/conserver-manperms.patch
new file mode 100644
index 0000000..e042cc9
--- /dev/null
+++ b/conserver-manperms.patch
@@ -0,0 +1,33 @@
+--- conserver-8.1.16/conserver.cf/Makefile.in.orig	2007-04-11 14:04:28.000000000 -0500
++++ conserver-8.1.16/conserver.cf/Makefile.in	2007-04-11 14:06:51.000000000 -0500
+@@ -23,7 +23,7 @@
+ 
+ install:
+ 	$(MKDIR) $(DESTDIR)$(mandir)/man5
+-	$(INSTALL) conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5
+-	$(INSTALL) conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5
++	$(INSTALL) -m 0644 conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5
++	$(INSTALL) -m 0644 conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5
+ 
+ .PHONY: clean distclean install
+--- conserver-8.1.16/conserver/Makefile.in.orig	2007-04-11 14:04:28.000000000 -0500
++++ conserver-8.1.16/conserver/Makefile.in	2007-04-11 14:05:27.000000000 -0500
+@@ -61,7 +61,7 @@
+ 	$(MKDIR) $(DESTDIR)$(sbindir)
+ 	$(INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir)
+ 	$(MKDIR) $(DESTDIR)$(mandir)/man8
+-	$(INSTALL) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
++	$(INSTALL) -m 0644 conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
+ 	$(MKDIR) $(DESTDIR)$(pkglibdir)
+ 	$(INSTALL) convert $(DESTDIR)$(pkglibdir)/convert
+ 
+--- conserver-8.1.16/console/Makefile.in.orig	2004-05-12 16:02:13.000000000 -0500
++++ conserver-8.1.16/console/Makefile.in	2007-04-11 14:05:13.000000000 -0500
+@@ -56,6 +56,6 @@
+ 	$(MKDIR) $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) console $(DESTDIR)$(bindir)
+ 	$(MKDIR) $(DESTDIR)$(mandir)/man1
+-	$(INSTALL) console.man $(DESTDIR)$(mandir)/man1/console.1
++	$(INSTALL) -m 0644 console.man $(DESTDIR)$(mandir)/man1/console.1
+ 
+ .PHONY: clean distclean install
diff --git a/conserver.spec b/conserver.spec
index 1f333af..768bb9a 100644
--- a/conserver.spec
+++ b/conserver.spec
@@ -1,5 +1,5 @@
 Name:           conserver
-Version:        8.1.15
+Version:        8.1.16
 Release:        1%{?dist}
 Summary:        Serial console server daemon/client
 
@@ -7,9 +7,10 @@ Group:          System Environment/Daemons
 License:        Distributable
 URL:            http://www.conserver.com/
 Source0:        http://www.conserver.com/%{name}-%{version}.tar.gz
-Patch0:         http://beer.tclug.org/fedora-extras/%{name}/%{name}-8.1.14-no-exampledir.patch
-Patch1:         http://beer.tclug.org/fedora-extras/%{name}/%{name}-8.1.14-initscript.patch
-Patch2:         http://beer.tclug.org/fedora-extras/%{name}/%{name}-8.1.14-oldkrb.patch
+Patch0:         %{name}-8.1.14-no-exampledir.patch
+Patch1:         %{name}-8.1.14-initscript.patch
+Patch2:         %{name}-8.1.14-oldkrb.patch
+Patch3:         %{name}-manperms.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pam-devel, openssl-devel, tcp_wrappers
@@ -35,6 +36,7 @@ This is the client package needed to interact with a Conserver daemon.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -115,6 +117,12 @@ fi
 %{_mandir}/man1/console.1.gz
 
 %changelog
+* Wed Apr 11 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 8.1.16-1
+- New upstream release with "certainly important" bugfix
+- Removed URLs from patch lines (it's all in CVS)
+- Added patch to fix man page permissions (755 -> 644)
+- rpmlint's "mixed-use-of-spaces-and-tabs" is mostly a false positive
+
 * Wed Jan 03 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 8.1.15-1
 - New upstream release
 - Fix rpmlint warning about mixed spaces/tabs
diff --git a/sources b/sources
index ea79494..8996e9d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fba8bf42d32cf2119cd0f49b2043681c  conserver-8.1.15.tar.gz
+2364ba56f5201b07646bdfaefedd330b  conserver-8.1.16.tar.gz