[packages/granite] fix install dirs in cmake sources

glen glen at pld-linux.org
Thu Feb 7 00:19:07 CET 2013


commit bdae6affc65d8fd8c252571fb7b488afba1598f4
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Feb 7 01:18:59 2013 +0200

    fix install dirs in cmake sources

 granite.spec | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/granite.spec b/granite.spec
index b4a73c2..ad59563 100644
--- a/granite.spec
+++ b/granite.spec
@@ -1,7 +1,7 @@
 Summary:	An extension of GTK
 Name:		granite
 Version:	0.1.1
-Release:	1
+Release:	2
 License:	GPL v3
 Group:		X11/Libraries
 URL:		http://elementaryos.org/
@@ -10,6 +10,7 @@ Source0:	https://launchpad.net/granite/0.x/%{version}/+download/%{name}-%{versio
 BuildRequires:	cmake
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel
+BuildRequires:	sed >= 4.0
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	gtk+3-devel >= 3.3.14
 BuildRequires:	libgee0.6-devel
@@ -47,6 +48,14 @@ This package contains the header files for libgranite.
 %prep
 %setup -q
 
+%{__sed} -i -e '
+	s,${CMAKE_INSTALL_PREFIX}/lib,${CMAKE_INSTALL_LIBDIR},
+' lib/CMakeLists.txt
+
+%{__sed} -i -e '
+	s,DESTINATION lib/girepository-1.0/,DESTINATION lib${LIB_SUFFIX}/girepository-1.0/,
+' cmake/GObjectIntrospectionMacros.cmake
+
 %build
 install -d build
 cd build
@@ -61,10 +70,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install -C build \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%if "%{_lib}" != "lib"
-mv $RPM_BUILD_ROOT%{_prefix}/lib $RPM_BUILD_ROOT%{_libdir}
-%endif
-
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/rue
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/sma
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/granite.git/commitdiff/bdae6affc65d8fd8c252571fb7b488afba1598f4



More information about the pld-cvs-commit mailing list