Attachment 6405 Details for Bug 15806 – this does it

[patch] this does it

15806.diff (text/plain), 5.91 KB, created by Thierry Vignaud on 2015-05-01 09:19:01 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2015-05-01 09:19:01 CEST

Size: 5.91 KB

patch

obsolete

>Index: SPECS/harbour.spec
>===================================================================
>--- SPECS/harbour.spec	(rÃ©vision 820953)
>+++ SPECS/harbour.spec	(copie de travail)
>@@ -442,7 +442,9 @@
> # necessary for shared linked hbmk2 used to execute postinst.hbs
> export LD_LIBRARY_PATH=$HB_INSTALL_LIB
> 
>-%make install
>+%make install \
>+     HB_INSTALL_LIB=%{buildroot}%{_libdir}/harbour \
>+     HB_INSTALL_DYN=%{buildroot}%{_libdir}/harbour 
> 
> rm -fR %{buildroot}%{_sysconfdir}/ld.so.conf.d
> 
>@@ -671,47 +673,49 @@
> %files -n %{libharbour}
> %{_libdir}/libharbour.so
> %{_libdir}/libharbour.so.%{major}*
>+%{_libdir}/%{name}/libharbour.so
>+%{_libdir}/%{name}/libharbour.so.%{major}*
> %{_libdir}/%{name}/libhbdebug.a
> 
> %files -n %{libcontrib}
>-%{_libdir}/libxhb.so*
>-%{_libdir}/librddsql.so*
>-%{_libdir}/libhbblink.so*
>-%{_libdir}/libhbbz2.so*
>-%{_libdir}/libhbcomm.so*
>-%{_libdir}/libhbct.so*
>-%{_libdir}/libhbexpat.so*
>-%{_libdir}/libhbformat.so*
>-%{_libdir}/libhbfoxpro.so*
>-%{_libdir}/libhbfship.so*
>-%{_libdir}/libhbgt.so*
>-%{_libdir}/libhbhpdf.so*
>-%{_libdir}/libhbhttpd.so*
>-%{_libdir}/libhblzf.so*
>-%{_libdir}/libhbmemio.so*
>-%{_libdir}/libhbmisc.so*
>-%{_libdir}/libhbmlzo.so*
>-%{_libdir}/libhbmxml.so*
>-%{_libdir}/libhbmzip.so*
>-%{_libdir}/libhbnetio.so*
>-%{_libdir}/libhbnf.so*
>-%{_libdir}/libhbsms.so*
>-%{_libdir}/libhbsqlit3.so*
>-%{_libdir}/libhbssl.so*
>-%{_libdir}/libhbtip.so*
>-%{_libdir}/libhbtpathy.so*
>-%{_libdir}/libhbunix.so*
>-%{_libdir}/libhbxpp.so*
>-%{_libdir}/libhbzebra.so*
>-%{_libdir}/libminilzo.so*
>-%{_libdir}/librddbm.so*
>-%{_libdir}/libhbziparc.so*
>-%{_libdir}/libsddsqlt3.so*
>-%{_libdir}/libhbamf.so*
>-%{_libdir}/libhboslib.so*
>-%{_libdir}/libhbtest.so*
>-%{_libdir}/libhbtinymt.so*
>-%{_libdir}/libhbxdiff.so*
>+%{_libdir}/%{name}/libxhb.so*
>+%{_libdir}/%{name}/librddsql.so*
>+%{_libdir}/%{name}/libhbblink.so*
>+%{_libdir}/%{name}/libhbbz2.so*
>+%{_libdir}/%{name}/libhbcomm.so*
>+%{_libdir}/%{name}/libhbct.so*
>+%{_libdir}/%{name}/libhbexpat.so*
>+%{_libdir}/%{name}/libhbformat.so*
>+%{_libdir}/%{name}/libhbfoxpro.so*
>+%{_libdir}/%{name}/libhbfship.so*
>+%{_libdir}/%{name}/libhbgt.so*
>+%{_libdir}/%{name}/libhbhpdf.so*
>+%{_libdir}/%{name}/libhbhttpd.so*
>+%{_libdir}/%{name}/libhblzf.so*
>+%{_libdir}/%{name}/libhbmemio.so*
>+%{_libdir}/%{name}/libhbmisc.so*
>+%{_libdir}/%{name}/libhbmlzo.so*
>+%{_libdir}/%{name}/libhbmxml.so*
>+%{_libdir}/%{name}/libhbmzip.so*
>+%{_libdir}/%{name}/libhbnetio.so*
>+%{_libdir}/%{name}/libhbnf.so*
>+%{_libdir}/%{name}/libhbsms.so*
>+%{_libdir}/%{name}/libhbsqlit3.so*
>+%{_libdir}/%{name}/libhbssl.so*
>+%{_libdir}/%{name}/libhbtip.so*
>+%{_libdir}/%{name}/libhbtpathy.so*
>+%{_libdir}/%{name}/libhbunix.so*
>+%{_libdir}/%{name}/libhbxpp.so*
>+%{_libdir}/%{name}/libhbzebra.so*
>+%{_libdir}/%{name}/libminilzo.so*
>+%{_libdir}/%{name}/librddbm.so*
>+%{_libdir}/%{name}/libhbziparc.so*
>+%{_libdir}/%{name}/libsddsqlt3.so*
>+%{_libdir}/%{name}/libhbamf.so*
>+%{_libdir}/%{name}/libhboslib.so*
>+%{_libdir}/%{name}/libhbtest.so*
>+%{_libdir}/%{name}/libhbtinymt.so*
>+%{_libdir}/%{name}/libhbxdiff.so*
> 
> %{_libdir}/%{name}/libhbnf.a
> %{_libdir}/%{name}/libhbblink.a
>@@ -858,13 +862,13 @@
> 
> %if %{defined _with_allegro}
> %files -n %{liballegro}
>-%{_libdir}/libgtalleg.so*
>+%{_libdir}/%{name}/libgtalleg.so*
> %{_libdir}/%{name}/libgtalleg.a
> %endif
> 
> %if %{defined _with_cairo}
> %files -n %{libcairo}
>-%{_libdir}/libhbcairo.so*
>+%{_libdir}/%{name}/libhbcairo.so*
> %{_includedir}/%{name}/hbcairo.ch
> %{_libdir}/%{name}/libhbcairo.a
> %endif
>@@ -871,13 +875,13 @@
> 
> %if %{defined _with_cups}
> %files -n %{libcups}
>-%{_libdir}/libhbcups.so*
>+%{_libdir}/%{name}/libhbcups.so*
> %{_libdir}/%{name}/libhbcups.a
> %endif
> 
> %if %{defined _with_curl}
> %files -n %{libcurl}
>-%{_libdir}/libhbcurl.so*
>+%{_libdir}/%{name}/libhbcurl.so*
> %{_includedir}/%{name}/hbcurl.ch
> %{_libdir}/%{name}/libhbcurl.a
> %endif
>@@ -884,8 +888,8 @@
> 
> %if %{defined _with_firebird}
> %files -n %{libfirebird}
>-%{_libdir}/libhbfbird.so*
>-%{_libdir}/libsddfb.so*
>+%{_libdir}/%{name}/libhbfbird.so*
>+%{_libdir}/%{name}/libsddfb.so*
> %{_libdir}/%{name}/libhbfbird.a
> %{_libdir}/%{name}/libsddfb.a
> %endif
>@@ -892,7 +896,7 @@
> 
> %if %{defined _with_freeimage}
> %files -n %{libfreeimage}
>-%{_libdir}/libhbfimage.so*
>+%{_libdir}/%{name}/libhbfimage.so*
> %{_includedir}/%{name}/freeimag.ch
> %{_libdir}/%{name}/libhbfimage.a
> %endif
>@@ -899,7 +903,7 @@
> 
> %if %{defined _with_gd}
> %files -n %{libgd}
>-%{_libdir}/libhbgd.so*
>+%{_libdir}/%{name}/libhbgd.so*
> %{_includedir}/%{name}/gd.ch
> %{_libdir}/%{name}/libhbgd.a
> %endif
>@@ -906,8 +910,8 @@
> 
> %if %{defined _with_mysql}
> %files -n %{libmysql}
>-%{_libdir}/libhbmysql.so*
>-%{_libdir}/libsddmy.so*
>+%{_libdir}/%{name}/libhbmysql.so*
>+%{_libdir}/%{name}/libsddmy.so*
> %{_includedir}/%{name}/mysql.ch
> %{_libdir}/%{name}/libhbmysql.a
> %{_libdir}/%{name}/libsddmy.a
>@@ -915,8 +919,8 @@
> 
> %if %{defined _with_odbc}
> %files -n %{libodbc}
>-%{_libdir}/libhbodbc.so*
>-%{_libdir}/libsddodbc.so*
>+%{_libdir}/%{name}/libhbodbc.so*
>+%{_libdir}/%{name}/libsddodbc.so*
> %{_includedir}/%{name}/sql.ch
> %{_libdir}/%{name}/libhbodbc.a
> %{_libdir}/%{name}/libsddodbc.a
>@@ -924,8 +928,8 @@
> 
> %if %{defined _with_pgsql}
> %files -n %{libpgsql}
>-%{_libdir}/libhbpgsql.so*
>-%{_libdir}/libsddpg.so*
>+%{_libdir}/%{name}/libhbpgsql.so*
>+%{_libdir}/%{name}/libsddpg.so*
> %{_includedir}/%{name}/postgres.ch
> %{_libdir}/%{name}/libhbpgsql.a
> %{_libdir}/%{name}/libsddpg.a
>@@ -933,14 +937,14 @@
> 
> %if %{defined _with_qt}
> %files -n %{libqt}
>-%{_libdir}/libhbqtcore.so*
>-%{_libdir}/libhbqtgui.so*
>-%{_libdir}/libhbqtnetwork.so*
>-%{_libdir}/libhbxbp.so*
>-%{_libdir}/libgtqtc.so*
>-%{_libdir}/libhbqtdesigner.so*
>-%{_libdir}/libhbqtwebkit.so*
>-%{_libdir}/libhbqtwidgets.so*
>+%{_libdir}/%{name}/libhbqtcore.so*
>+%{_libdir}/%{name}/libhbqtgui.so*
>+%{_libdir}/%{name}/libhbqtnetwork.so*
>+%{_libdir}/%{name}/libhbxbp.so*
>+%{_libdir}/%{name}/libgtqtc.so*
>+%{_libdir}/%{name}/libhbqtdesigner.so*
>+%{_libdir}/%{name}/libhbqtwebkit.so*
>+%{_libdir}/%{name}/libhbqtwidgets.so*
> 
> %{_includedir}/%{name}/appevent.ch
> %{_includedir}/%{name}/gra.ch

