Attachment 154214 Details for Bug 226190 – Patch fixing remaining review issues.

[patch] Patch fixing remaining review issues.

netatalk.patch (text/plain), 3.09 KB, created by Jason Tibbitts on 2007-05-06 00:14:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Tibbitts

Created: 2007-05-06 00:14:47 UTC

Size: 3.09 KB

patch

obsolete

>? netatalk-2.0.3
>? netatalk-2.0.3-10.fc7.src.rpm
>Index: netatalk.spec
>===================================================================
>RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
>retrieving revision 1.33
>diff -u -r1.33 netatalk.spec
>--- netatalk.spec	17 Apr 2007 10:17:43 -0000	1.33
>+++ netatalk.spec	6 May 2007 00:12:38 -0000
>@@ -7,10 +7,7 @@
> Group:   System Environment/Daemons
> Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
> Source1: atalk.init
>-#Source2: netatalk.config
>-#Source3: AppleVolumes.system
>-Source4: ICDumpSuffixMap
>-Source5: netatalk.pam-system-auth
>+Source2: netatalk.pam-system-auth
> #Patch0: netatalk-1.6.3-norc.patch
> #Patch1: netatalk-1.5.5-openssl097.patch
> #Patch2: netatalk-1.5.5-pathcat.patch
>@@ -34,12 +31,12 @@
> to act as a file server over EtherTalk or IP for Mac's.
> 
> %package devel
>-Summary: Headers and static libraries for Appletalk development
>+Summary: Headers for Appletalk development
> Group: Development/Libraries
> 
> %description devel
>-This package contains the header files, and static libraries for building
>-Appletalk networking programs.
>+This package contains the header files for building Appletalk networking
>+programs.
> 
> %prep
> %setup -q
>@@ -120,15 +117,22 @@
> #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 -m644 %{SOURCE4} .
> # 
> # install example config files in doc
> mkdir config.example
> cp -fp `ls config/* | egrep -v 'tmpl$|Makefile' | tr '\n' ' '` config.example
>-cp -fp %{SOURCE5} 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
> 
>+# Fix up ICDumpSuffixMap
>+sed -e 's/\r/\n/' -e 's:#!perl:#!%{__perl}:' contrib/ICDumpSuffixMap > ICDumpSuffixMap
>+touch -r contrib/ICDumpSuffixMap ICDumpSuffixMap
>+
>+# Clean up .a and .la files
>+find $RPM_BUILD_ROOT -name \*.a -exec rm {} \;
>+find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
>+
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>@@ -155,7 +159,7 @@
> %doc bin/afile/acleandir.rc
> %doc config.example
> %dir /etc/atalk
>-%attr(755,root,root) %config %{_initrddir}/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
>@@ -165,7 +169,9 @@
> %config(noreplace) /etc/pam.d/netatalk
> %{_sbindir}/*
> %{_bindir}/*
>+%exclude %{_bindir}/netatalk-config
> %{_mandir}/man*/*
>+%exclude %{_mandir}//man*/netatalk-config*
> %{_datadir}/netatalk
> %{_libdir}/atalk/*.so
> %{_libexecdir}/*
>@@ -173,14 +179,12 @@
> %files devel
> %defattr(-,root,root)
> %dir %{_includedir}/atalk
>-%{_libdir}/*.a
>-%{_libdir}/*.la
> %attr(0644,root,root) %{_includedir}/atalk/*
> %attr(0644,root,root) %{_includedir}/netatalk/*
> %{_datadir}/aclocal/netatalk.m4
>-%{_libdir}/atalk/*.a
>-%{_libdir}/atalk/*.la
> %{_bindir}/netatalk-config
>+%{_mandir}/man*/netatalk-config.1*
>+
> %changelog
> * Tue Apr 17 2007 Maros Barabas <mbarabas@redhat.com> - 4:2.0.3-10
> - fix fiew problems in spec

Actions: View | Diff

Attachments on bug 226190: 154214