SPECS: lighttpd.spec - real remove of attr conditional patch, - fu...

[Tomasz Wittner]

On Sun 5. of September 2004 13:47, serek wrote:

Możesz wytłumaczyć mi dlaczego:
1. usunąłeś BR: attr-devel ?
2. usunąłeś bconda i czy możesz go przywrócić?

ad. 1.
 $ grep "checking for extended" ../LOGS/lighttpd.spec.log
checking for LDAP support... checking for extended attributes support... no
$ rpm -q attr-devel
pakiet attr-devel nie jest zainstalowany

Pakiet się teraz buduje z różną funkcjonalnością, w zależności od środowiska, 
które nie jest dostatecznie zdefiniowane.

$ grep -r attributes.h ../BUILD/lighttpd-1.2.7/*
../BUILD/lighttpd-1.2.7/config.h.in:/* Define to 1 if you have the 
<attr/attributes.h> header file. */
../BUILD/lighttpd-1.2.7/configure:for ac_header in attr/attributes.h
../BUILD/lighttpd-1.2.7/configure.in:   AC_CHECK_HEADERS([attr/attributes.h],[
../BUILD/lighttpd-1.2.7/src/response.c:#include <attr/attributes.h>
../BUILD/lighttpd-1.2.7/src/file_cache.c:#include <attr/attributes.h>
$ poldek -q --fast --nodesc --shcmd="desc -ll attr-devel-2.4.16-1" | grep 
attributes.h
-rw-r--r--      7262    /usr/include/attr/attributes.h

Dodatkowo:
$ rpmbuild -bp lighttpd.spec
błąd: Makro %_rel ma puste ciało
> Author: serek                        Date: Sun Sep  5 11:47:17 2004 GMT
> Module: SPECS                         Tag: HEAD
> ---- Log message:
> - real remove of attr conditional patch,
> - functional conditional config support via patch0.
>
> ---- Files affected:
> SPECS:
>    lighttpd.spec (1.39 -> 1.40)
>
> ---- Diffs:
>
> ================================================================
> Index: SPECS/lighttpd.spec
> diff -u SPECS/lighttpd.spec:1.39 SPECS/lighttpd.spec:1.40
> --- SPECS/lighttpd.spec:1.39	Sun Sep  5 05:16:11 2004
> +++ SPECS/lighttpd.spec	Sun Sep  5 11:47:11 2004
> @@ -1,6 +1,4 @@
>  # $Revision$, $Date$
> -# Conditional build:
> -%bcond_without	xattr	# with support extended attributes
>  #
>  Summary:	Fast and light http server
>  Summary(pl):	Szybki i lekki serwer http
> @@ -10,7 +8,7 @@
>  Group:		Networking/Daemons
>  License:	QPL
>  ## do not remove next two lines because atomic revisions are common in
> lighttpd -#%define		_rel	20040829-1207
> +#%define		_rel
> 
> #Source0:	http://jan.kneschke.de/projects/lighttpd/download/%{name}-%{versi
>on}-%{_rel}.tar.gz
> Source0:	http://jan.kneschke.de/projects/lighttpd/download/%{name}-%{versio
>n}.tar.gz # Source0-md5:	0139b1ec4514089e9ca11dc3072529ab
> @@ -18,8 +16,9 @@
>  Source2:	%{name}.conf
>  Source3:	%{name}.user
>  Source4:	%{name}.logrotate
> +Patch0:		http://jan.kneschke.de/projects/lighttpd/download/lighttpd-1.2.7-
>cond.patch +#Patch1:		lighttpd-amd64-LINUX_SENDFILE-temporary.patch
>  URL:		http://jan.kneschke.de/projects/lighttpd/
> -BuildRequires:	%{?with_xattr:attr-devel}
>  BuildRequires:	autoconf
>  BuildRequires:	automake
>  BuildRequires:	bzip2-devel
> @@ -65,6 +64,7 @@
>
>  %prep
>  %setup -q
> +%patch0 -p1
>
>  %build
>  %{__libtoolize}
> @@ -75,7 +75,6 @@
>  	--enable-mod-chat \
>  	--enable-mod-cache \
>  	--enable-mod-localizer \
> -	%{?with_xattr:--with-attr} \
>  	--with-openssl
>
>  %{__make}
> @@ -156,6 +155,10 @@
>  All persons listed below can be reached at <cvs_login>@pld-linux.org
>
>  $Log$
> +Revision 1.40  2004/09/05 11:47:11  serek
> +- real remove of attr conditional patch,
> +- functional conditional config support via patch0.
> +
>  Revision 1.39  2004/09/05 05:16:11  aredridel
>  - up to 1.2.7 final
>  - remove xattr patch (merged upstream)
> ================================================================
>
> ---- CVS-web:
>     http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.39&r2=1.40&f=u
>
>
> _______________________________________________
> pld-cvs-commit mailing list
> pld-cvs-commit w pld-linux.org
> http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

-- 
Tomasz Wittner