Index: SPECS/harbour.spec
===================================================================
--- SPECS/harbour.spec	(rÃ©vision 820953)
+++ SPECS/harbour.spec	(copie de travail)
@@ -442,7 +442,9 @@
 # necessary for shared linked hbmk2 used to execute postinst.hbs
 export LD_LIBRARY_PATH=$HB_INSTALL_LIB
 
-%make install
+%make install \
+     HB_INSTALL_LIB=%{buildroot}%{_libdir}/harbour \
+     HB_INSTALL_DYN=%{buildroot}%{_libdir}/harbour 
 
 rm -fR %{buildroot}%{_sysconfdir}/ld.so.conf.d
 
@@ -671,47 +673,49 @@
 %files -n %{libharbour}
 %{_libdir}/libharbour.so
 %{_libdir}/libharbour.so.%{major}*
+%{_libdir}/%{name}/libharbour.so
+%{_libdir}/%{name}/libharbour.so.%{major}*
 %{_libdir}/%{name}/libhbdebug.a
 
 %files -n %{libcontrib}
-%{_libdir}/libxhb.so*
-%{_libdir}/librddsql.so*
-%{_libdir}/libhbblink.so*
-%{_libdir}/libhbbz2.so*
-%{_libdir}/libhbcomm.so*
-%{_libdir}/libhbct.so*
-%{_libdir}/libhbexpat.so*
-%{_libdir}/libhbformat.so*
-%{_libdir}/libhbfoxpro.so*
-%{_libdir}/libhbfship.so*
-%{_libdir}/libhbgt.so*
-%{_libdir}/libhbhpdf.so*
-%{_libdir}/libhbhttpd.so*
-%{_libdir}/libhblzf.so*
-%{_libdir}/libhbmemio.so*
-%{_libdir}/libhbmisc.so*
-%{_libdir}/libhbmlzo.so*
-%{_libdir}/libhbmxml.so*
-%{_libdir}/libhbmzip.so*
-%{_libdir}/libhbnetio.so*
-%{_libdir}/libhbnf.so*
-%{_libdir}/libhbsms.so*
-%{_libdir}/libhbsqlit3.so*
-%{_libdir}/libhbssl.so*
-%{_libdir}/libhbtip.so*
-%{_libdir}/libhbtpathy.so*
-%{_libdir}/libhbunix.so*
-%{_libdir}/libhbxpp.so*
-%{_libdir}/libhbzebra.so*
-%{_libdir}/libminilzo.so*
-%{_libdir}/librddbm.so*
-%{_libdir}/libhbziparc.so*
-%{_libdir}/libsddsqlt3.so*
-%{_libdir}/libhbamf.so*
-%{_libdir}/libhboslib.so*
-%{_libdir}/libhbtest.so*
-%{_libdir}/libhbtinymt.so*
-%{_libdir}/libhbxdiff.so*
+%{_libdir}/%{name}/libxhb.so*
+%{_libdir}/%{name}/librddsql.so*
+%{_libdir}/%{name}/libhbblink.so*
+%{_libdir}/%{name}/libhbbz2.so*
+%{_libdir}/%{name}/libhbcomm.so*
+%{_libdir}/%{name}/libhbct.so*
+%{_libdir}/%{name}/libhbexpat.so*
+%{_libdir}/%{name}/libhbformat.so*
+%{_libdir}/%{name}/libhbfoxpro.so*
+%{_libdir}/%{name}/libhbfship.so*
+%{_libdir}/%{name}/libhbgt.so*
+%{_libdir}/%{name}/libhbhpdf.so*
+%{_libdir}/%{name}/libhbhttpd.so*
+%{_libdir}/%{name}/libhblzf.so*
+%{_libdir}/%{name}/libhbmemio.so*
+%{_libdir}/%{name}/libhbmisc.so*
+%{_libdir}/%{name}/libhbmlzo.so*
+%{_libdir}/%{name}/libhbmxml.so*
+%{_libdir}/%{name}/libhbmzip.so*
+%{_libdir}/%{name}/libhbnetio.so*
+%{_libdir}/%{name}/libhbnf.so*
+%{_libdir}/%{name}/libhbsms.so*
+%{_libdir}/%{name}/libhbsqlit3.so*
+%{_libdir}/%{name}/libhbssl.so*
+%{_libdir}/%{name}/libhbtip.so*
+%{_libdir}/%{name}/libhbtpathy.so*
+%{_libdir}/%{name}/libhbunix.so*
+%{_libdir}/%{name}/libhbxpp.so*
+%{_libdir}/%{name}/libhbzebra.so*
+%{_libdir}/%{name}/libminilzo.so*
+%{_libdir}/%{name}/librddbm.so*
+%{_libdir}/%{name}/libhbziparc.so*
+%{_libdir}/%{name}/libsddsqlt3.so*
+%{_libdir}/%{name}/libhbamf.so*
+%{_libdir}/%{name}/libhboslib.so*
+%{_libdir}/%{name}/libhbtest.so*
+%{_libdir}/%{name}/libhbtinymt.so*
+%{_libdir}/%{name}/libhbxdiff.so*
 
 %{_libdir}/%{name}/libhbnf.a
 %{_libdir}/%{name}/libhbblink.a
