From 8e4ed927a8e6b6667d6b71f0497f2510a4a948c1 Mon Sep 17 00:00:00 2001
From: jvdias <jvdias@fedoraproject.org>
Date: Jun 16 2005 21:08:02 +0000
Subject: upgrade to 2.0.3; fix bug 160486


---

diff --git a/.cvsignore b/.cvsignore
index c4fe991..abb0106 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 netatalk-1.6.4.tar.bz2
 netatalk-2.0.2.tar.bz2
+netatalk-2.0.3.tar.bz2
diff --git a/netatalk.spec b/netatalk.spec
index e672686..4a449e5 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -1,12 +1,12 @@
  %define initdir /etc/rc.d/init.d
 
 Summary: AppleTalk networking programs
-Name: netatalk
-Version: 2.0.2
-Release: 3
-Epoch:   3
+Name:    netatalk
+Version: 2.0.3
+Release: 1
+Epoch:   4
 License: GPL
-Group: System Environment/Daemons
+Group: 	 System Environment/Daemons
 Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
 Source1: atalk.init
 #Source2: netatalk.config
@@ -20,8 +20,8 @@ Patch1:  netatalk-2.0.2-db4_2-db4_3.patch
 Patch2:  netatalk-2.0.2-uams_no_pie.patch
 Patch3:  netatalk-2.0.2-extern_ucreator.patch
 Obsoletes: netatalk-1.6.4, netatalk-1.5.5
-Url: http://netatalk.sourceforge.net/
-Prereq: /sbin/chkconfig, /sbin/service 
+Url:	 http://netatalk.sourceforge.net/
+Prereq:  /sbin/chkconfig, /sbin/service 
 Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib
 BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf
 BuildRoot: %{_tmppath}/%{name}-root
@@ -95,23 +95,33 @@ make all
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-mkdir -p $RPM_BUILD_ROOT%{initdir}
-mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk}
+#mkdir -p $RPM_BUILD_ROOT/etc/pam.d
+#mkdir -p $RPM_BUILD_ROOT%{initdir}
+#mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk}
 
 make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
-
-install -m644 config/AppleVolumes.default $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.default
-install -m644 config/afpd.conf $RPM_BUILD_ROOT/etc/atalk/afpd.conf
-install -m644 config/atalkd.conf $RPM_BUILD_ROOT/etc/atalk/atalkd.conf
-install -m644 config/papd.conf $RPM_BUILD_ROOT/etc/atalk/papd.conf
-install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/etc/pam.d/netatalk
-install -m644 %{SOURCE4} .
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk
-cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/
-cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/
-rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir*
+#
+# netatalk now installs its own config files, which are more
+# appropriate for v2.0 than the ones we used to ship.
+#
+#install -m644 config/AppleVolumes.default $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.default
+#install -m644 config/afpd.conf $RPM_BUILD_ROOT/etc/atalk/afpd.conf
+#install -m644 config/atalkd.conf $RPM_BUILD_ROOT/etc/atalk/atalkd.conf
+#install -m644 config/papd.conf $RPM_BUILD_ROOT/etc/atalk/papd.conf
+#install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/etc/pam.d/netatalk
+#
+# Use netatalk's redhat initscript
+#
+#install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk
+#cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/
+#cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/
 chmod a-x bin/afile/acleandir.rc
+rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir*
+install -m644 %{SOURCE4} .
+# 
+# install example config files in doc
+mkdir config.example
+cp -fp `ls config/* | egrep -v 'tmpl$|Makefile' | tr '\n' ' '` config.example
 
 # XXX bad hack until this file is updated in glibc-headers:
 rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h
@@ -138,14 +148,15 @@ fi
 %doc COPYRIGHT ChangeLog README* TODO VERSION NEWS 
 %doc ICDumpSuffixMap doc
 %doc bin/afile/acleandir.rc
+%doc config.example
 %dir /etc/atalk
+%attr(755,root,root) %config %{initdir}/atalk
 %config(noreplace) /etc/atalk/AppleVolumes.default
 %config(noreplace) /etc/atalk/AppleVolumes.system
 %config(noreplace) /etc/atalk/netatalk.conf
 %config(noreplace) /etc/atalk/afpd.conf
 %config(noreplace) /etc/atalk/atalkd.conf
 %config(noreplace) /etc/atalk/papd.conf
-%attr(755,root,root) %config %{initdir}/atalk
 %config(noreplace) /etc/pam.d/netatalk
 %{_sbindir}/*
 %{_bindir}/*
@@ -166,6 +177,10 @@ fi
 %{_libdir}/atalk/*.la
 
 %changelog
+* Thu Jun 16 2005 Jason Vas Dias <jvdias@redhat.com>
+- Upgrade to upstream version 2.0.3
+- fix bug 160486: use netatalk's initscript
+
 * Wed Mar 30 2005 Florian La Roche <laroche@redhat.com>
 - quick fix: rm -f /usr/include/netatalk/at.h until this
   is resolved the correct way
diff --git a/sources b/sources
index 26ae7eb..bde5f18 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-8bed0582d51deef7a31da1b6ae5df2e6  netatalk-1.6.4.tar.bz2
-539e1f60681db40a4c4e2157854cb3eb  netatalk-2.0.2.tar.bz2
+28092763085783805dc2f00aa2127a3e  netatalk-2.0.3.tar.bz2