Attachment 5230 Details for Bug 13625 – Proposal for a fix to bug #13625

[patch] Proposal for a fix to bug #13625

samba.spec.patch (text/plain), 1.28 KB, created by Gilles Allard on 2014-07-01 09:28:37 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Gilles Allard

Created: 2014-07-01 09:28:37 CEST

Size: 1.28 KB

patch

obsolete

>--- ./samba.spec~	2014-07-01 09:15:16.000000000 +0000
>+++ ./samba.spec	2014-07-01 09:18:42.408631237 +0000
>@@ -1438,9 +1438,10 @@
> %endif
> ; do
> 	pushd lib/$i
>-	./autogen.sh -V && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
>+	./configure --prefix=%{_prefix} --libdir=%{_libdir}
>+	make
>+	WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$PATH waf install --destdir=%{buildroot} --targets=`basename bin/PKGCONFIG_$i.pc`
> 	popd
>-	install -m 644 lib/$i/$i.pc %{buildroot}%{_libdir}/pkgconfig/
> done
> 
> # 2. Install them
>@@ -1473,17 +1474,17 @@
> %find_lang net
> 
> %ifarch alpha
>-rm -f %{_bindir}/smb*m*nt%{samba_major}
>-rm -f %{_mandir}/man8/smb*m*nt*.8*
>+rm -f %{buildroot}%{_bindir}/smb*m*nt%{samba_major}
>+rm -f %{buildroot}%{_mandir}/man8/smb*m*nt*.8*
> %endif
> 
>-%if !%build_system
>-rm -f %{_libdir}/libsmbclient.so.*
>-rm -f %{_includedir}/*
>-rm -f %{_libdir}/libsmbclient.so
>-rm -f %{_libdir}/lib*.a
>-rm -f %{_mandir}/man8/libsmbclient.8*
>-rm -f %{_libdir}/pkgconfig/smbclient.pc
>+%if !%{with system}
>+rm -f %{buildroot}%{_libdir}/libsmbclient.so.*
>+rm -f %{buildroot}%{_includedir}/*
>+rm -f %{buildroot}%{_libdir}/libsmbclient.so
>+rm -f %{buildroot}%{_libdir}/lib*.a
>+rm -f %{buildroot}%{_mandir}/man8/libsmbclient.8*
>+rm -f %{buildroot}%{_libdir}/pkgconfig/smbclient.pc
> %endif
> 
> %if %build_vscan

--- ./samba.spec~	2014-07-01 09:15:16.000000000 +0000
+++ ./samba.spec	2014-07-01 09:18:42.408631237 +0000
@@ -1438,9 +1438,10 @@
 %endif
 ; do
 	pushd lib/$i
-	./autogen.sh -V && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
+	./configure --prefix=%{_prefix} --libdir=%{_libdir}
+	make
+	WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$PATH waf install --destdir=%{buildroot} --targets=`basename bin/PKGCONFIG_$i.pc`
 	popd
-	install -m 644 lib/$i/$i.pc %{buildroot}%{_libdir}/pkgconfig/
 done
 
 # 2. Install them
@@ -1473,17 +1474,17 @@
 %find_lang net
 
 %ifarch alpha
-rm -f %{_bindir}/smb*m*nt%{samba_major}
-rm -f %{_mandir}/man8/smb*m*nt*.8*
+rm -f %{buildroot}%{_bindir}/smb*m*nt%{samba_major}
+rm -f %{buildroot}%{_mandir}/man8/smb*m*nt*.8*
 %endif
 
-%if !%build_system
-rm -f %{_libdir}/libsmbclient.so.*
-rm -f %{_includedir}/*
-rm -f %{_libdir}/libsmbclient.so
-rm -f %{_libdir}/lib*.a
-rm -f %{_mandir}/man8/libsmbclient.8*
-rm -f %{_libdir}/pkgconfig/smbclient.pc
+%if !%{with system}
+rm -f %{buildroot}%{_libdir}/libsmbclient.so.*
+rm -f %{buildroot}%{_includedir}/*
+rm -f %{buildroot}%{_libdir}/libsmbclient.so
+rm -f %{buildroot}%{_libdir}/lib*.a
+rm -f %{buildroot}%{_mandir}/man8/libsmbclient.8*
+rm -f %{buildroot}%{_libdir}/pkgconfig/smbclient.pc
 %endif
 
 %if %build_vscan

Actions: View | Diff

Attachments on bug 13625: 5230