@@ -858,13 +862,13 @@
 
 %if %{defined _with_allegro}
 %files -n %{liballegro}
-%{_libdir}/libgtalleg.so*
+%{_libdir}/%{name}/libgtalleg.so*
 %{_libdir}/%{name}/libgtalleg.a
 %endif
 
 %if %{defined _with_cairo}
 %files -n %{libcairo}
-%{_libdir}/libhbcairo.so*
+%{_libdir}/%{name}/libhbcairo.so*
 %{_includedir}/%{name}/hbcairo.ch
 %{_libdir}/%{name}/libhbcairo.a
 %endif
@@ -871,13 +875,13 @@
 
 %if %{defined _with_cups}
 %files -n %{libcups}
-%{_libdir}/libhbcups.so*
+%{_libdir}/%{name}/libhbcups.so*
 %{_libdir}/%{name}/libhbcups.a
 %endif
 
 %if %{defined _with_curl}
 %files -n %{libcurl}
-%{_libdir}/libhbcurl.so*
+%{_libdir}/%{name}/libhbcurl.so*
 %{_includedir}/%{name}/hbcurl.ch
 %{_libdir}/%{name}/libhbcurl.a
 %endif
@@ -884,8 +888,8 @@
 
 %if %{defined _with_firebird}
 %files -n %{libfirebird}
