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