[netatalk/el6/master] - updated to latest upstream 2.1.5 - initial version of EPEL 6

Tue Jan 25 10:25:34 UTC 2011

commit 7ada68046160978a7a3a6c075918540be996398e
Author: Jiri Skala <jskala at skalniknb.(none)>
Date:   Tue Jan 25 11:26:00 2011 +0100

    - updated to latest upstream 2.1.5 - initial version of EPEL 6

 .gitignore                       |    1 +
 netatalk-2.0.3-nodefault.patch   |    9 ---
 netatalk-2.0.4-db4_2-db4_3.patch |   34 -----------
 netatalk-2.0.4-open_call.patch   |  119 --------------------------------------
 netatalk.spec                    |   82 +++++++++++---------------
 sources                          |    2 +-
 6 files changed, 37 insertions(+), 210 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 6afc5ec..ae73363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 netatalk-2.0.4.tar.bz2
+/netatalk-2.1.5.tar.bz2
diff --git a/netatalk.spec b/netatalk.spec
index 013bcde..acfd922 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -1,18 +1,17 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
-Version: 2.0.4
-Release: 5%{?dist}
+Version: 2.1.5
+Release: 1%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
 Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
 # Source1: atalk.init
 Source2: netatalk.pam-system-auth
-Patch1:  netatalk-2.0.4-db4_2-db4_3.patch
-Patch2:  netatalk-2.0.2-uams_no_pie.patch
-Patch3:  netatalk-2.0.4-extern_ucreator.patch
-Patch4:  netatalk-2.0.3-nodefault.patch
-Patch5:  netatalk-2.0.4-open_call.patch
+
+Patch1:  netatalk-2.0.2-uams_no_pie.patch
+Patch2:  netatalk-2.0.4-extern_ucreator.patch
+
 Url:	 http://netatalk.sourceforge.net/
 Requires: pam
 Requires(post): /sbin/chkconfig /sbin/ldconfig
@@ -37,11 +36,9 @@ programs.
 
 %prep
 %setup -q
-%patch1  -p1 -b .db4_2-db4_3
-%patch2  -p1 -b .uams_no_pie
-%patch3  -p1 -b .extern_ucreator
-%patch4  -p1
-%patch5  -p1 -b .open_call
+
+%patch1  -p1 -b .uams_no_pie
+%patch2  -p1 -b .extern_ucreator
 
 ln -s ./NEWS ChangeLog
 
@@ -86,32 +83,17 @@ make %{?_smp_mflags} all
 %install
 rm -rf $RPM_BUILD_ROOT
 
-#mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-#mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-#mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk}
-
 make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
-#
-# 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%{_initrddir}/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 example config files in doc
 mkdir config.example
-cp -fp `ls config/* | egrep -v 'tmpl$|Makefile' | tr '\n' ' '` config.example
+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/netatalk.conf config.example
+cp -fp config/papd.conf config.example
+
 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
@@ -133,8 +115,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun
 if [ "$1" = "0" ] ; then
-  /sbin/service atalk stop > /dev/null 2>&1
-  /sbin/chkconfig --del atalk
+  # check for existence due to renaming initscritp
+  if [ -x  %{_initrddir}/netatalk ] ; then
+    /sbin/service atalk stop > /dev/null 2>&1
+    /sbin/chkconfig --del atalk
+  fi
 fi
 
 %postun
@@ -147,17 +132,16 @@ fi
 %defattr(-,root,root)
 %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) %{_initrddir}/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
-%config(noreplace) /etc/pam.d/netatalk
+%dir %{_sysconfdir}/atalk
+%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}/pam.d/netatalk
 %{_sbindir}/*
 %{_bindir}/*
 %exclude %{_bindir}/netatalk-config
@@ -170,6 +154,7 @@ fi
 
 %files devel
 %defattr(-,root,root)
+%doc COPYRIGHT COPYING
 %dir %{_includedir}/atalk
 %dir %{_includedir}/netatalk
 %attr(0644,root,root) %{_includedir}/atalk/*
@@ -179,6 +164,9 @@ fi
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Tue Jan 25 2011 Jiri Skala <jskala at redhat.com> - 4:2.1.5-1
+- updated to latest upstream 2.1.5 - initial version of EPEL 6
+
 * Mon Nov 23 2009 Jiri Skala <jskala at redhat.com> - 4:2.0.4-5
 - fixed #538842 -  BuildRequires: libgcrypt-devel
 - fixed #537402 -  unnecessary files in SRPM
diff --git a/sources b/sources
index dba923b..f075345 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f2f40b51ab9268836ef89a7dffaccb0  netatalk-2.0.4.tar.bz2
+2495f832643cef131bc3032274fbf926  netatalk-2.1.5.tar.bz2