-%{_libdir}/libhbfbird.so*
-%{_libdir}/libsddfb.so*
+%{_libdir}/%{name}/libhbfbird.so*
+%{_libdir}/%{name}/libsddfb.so*
 %{_libdir}/%{name}/libhbfbird.a
 %{_libdir}/%{name}/libsddfb.a
 %endif
@@ -892,7 +896,7 @@
 
 %if %{defined _with_freeimage}
 %files -n %{libfreeimage}
-%{_libdir}/libhbfimage.so*
+%{_libdir}/%{name}/libhbfimage.so*
 %{_includedir}/%{name}/freeimag.ch
 %{_libdir}/%{name}/libhbfimage.a
 %endif
@@ -899,7 +903,7 @@
 
 %if %{defined _with_gd}
 %files -n %{libgd}
-%{_libdir}/libhbgd.so*
+%{_libdir}/%{name}/libhbgd.so*
 %{_includedir}/%{name}/gd.ch
 %{_libdir}/%{name}/libhbgd.a
 %endif
@@ -906,8 +910,8 @@
 
 %if %{defined _with_mysql}
 %files -n %{libmysql}
-%{_libdir}/libhbmysql.so*
-%{_libdir}/libsddmy.so*
+%{_libdir}/%{name}/libhbmysql.so*
+%{_libdir}/%{name}/libsddmy.so*
 %{_includedir}/%{name}/mysql.ch
 %{_libdir}/%{name}/libhbmysql.a
 %{_libdir}/%{name}/libsddmy.a
