Browse Source

* netatalk: new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4382 ec354946-7b23-47d6-9f5a-488ba84defc7
shaolin 12 years ago
parent
commit
3b23f35ac6
1 changed files with 26 additions and 22 deletions
  1. 26 22
      n/netatalk/netatalk-vl.spec

+ 26 - 22
n/netatalk/netatalk-vl.spec

@@ -4,28 +4,28 @@
 Summary:       AppleTalk and AppleShare/IP services for Linux
 Summary(ja):   Linux 用 AppleTalk, AppleShare/IP サービス
 Name:          netatalk
-Version:       2.1.5
+Version:       2.2.0
 Release:       1%{_dist_release}
 License:       GPLv2+
 Group:         System Environment/Daemons
+## this version 2.2.0 obtained at:
+## http://www003.upp.so-net.ne.jp/hat/netatalk/
 Source0:       %{name}-%{version}.tar.bz2
+## the above tarball somewhat misses the following header file
+## this extracted from https://github.com/jrmithdobbs/netatalk-2-2-0-p6
+## commit 6e40f7d3bdf47b6356e0
+Source100:     jrmithdobbs-netatalk-2-2-0-p6-6e40f7d_fce_api_internal.h
 URL:           http://netatalk.sourceforge.net/
 Obsoletes:     netatalk-1.4b2+asun
 
 # patch for default config file
-Patch10:       netatalk-2.1.3-config-utf8.patch
-
-# other patches
-#Patch13:       netatalk-2.0.3-db43.patch
-#Patch14:       netatalk-2.0.3-newerdb.patch
-
-Source10:      afpd.service
+Patch10:       netatalk-2.2.0-config-utf8.patch
 
 
 ############################################################## REQUIREMENTS
 Requires(pre): chkconfig, /sbin/ldconfig, grep, textutils
 Requires:      cracklib, openssl, tcp_wrappers, pam, perl
-BuildRequires: openssl-devel, pam-devel, cups-devel, db4-devel, quota
+BuildRequires: openssl-devel, avahi-devel, pam-devel, db4-devel, quota
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
@@ -64,8 +64,9 @@ programs.
 
 %patch10 -p1 -b .cjk-config
 
-#%patch13 -p1 -b .db43
-#%patch14 -p1 -b .newerdb
+if [ ! -f "etc/afpd/fce_api_internal.h" ] ; then
+  install -m 0644 %{SOURCE100} etc/afpd/fce_api_internal.h
+fi
 
 
 %build
@@ -87,14 +88,13 @@ CFLAGS="${RPM_OPT_FLAGS} -fomit-frame-pointer -fsigned-char" \
 	--mandir=%{_mandir} \
 	--localstatedir=%{_var} \
 	--enable-shared \
-	--enable-afp3 \
+	--enable-zeroconf \
+	--disable-srvloc \
+	--enable-afp3 --disable-ddp \
 	--with-cnid-dbd-backend \
 	--with-cnid-cdb-backend \
 	--with-cnid-default-backend=dbd \
-	--enable-cups \
-	--with-message-dir=%{_sysconfdir}/netatalk/msg \
 	--with-uams-path=%{_libdir}/netatalk \
-	--with-spooldir=%{_var}/spool/netatalk \
 	--enable-redhat \
 	--with-cracklib \
 	--with-pam \
@@ -116,8 +116,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_prefix}/include/netatalk/at.h
 
 ## for Bonjour (requires nss-mdns)
-install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/avahi/services
-install -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}%{_sysconfdir}/avahi/services/
+#install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/avahi/services
+#install -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}%{_sysconfdir}/avahi/services/
 
 
 %pre
@@ -158,8 +158,8 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root)
-%doc CONTRIBUTORS COPYING COPYRIGHT
-%doc NEWS README* TODO
+%doc AUTHORS CONTRIBUTORS COPYING COPYRIGHT
+%doc ChangeLog NEWS README* TODO
 %doc doc/[A-L,N-Z]*
 %config(noreplace) /etc/netatalk/Apple*
 %config(noreplace) /etc/netatalk/*.conf
@@ -167,15 +167,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %config /etc/rc.d/init.d/netatalk
 %dir %{_sysconfdir}/netatalk
 %dir %{_sysconfdir}/netatalk/msg
-%{_sysconfdir}/avahi/services/afpd.service
-%dir %{_var}/spool/netatalk
+#%{_sysconfdir}/avahi/services/afpd.service
 %{_bindir}/*
 %{_sbindir}/*
 %{_libdir}/netatalk/*
 %exclude %{_libdir}/netatalk/*.a
 %exclude %{_libdir}/netatalk/*.la
 %{_mandir}/*/*
-%{_datadir}/netatalk/pagecount.ps
 
 
 %files devel
@@ -192,6 +190,12 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Sat Jul 23 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.2.0-1
+- new upstream release (at http://www003.upp.so-net.ne.jp/hat/netatalk/)
+- add Source100 to add one missing header file in the tarball
+- revise Patch10
+- explicitly specify --disable-ddp for the first time
+
 * Wed May 04 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.1.5-1
 - new upstream release