[packages/netatalk: 1/2] - updated to 3.0 - build with system libevent

[baggins]

commit 674a8ac80bf4f881c1efbc9b4dc262a7a512c67d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Sep 6 13:49:41 2012 +0200

    - updated to 3.0
    - build with system libevent

 netatalk-build.patch | 21 +++++++++++++++++++++
 netatalk.spec        | 38 ++++++++++++++++++--------------------
 2 files changed, 39 insertions(+), 20 deletions(-)
---
diff --git a/netatalk.spec b/netatalk.spec
index 526fd28..881eee6 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -3,15 +3,14 @@ Summary:	AppleTalk networking programs
 Summary(pl.UTF-8):	Klient i serwer AppleTalk
 Summary(pt_BR.UTF-8):	Programas para rede AppleTalk
 Summary(zh_CN.UTF-8):	Appletalk 和 Appleshare/IP 服务工具
-%define beta beta1
 Name:		netatalk
-Version:	2.1
-Release:	0.%{beta}.1
+Version:	3.0
+Release:	1
 Epoch:		2
 License:	BSD
 Group:		Daemons
-Source0:	http://dl.sourceforge.net/netatalk/%{name}-%{version}%{beta}.tar.bz2
-# Source0-md5:	f9049565e7076b44b7b13d6e277458cd
+Source0:	http://download.sourceforge.net/netatalk/%{name}-%{version}.tar.bz2
+# Source0-md5:	62eb034011bb60b0bfd95072af3693dc
 Source1:	%{name}.init
 Source2:	%{name}.pamd
 Source3:	%{name}.sysconfig
@@ -23,6 +22,7 @@ BuildRequires:	automake
 BuildRequires:	cracklib-devel
 BuildRequires:	db-devel >= 4.6.0
 BuildRequires:	gettext-devel
+BuildRequires:	libevent-devel
 BuildRequires:	libltdl-devel
 BuildRequires:	libtool
 BuildRequires:	openssl-devel >= 0.9.7d
@@ -68,7 +68,7 @@ Arquivos de inclusão e bibliotecas para o desenvolvimento de
 aplicativos baseados no protocolo AppleTalk.
 
 %prep
-%setup -q -n %{name}-%{version}%{beta}
+%setup -q
 %patch0 -p1
 
 %build
@@ -85,12 +85,13 @@ rm -f missing
 	--with-msg-dir=%{_sysconfdir}/atalk/msg \
 	--enable-lastdid \
 	--enable-timelord \
-		--with-cracklib=%{_datadir}/dict/cracklib_dict \
-		--with-pam \
-		--with-shadow \
-		--with-tcp-wrappers \
-		--with-ssl \
-		--enable-pgp-uam \
+	--with-cracklib=%{_datadir}/dict/cracklib_dict \
+	--with-pam \
+	--with-shadow \
+	--with-tcp-wrappers \
+	--with-ssl \
+	--enable-pgp-uam \
+	--disable-bundled-libevent
 
 %{__make}
 
@@ -139,15 +140,11 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ICDu* NEWS README TODO VERSION services.atalk doc
+%doc ICDu* NEWS VERSION doc
 %dir %{_sysconfdir}/atalk
 %dir %{_sysconfdir}/atalk/msg
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/atalk/AppleVolumes.default
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/atalk/AppleVolumes.system
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/atalk/afp.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/netatalk
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/atalk/afpd.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/atalk/atalkd.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/atalk/papd.conf
 
 %attr(755,root,root) %config /etc/rc.d/init.d/atalk
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/netatalk
@@ -155,7 +152,8 @@ fi
 
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/[!n]*
-%attr(755,root,root) %{_bindir}/n[!e]*
+%attr(755,root,root) %{_libdir}/libatalk.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libatalk.so.1
 %dir %{_libdir}/atalk
 %attr(755,root,root) %{_libdir}/atalk/*.so
 %{_mandir}/*/*
@@ -163,10 +161,10 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/netatalk-config
+%attr(755,root,root) %{_libdir}/libatalk.so
 %{_libdir}/libatalk.a
 %{_libdir}/libatalk.la
 %{_libdir}/atalk/*.a
 %{_libdir}/atalk/*.la
 %{_includedir}/atalk
-%{_includedir}/netatalk/*
 %{_aclocaldir}/*
diff --git a/netatalk-build.patch b/netatalk-build.patch
index 762f8fe..91bed7e 100644
--- a/netatalk-build.patch
+++ b/netatalk-build.patch
@@ -8,3 +8,24 @@
  #include <xfs/xqm.h>
  #define HAVE_LINUX_XQM_H
  #endif /* HAVE_XFS_XQM_H */
+--- netatalk-3.0/Makefile.am~	2012-05-30 17:00:28.000000000 +0200
++++ netatalk-3.0/Makefile.am	2012-09-06 13:43:26.659673026 +0200
+@@ -1,6 +1,6 @@
+ # Makefile.am for top level of netatalk package
+ 
+-SUBDIRS = libatalk libevent bin config etc man contrib distrib include doc macros test
++SUBDIRS = libatalk bin config etc man contrib distrib include doc macros test
+ 
+ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION
+ 
+--- netatalk-3.0/etc/netatalk/Makefile.am~	2012-04-04 12:13:17.000000000 +0200
++++ netatalk-3.0/etc/netatalk/Makefile.am	2012-09-06 13:45:26.799668789 +0200
+@@ -20,4 +20,6 @@
+ 
+ netatalk_LDADD += \
+ 	$(top_builddir)/libevent/libevent.la
+-endif
+\ No newline at end of file
++else
++netatalk_LDADD += -levent
++endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/netatalk.git/commitdiff/8e725980efb20b609610070667717bf9b725c323