[netatalk/el6] updated to latest upstream 2.2.0

[Jiri Skala]

commit 55d4aca87c6991770ef13a7c3f0fd58766acdec1
Author: Jiri Skala <jskala at redhat.com>
Date:   Tue Aug 2 09:19:16 2011 +0200

    updated to latest upstream 2.2.0

 .gitignore    |    1 +
 netatalk.spec |   41 ++++++++++++++++++++++-------------------
 sources       |    2 +-
 3 files changed, 24 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ae73363..de50270 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 netatalk-2.0.4.tar.bz2
 /netatalk-2.1.5.tar.bz2
+/netatalk-2.2.0.tar.bz2
diff --git a/netatalk.spec b/netatalk.spec
index d90d4c5..bd48daa 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
-Version: 2.1.5
-Release: 2%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
@@ -58,8 +58,9 @@ export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen"
 %ifarch ppc ppc64 s390 s390x
 export CFLAGS="$CFLAGS -fsigned-char"
 %endif
+
 %configure \
-	--with-pkgconfdir=/etc/atalk/ \
+	--with-pkgconfdir=/etc/netatalk/ \
 	--with-cracklib \
         --with-pam \
 	--with-shadow \
@@ -92,17 +93,17 @@ cp -fp config/afpd.conf config.example
 cp -fp config/AppleVolumes.system config.example
 cp -fp config/AppleVolumes.default config.example
 cp -fp config/atalkd.conf config.example
+cp -fp config/atalkd.conf $RPM_BUILD_ROOT%{_sysconfdir}/netatalk
 cp -fp config/netatalk.conf config.example
 cp -fp config/papd.conf config.example
+cp -fp config/papd.conf $RPM_BUILD_ROOT%{_sysconfdir}/netatalk
+mkdir -p $RPM_BUILD_ROOT/usr/share/netatalk
+cp -fp etc/psf/pagecount.ps $RPM_BUILD_ROOT/usr/share/netatalk
 
 cp -fp %{SOURCE2} config.example
 # XXX bad hack until this file is updated in glibc-headers:
 rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h
 
-# Fix up ICDumpSuffixMap
-sed -e 's/\r/\n/' -e 's:#!perl:#!%{__perl}:' contrib/ICDumpSuffixMap > ICDumpSuffixMap
-touch -r contrib/ICDumpSuffixMap ICDumpSuffixMap
-
 # Clean up .a and .la files
 find $RPM_BUILD_ROOT -name \*.a -exec rm {} \;
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
@@ -111,7 +112,7 @@ find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add atalk
+/sbin/chkconfig --add netatalk
 /sbin/ldconfig
 
 %preun
@@ -119,7 +120,7 @@ if [ "$1" = "0" ] ; then
   # check for existence due to renaming initscritp
   if [ -x  %{_initrddir}/netatalk ] ; then
     /sbin/service atalk stop > /dev/null 2>&1
-    /sbin/chkconfig --del atalk
+    /sbin/chkconfig --del netatalk
   fi
 fi
 
@@ -131,17 +132,17 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc COPYRIGHT ChangeLog README* TODO VERSION NEWS 
-%doc ICDumpSuffixMap doc
+%doc COPYRIGHT COPYING ChangeLog VERSION NEWS 
+%doc doc
 %doc config.example
-%dir %{_sysconfdir}/atalk
+%dir %{_sysconfdir}/netatalk
 %attr(755,root,root) %{_initrddir}/netatalk
-%config(noreplace) %{_sysconfdir}/atalk/AppleVolumes.default
-%config(noreplace) %{_sysconfdir}/atalk/AppleVolumes.system
-%config(noreplace) %{_sysconfdir}/atalk/netatalk.conf
-%config(noreplace) %{_sysconfdir}/atalk/afpd.conf
-%config(noreplace) %{_sysconfdir}/atalk/atalkd.conf
-%config(noreplace) %{_sysconfdir}/atalk/papd.conf
+%config(noreplace) %{_sysconfdir}/netatalk/AppleVolumes.default
+%config(noreplace) %{_sysconfdir}/netatalk/AppleVolumes.system
+%config(noreplace) %{_sysconfdir}/netatalk/netatalk.conf
+%config(noreplace) %{_sysconfdir}/netatalk/afpd.conf
+%config(noreplace) %{_sysconfdir}/netatalk/atalkd.conf
+%config(noreplace) %{_sysconfdir}/netatalk/papd.conf
 %config(noreplace) %{_sysconfdir}/pam.d/netatalk
 %{_sbindir}/*
 %{_bindir}/*
@@ -151,7 +152,6 @@ fi
 %{_datadir}/netatalk
 %dir %{_libdir}/atalk
 %{_libdir}/atalk/*.so
-%{_libexecdir}/*
 
 %files devel
 %defattr(-,root,root)
@@ -165,6 +165,9 @@ fi
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Fri Jul 22 2011 Jiri Skala <jskala at redhat.com> - 4:2.2.0-1
+- updated to latest upstream 2.2.0
+
 * Fri Jul 22 2011 Jiri Skala <jskala at redhat.com> - 4:2.1.5-2
 - add --with-libgcrypt option
 
diff --git a/sources b/sources
index f075345..0022dbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2495f832643cef131bc3032274fbf926  netatalk-2.1.5.tar.bz2
+acac2b5f2d9f43bfd5ea2a5cf4c71fe5  netatalk-2.2.0.tar.bz2