From b308071cc0ef1b4249b8ae2345d3c0a87ab8adfd Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:04:14 +0900 Subject: merge with master --- packaging/minicontrol.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'packaging/minicontrol.spec') diff --git a/packaging/minicontrol.spec b/packaging/minicontrol.spec index 92a1049..0656596 100755 --- a/packaging/minicontrol.spec +++ b/packaging/minicontrol.spec @@ -3,7 +3,7 @@ Summary: minicontrol library Version: 0.0.3 Release: 1 Group: TBD -License: Flora Software License +License: Flora Source0: %{name}-%{version}.tar.gz BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) @@ -12,8 +12,6 @@ BuildRequires: pkgconfig(evas) BuildRequires: pkgconfig(ecore-evas) BuildRequires: pkgconfig(dlog) BuildRequires: cmake -Requires(post): /sbin/ldconfig -requires(postun): /sbin/ldconfig %description Minicontrol library. @@ -29,8 +27,8 @@ Requires: %{name} = %{version}-%{release} Minicontrol library (devel). %build -export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed" -LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed" +%cmake . make %{?jobs:-j%jobs} %install @@ -59,4 +57,3 @@ cp -f LICENSE.Flora %{buildroot}/usr/share/license/%{name} %{_libdir}/pkgconfig/minicontrol-provider.pc %{_libdir}/pkgconfig/minicontrol-monitor.pc %{_libdir}/pkgconfig/minicontrol-viewer.pc - -- cgit v1.2.3