@@ -915,8 +919,8 @@
 
 %if %{defined _with_odbc}
 %files -n %{libodbc}
-%{_libdir}/libhbodbc.so*
-%{_libdir}/libsddodbc.so*
+%{_libdir}/%{name}/libhbodbc.so*
+%{_libdir}/%{name}/libsddodbc.so*
 %{_includedir}/%{name}/sql.ch
 %{_libdir}/%{name}/libhbodbc.a
 %{_libdir}/%{name}/libsddodbc.a
@@ -924,8 +928,8 @@
 
 %if %{defined _with_pgsql}
 %files -n %{libpgsql}
-%{_libdir}/libhbpgsql.so*
-%{_libdir}/libsddpg.so*
+%{_libdir}/%{name}/libhbpgsql.so*
+%{_libdir}/%{name}/libsddpg.so*
 %{_includedir}/%{name}/postgres.ch
 %{_libdir}/%{name}/libhbpgsql.a
 %{_libdir}/%{name}/libsddpg.a
@@ -933,14 +937,14 @@
 
 %if %{defined _with_qt}
 %files -n %{libqt}
-%{_libdir}/libhbqtcore.so*
-%{_libdir}/libhbqtgui.so*
-%{_libdir}/libhbqtnetwork.so*
-%{_libdir}/libhbxbp.so*
-%{_libdir}/libgtqtc.so*
-%{_libdir}/libhbqtdesigner.so*
-%{_libdir}/libhbqtwebkit.so*
-%{_libdir}/libhbqtwidgets.so*
+%{_libdir}/%{name}/libhbqtcore.so*
+%{_libdir}/%{name}/libhbqtgui.so*
+%{_libdir}/%{name}/libhbqtnetwork.so*
+%{_libdir}/%{name}/libhbxbp.so*
+%{_libdir}/%{name}/libgtqtc.so*
+%{_libdir}/%{name}/libhbqtdesigner.so*
+%{_libdir}/%{name}/libhbqtwebkit.so*
+%{_libdir}/%{name}/libhbqtwidgets.so*
 
 %{_includedir}/%{name}/appevent.ch
 %{_includedir}/%{name}/gra.ch

Actions: View | Diff

Attachments on bug 15806: 6405 | 6417