[netatalk] update to latest upstream netatalk-2.2.1

[Jiri Skala]

commit 09e84bc9ee408c53dab64c6951f7e7311573835c
Author: Jiri Skala <jskala at redhat.com>
Date:   Tue Nov 29 13:34:08 2011 +0100

    update to latest upstream netatalk-2.2.1

 .gitignore       |    1 +
 netatalk.service |   11 -----------
 netatalk.sh      |   47 -----------------------------------------------
 netatalk.spec    |   36 ++++++------------------------------
 sources          |    2 +-
 5 files changed, 8 insertions(+), 89 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6013e57..d5a308d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ netatalk-2.1.3.tar.bz2
 /netatalk-2.1.4.tar.bz2
 /netatalk-2.1.5.tar.bz2
 /netatalk-2.2.0.tar.bz2
+/netatalk-2.2.1.tar.bz2
diff --git a/netatalk.spec b/netatalk.spec
index 60ca3a4..1fbae63 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -1,14 +1,12 @@
 Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh
 Name:    netatalk
-Version: 2.2.0
-Release: 4%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
 Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
-Source1: netatalk.service
 Source2: netatalk.pam-system-auth
-Source3: netatalk.sh
 
 Patch1:  netatalk-2.0.2-uams_no_pie.patch
 Patch2:  netatalk-2.0.4-extern_ucreator.patch
@@ -38,16 +36,6 @@ Group: Development/Libraries
 This package contains the header files for building Appletalk networking
 programs.
 
-%package sysvinit
-Group: System Environment/Daemons
-Summary: SysV initscript for netatalk
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
-
-%description sysvinit
-The netatalk-sysvinit contains SysV initscritps support.
-
 %prep
 %setup -q
 
@@ -83,7 +71,7 @@ export CFLAGS="$CFLAGS -fsigned-char"
         --enable-krbV-uam \
         --enable-overwrite \
         --with-gnu-ld \
-	--enable-redhat \
+	--enable-redhat-systemd \
         --with-libgcrypt
 
 # Grrrr. Fix broken libtool/autoFOO Makefiles.
@@ -118,11 +106,6 @@ 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
 
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
-mkdir -p $RPM_BUILD_ROOT/usr/libexec/netatalk
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/lib/systemd/system
-install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/usr/libexec/netatalk
-
 # Clean up .a and .la files
 find $RPM_BUILD_ROOT -name \*.a -exec rm {} \;
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
@@ -142,13 +125,6 @@ fi
 %postun
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
-%triggerun --  %{name} < 4:2.2.0-2
-	/sbin/chkconfig --del netatalk >/dev/null 2>&1 || :
-	/bin/systemctl try-restart netatalk.service >/dev/null 2>&1 || :
-
-%triggerpostun -n %{name}-sysvinit -- %{name} < 4:2.2.0-2
-	/sbin/chkconfig --add netatalk >/dev/null 2>&1 || :
-
 %files
 %defattr(-,root,root)
 %doc COPYRIGHT COPYING ChangeLog VERSION NEWS 
@@ -185,10 +161,10 @@ fi
 %{_bindir}/netatalk-config
 %{_mandir}/man*/netatalk-config.1*
 
-%files sysvinit
-%attr(755,root,root) %{_initrddir}/netatalk
-
 %changelog
+* Tue Nov 29 2011 Jiri Skala <jskala at redhat.com> - 4:2.2.1-1
+- update to latest upstream netatalk-2.2.1
+
 * Fri Aug 19 2011 Jiri Skala <jskala at redhat.com> - 4:2.2.0-4
 - fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel
 
diff --git a/sources b/sources
index 0022dbd..c84ee46 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-acac2b5f2d9f43bfd5ea2a5cf4c71fe5  netatalk-2.2.0.tar.bz2
+4a371025daf96adb73fa491efdbfef28  netatalk-2.2.1.tar.bz2