adding patch for lib64 support through lib_suffix
This commit is contained in:
parent
63f33265a2
commit
b3715e58f6
30
lib64-suffix.patch
Normal file
30
lib64-suffix.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
diff -ruN qgis-0.8.1-orig/settings.pro qgis-0.8.1/settings.pro
|
||||||
|
--- qgis-0.8.1-orig/settings.pro 2007-01-01 23:31:27.000000000 -0500
|
||||||
|
+++ qgis-0.8.1/settings.pro 2007-07-05 10:30:08.000000000 -0400
|
||||||
|
@@ -107,14 +107,14 @@
|
||||||
|
win32:QGISBINDIR=$${DESTDIR}
|
||||||
|
macx:QGISBINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/MacOS/
|
||||||
|
|
||||||
|
-linux-g++:QGISLIBDIR=$${DESTDIR}/lib
|
||||||
|
+linux-g++:QGISLIBDIR=$${DESTDIR}/lib${LIB_SUFFIX}
|
||||||
|
macx:QGISLIBDIR=$${QGISBINDIR}
|
||||||
|
win32:QGISLIBDIR=$${DESTDIR}
|
||||||
|
|
||||||
|
-QGISPLUGINDIR=$${DESTDIR}/lib/qgis
|
||||||
|
+QGISPLUGINDIR=$${DESTDIR}/lib${LIB_SUFFIX}/qgis
|
||||||
|
macx:QGISPLUGINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
|
||||||
|
|
||||||
|
-QGISPROVIDERDIR=$${QGISBINDIR}/lib/qgis
|
||||||
|
+QGISPROVIDERDIR=$${QGISBINDIR}/lib${LIB_SUFFIX}/qgis
|
||||||
|
macx:QGISPROVIDERDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
|
||||||
|
|
||||||
|
win32:QGISDOCDIR=$${DESTDIR}/share/qgis/doc
|
||||||
|
@@ -186,7 +186,7 @@
|
||||||
|
win32:LIBS+=-LC:\msys\local\lib
|
||||||
|
win32:LIBS+=-L$${DESTDIR}
|
||||||
|
win32:LIBS+=-L$${DESTDIR}/lib/qgis
|
||||||
|
-linux-g++:LIBS+=-L$${DESTDIR}/lib
|
||||||
|
+linux-g++:LIBS+=-L$${DESTDIR}/lib${LIB_SUFFIX}
|
||||||
|
linux-g++:LIBS+=-L/usr/lib/ccache/lib
|
||||||
|
macx:LIBS+=-L$${QGISLIBDIR}
|
||||||
|
macx:LIBS+=-F/Library/Frameworks/
|
@ -3,7 +3,7 @@
|
|||||||
Summary: A user friendly Open Source Geographic Information System
|
Summary: A user friendly Open Source Geographic Information System
|
||||||
Name: qgis
|
Name: qgis
|
||||||
Version: 0.8.1
|
Version: 0.8.1
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
#Epoch: 1
|
#Epoch: 1
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: Applications/Engineering
|
Group: Applications/Engineering
|
||||||
@ -11,6 +11,7 @@ Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
|
|||||||
Source1: %{name}.desktop
|
Source1: %{name}.desktop
|
||||||
Patch0: settings-include-workdir.patch
|
Patch0: settings-include-workdir.patch
|
||||||
Patch1: man-install-share.patch
|
Patch1: man-install-share.patch
|
||||||
|
Patch2: lib64-suffix.patch
|
||||||
URL: http://qgis.org/
|
URL: http://qgis.org/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
@ -62,6 +63,7 @@ Addtional theme for qgis - nkids
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
for dir in %{_libdir}/grass-*/ ; do
|
for dir in %{_libdir}/grass-*/ ; do
|
||||||
@ -71,7 +73,7 @@ done
|
|||||||
-D GRASS_PREFIX=$GRASS_PREFIX \
|
-D GRASS_PREFIX=$GRASS_PREFIX \
|
||||||
-D GDAL_INCLUDE_DIR=%{_includedir}/gdal \
|
-D GDAL_INCLUDE_DIR=%{_includedir}/gdal \
|
||||||
-D GDAL_LIBRARY=%{_libdir}/libgdal.so \
|
-D GDAL_LIBRARY=%{_libdir}/libgdal.so \
|
||||||
-D CMAKE_SKIP_RPATH:BOOL=YES \
|
-D CMAKE_SKIP_RPATH:BOOL=ON \
|
||||||
.
|
.
|
||||||
make VERBOSE=1 %{?_smp_mflags}
|
make VERBOSE=1 %{?_smp_mflags}
|
||||||
|
|
||||||
@ -173,6 +175,9 @@ desktop-file-install --vendor="fedora" \
|
|||||||
%{_datadir}/%{name}/themes/default/grass
|
%{_datadir}/%{name}/themes/default/grass
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 05 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-7
|
||||||
|
- adding patch for lib64 support through lib_suffix
|
||||||
|
|
||||||
* Thu Jun 28 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-6
|
* Thu Jun 28 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-6
|
||||||
- fixed date of changelog entry for 0.8.1-5 from Wed Jun 27 2007 to
|
- fixed date of changelog entry for 0.8.1-5 from Wed Jun 27 2007 to
|
||||||
Thu Jun 28 2007
|
Thu Jun 28 2007
|
||||||
|
Reference in New Issue
Block a user