Attachment 795387 Details for Bug 998149 – one way to fix it

[patch] one way to fix it

jsoncpp.spec.diff (text/plain), 1.52 KB, created by Michael Schwendt on 2013-09-08 18:22:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Schwendt

Created: 2013-09-08 18:22:59 UTC

Size: 1.52 KB

patch

obsolete

>diff --git a/jsoncpp.spec b/jsoncpp.spec
>index f628589..9909903 100644
>--- a/jsoncpp.spec
>+++ b/jsoncpp.spec
>@@ -62,8 +62,11 @@ ln -s %{_libdir}/lib%{name}.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.0
> 
> install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/json
> install -p -m 0644 include/json/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/json
>-install -d $RPM_BUILD_ROOT%{_docdir}/%{name}
>-install -p -m 0644 dist/doxygen/*/*.{html,png} $RPM_BUILD_ROOT%{_docdir}/%{name}
>+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html
>+for f in AUTHORS LICENSE NEWS.txt README.txt ; do
>+    install -p -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}
>+done
>+install -p -m 0644 dist/doxygen/*/*.{html,png} $RPM_BUILD_ROOT%{_docdir}/%{name}/html
> install -d $RPM_BUILD_ROOT%{_libdir}/pkgconfig
> install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
> sed -i 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/jsoncpp.pc
>@@ -72,7 +75,8 @@ sed -i 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/jsoncpp.p
> %postun -p /sbin/ldconfig
> 
> %files
>-%doc AUTHORS LICENSE NEWS.txt README.txt
>+%{_docdir}/%{name}/
>+%exclude %{_docdir}/%{name}/html
> %{_libdir}/lib%{name}.so.0
> %{_libdir}/lib%{name}.so.0.0.0
> 
>@@ -82,8 +86,7 @@ sed -i 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/jsoncpp.p
> %{_libdir}/pkgconfig/jsoncpp.pc
> 
> %files doc
>-%doc AUTHORS LICENSE NEWS.txt README.txt
>-%{_docdir}/%{name}
>+%{_docdir}/%{name}/
> 
> %changelog
> * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.10.rc2

Actions: View | Diff

Attachments on bug 998149: 795387